Changeset 1790 in webkit for trunk/JavaScriptCore/kjs/internal.cpp

Timestamp:

Aug 9, 2002, 5:04:39 PM (23 years ago)

Author:

mjs

Message:

Fix my last change to actually call the versions of the lock functions
that are recursive and initialize as needed.

• kjs/internal.cpp: (InterpreterImp::InterpreterImp): (InterpreterImp::clear): (InterpreterImp::evaluate):

File:

• trunk/JavaScriptCore/kjs/internal.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/internal.cpp

@@ -794 +794 @@
   // as a root set for garbage collection
 #ifdef APPLE_CHANGES
-  pthread_mutex_lock(&interpreterLock);
+  lockInterpreter();
   m_interpreter = interp;
 #endif
@@ -808 +808 @@
   }
 #ifdef APPLE_CHANGES
-  pthread_mutex_unlock(&interpreterLock);
+  unlockInterpreter();
 #endif
 
@@ -955 +955 @@
   // remove from global chain (see init())
 #ifdef APPLE_CHANGES
-  pthread_mutex_lock(&interpreterLock);
+  lockInterpreter();
 #endif
   next->prev = prev;
@@ -967 +967 @@
   }
 #ifdef APPLE_CHANGES
-  pthread_mutex_unlock(&interpreterLock);
+  unlockInterpreter();
 #endif
 }
@@ -1006 +1006 @@
 {
 #ifdef APPLE_CHANGES
-  pthread_mutex_lock(&interpreterLock);
+  lockInterpreter();
 #endif
   // prevent against infinite recursion
@@ -1012 +1012 @@
 #ifdef APPLE_CHANGES
     Completion result = Completion(Throw,Error::create(globExec,GeneralError,"Recursion too deep"));
-    pthread_mutex_unlock(&interpreterLock);
+    unlockInterpreter();
     return result;
 #else
@@ -1044 +1044 @@
     err.put(globExec,"sid",Number(sid));
 #ifdef APPLE_CHANGES
-    pthread_mutex_unlock(&interpreterLock);
+    unlockInterpreter();
 #endif
     return Completion(Throw,err);
@@ -1089 +1089 @@
 
 #ifdef APPLE_CHANGES
-    pthread_mutex_unlock(&interpreterLock);
+    unlockInterpreter();
 #endif
   return res;