[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit b7df5c06b8803b8c0bdb0eae32193bad0077f66a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Aug 10 00:04:39 2002 +0000

    	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):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1790 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index bf03487..4619ae7 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,15 @@
 2002-08-09  Maciej Stachowiak  <mjs at apple.com>
 
+	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):
+
+2002-08-09  Maciej Stachowiak  <mjs at apple.com>
+
         - fixed 2948835 - JavaScriptCore locking is too fine grained, makes it too slow
 
 	* kjs/collector.cpp:
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index bf03487..4619ae7 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-08-09  Maciej Stachowiak  <mjs at apple.com>
 
+	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):
+
+2002-08-09  Maciej Stachowiak  <mjs at apple.com>
+
         - fixed 2948835 - JavaScriptCore locking is too fine grained, makes it too slow
 
 	* kjs/collector.cpp:
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index bf03487..4619ae7 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-08-09  Maciej Stachowiak  <mjs at apple.com>
 
+	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):
+
+2002-08-09  Maciej Stachowiak  <mjs at apple.com>
+
         - fixed 2948835 - JavaScriptCore locking is too fine grained, makes it too slow
 
 	* kjs/collector.cpp:
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index ed40fa9..4844c24 100644
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -793,7 +793,7 @@ InterpreterImp::InterpreterImp(Interpreter *interp, const Object &glob)
   // add this interpreter to the global chain
   // as a root set for garbage collection
 #ifdef APPLE_CHANGES
-  pthread_mutex_lock(&interpreterLock);
+  lockInterpreter();
   m_interpreter = interp;
 #endif
   if (s_hook) {
@@ -807,7 +807,7 @@ InterpreterImp::InterpreterImp(Interpreter *interp, const Object &glob)
     globalInit();
   }
 #ifdef APPLE_CHANGES
-  pthread_mutex_unlock(&interpreterLock);
+  unlockInterpreter();
 #endif
 
 #ifndef APPLE_CHANGES
@@ -954,7 +954,7 @@ void InterpreterImp::clear()
   //fprintf(stderr,"InterpreterImp::clear\n");
   // remove from global chain (see init())
 #ifdef APPLE_CHANGES
-  pthread_mutex_lock(&interpreterLock);
+  lockInterpreter();
 #endif
   next->prev = prev;
   prev->next = next;
@@ -966,7 +966,7 @@ void InterpreterImp::clear()
     globalClear();
   }
 #ifdef APPLE_CHANGES
-  pthread_mutex_unlock(&interpreterLock);
+  unlockInterpreter();
 #endif
 }
 
@@ -1005,13 +1005,13 @@ bool InterpreterImp::checkSyntax(const UString &code)
 Completion InterpreterImp::evaluate(const UString &code, const Value &thisV)
 {
 #ifdef APPLE_CHANGES
-  pthread_mutex_lock(&interpreterLock);
+  lockInterpreter();
 #endif
   // prevent against infinite recursion
   if (recursion >= 20) {
 #ifdef APPLE_CHANGES
     Completion result = Completion(Throw,Error::create(globExec,GeneralError,"Recursion too deep"));
-    pthread_mutex_unlock(&interpreterLock);
+    unlockInterpreter();
     return result;
 #else
     return Completion(Throw,Error::create(globExec,GeneralError,"Recursion too deep"));
@@ -1043,7 +1043,7 @@ Completion InterpreterImp::evaluate(const UString &code, const Value &thisV)
     Object err = Error::create(globExec,SyntaxError,errMsg.ascii(),errLine);
     err.put(globExec,"sid",Number(sid));
 #ifdef APPLE_CHANGES
-    pthread_mutex_unlock(&interpreterLock);
+    unlockInterpreter();
 #endif
     return Completion(Throw,err);
   }
@@ -1088,7 +1088,7 @@ Completion InterpreterImp::evaluate(const UString &code, const Value &thisV)
   recursion--;
 
 #ifdef APPLE_CHANGES
-    pthread_mutex_unlock(&interpreterLock);
+    unlockInterpreter();
 #endif
   return res;
 }

-- 
WebKit Debian packaging