Changeset 134 for trunk/src/sh_tiger0.c

Timestamp:

Oct 26, 2007, 12:20:10 AM (17 years ago)

Author:

rainer

Message:

More thread-safety changes.

File:

• trunk/src/sh_tiger0.c (modified) (8 diffs)

trunk/src/sh_tiger0.c

@@ -100 +100 @@
  */
 
-static sh_byte buffer[PRIV_MAX + 72];
+/* static sh_byte buffer[PRIV_MAX + 72]; */
 
 #if defined(TIGER_64_BIT)
@@ -121 +121 @@
   UINT64    bcount = 0;
 
-  static int lockflag = SL_FALSE;
+  char * buffer = SH_ALLOC(PRIV_MAX + 72);
 
   unsigned long pages_read;
@@ -176 +176 @@
                            MSG_E_ACCESS, (long) euid, tmp);
           SH_FREE(tmp);
+          SH_FREE(buffer);
           SL_RETURN( NULL, _("sh_tiger_hash_val"));
         }
 
-      SH_MUTEX_LOCK(mutex_skey);  
 #if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
-    if ((lockflag == SL_FALSE) && (skey->mlock_failed == SL_FALSE)) 
+    if (skey->mlock_failed == SL_FALSE) 
       {
-        lockflag = SL_TRUE;
         if ( (-1) == sh_unix_mlock(FIL__, __LINE__, 
                                    (char *)buffer, 
                                    (PRIV_MAX)*sizeof(sh_byte))) 
-          skey->mlock_failed = SL_TRUE;
+          {
+            SH_MUTEX_LOCK_UNSAFE(mutex_skey);  
+            skey->mlock_failed = SL_TRUE;
+            SH_MUTEX_UNLOCK_UNSAFE(mutex_skey);
+          }
       }
 #else
-    if (lockflag == SL_FALSE && skey->mlock_failed == SL_FALSE)
+    if (skey->mlock_failed == SL_FALSE)
       {
-        lockflag = SL_TRUE;
+        SH_MUTEX_LOCK_UNSAFE(mutex_skey);  
         skey->mlock_failed = SL_TRUE;
+        SH_MUTEX_UNLOCK_UNSAFE(mutex_skey);
       }
 #endif
-    SH_MUTEX_UNLOCK(mutex_skey);
 
 #ifdef TIGER_DBG
@@ -216 +219 @@
           {
             if (sig_termfast == 1) {
+              sh_unix_munlock((char *)buffer, (PRIV_MAX)*sizeof(sh_byte));
+              SH_FREE(buffer);
               SL_RETURN( NULL, _("sh_tiger_hash_val"));
             }
@@ -234 +239 @@
             memset (buffer, 0, PRIV_MAX);
 
+            sh_unix_munlock((char *)buffer, (PRIV_MAX)*sizeof(sh_byte));
+            SH_FREE(buffer);
             SL_RETURN( NULL, _("sh_tiger_hash_val"));
           }
@@ -278 +285 @@
             memset (bbuf,   0, 64);
             memset (buffer, 0, PRIV_MAX);
-
+            sh_unix_munlock((char *)buffer, (PRIV_MAX)*sizeof(sh_byte));
+            SH_FREE(buffer);
             SL_RETURN( NULL, _("sh_tiger_hash_val"));
           }
@@ -364 +372 @@
     if (what == TIGER_FILE)
       (void) sl_close (fd);
-
+    sh_unix_munlock((char *)buffer, (PRIV_MAX)*sizeof(sh_byte));
+    SH_FREE(buffer);
     SL_RETURN( res, _("sh_tiger_hash_val"));
   }
@@ -370 +379 @@
   if (what == TIGER_DATA && filename != NULL) 
     {
-      tiger(TIGER_CAST filename, (sh_word32) Length, res); 
+      tiger(TIGER_CAST filename, (sh_word32) Length, res);
+      sh_unix_munlock((char *)buffer, (PRIV_MAX)*sizeof(sh_byte));
+      SH_FREE(buffer);
       SL_RETURN(res, _("sh_tiger_hash_val"));
     }
+  sh_unix_munlock((char *)buffer, (PRIV_MAX)*sizeof(sh_byte));
+  SH_FREE(buffer);
   SL_RETURN( NULL, _("sh_tiger_hash_val"));
 }