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

Timestamp:

Aug 9, 2002, 4:24:41 PM (23 years ago)

Author:

mjs

Message:

• fixed 2948835 - JavaScriptCore locking is too fine grained, makes it too slow

• kjs/collector.cpp: (Collector::allocate): (Collector::collect): (Collector::finalCheck): (Collector::numInterpreters): (Collector::numGCNotAllowedObjects): (Collector::numReferencedObjects):
• kjs/collector.h:
• kjs/internal.cpp: (initializeInterpreterLock): (lockInterpreter): (unlockInterpreter): (Parser::parse): (InterpreterImp::InterpreterImp): (InterpreterImp::clear): (InterpreterImp::evaluate):
• kjs/value.cpp: (ValueImp::ValueImp): (ValueImp::setGcAllowed):

File:

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

trunk/JavaScriptCore/kjs/internal.cpp

@@ -68 +68 @@
   const double Inf = *(const double*) Inf_Bytes;
 };
+
+#ifdef APPLE_CHANGES
+static pthread_once_t interpreterLockOnce = PTHREAD_ONCE_INIT;
+static pthread_mutex_t interpreterLock;
+
+static void initializeInterpreterLock()
+{
+  pthread_mutexattr_t attr;
+
+  pthread_mutexattr_init(&attr);
+  pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
+
+  pthread_mutex_init(&interpreterLock, &attr);
+}
+
+static inline void lockInterpreter()
+{
+  pthread_once(&interpreterLockOnce, initializeInterpreterLock);
+  pthread_mutex_lock(&interpreterLock);
+}
+
+static inline void unlockInterpreter()
+{
+  pthread_mutex_unlock(&interpreterLock);
+}
+
+#endif
+
 
 // ------------------------------ UndefinedImp ---------------------------------
@@ -689 +717 @@
 ProgramNode *Parser::progNode = 0;
 int Parser::sid = 0;
-#ifdef APPLE_CHANGES
-static pthread_mutex_t parserLock = PTHREAD_MUTEX_INITIALIZER;
-#endif
 
 ProgramNode *Parser::parse(const UChar *code, unsigned int length, int *sourceId,
                            int *errLine, UString *errMsg)
 {
-#ifdef APPLE_CHANGES
-  pthread_mutex_lock(&parserLock);
-#endif
   if (errLine)
     *errLine = -1;
@@ -727 +749 @@
 #endif
     delete prog;
-#ifdef APPLE_CHANGES
-    pthread_mutex_unlock(&parserLock);
-#endif
     return 0;
   }
 
-#ifdef APPLE_CHANGES
-  pthread_mutex_unlock(&parserLock);
-#endif
   return prog;
 }
@@ -778 +794 @@
   // as a root set for garbage collection
 #ifdef APPLE_CHANGES
-  Collector::lock();
+  pthread_mutex_lock(&interpreterLock);
   m_interpreter = interp;
 #endif
@@ -792 +808 @@
   }
 #ifdef APPLE_CHANGES
-  Collector::unlock();
+  pthread_mutex_unlock(&interpreterLock);
 #endif
 
@@ -939 +955 @@
   // remove from global chain (see init())
 #ifdef APPLE_CHANGES
-  Collector::lock();
+  pthread_mutex_lock(&interpreterLock);
 #endif
   next->prev = prev;
@@ -951 +967 @@
   }
 #ifdef APPLE_CHANGES
-  Collector::unlock();
+  pthread_mutex_unlock(&interpreterLock);
 #endif
 }
@@ -989 +1005 @@
 Completion InterpreterImp::evaluate(const UString &code, const Value &thisV)
 {
+#ifdef APPLE_CHANGES
+  pthread_mutex_lock(&interpreterLock);
+#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);
+    return result;
+#else
     return Completion(Throw,Error::create(globExec,GeneralError,"Recursion too deep"));
+#endif
   }
 
@@ -1004 +1029 @@
     bool cont = dbg->sourceParsed(globExec,sid,code,errLine);
     if (!cont)
+#ifdef APPLE_CHANGES
+      {
+        pthread_mutex_unlock(&interpreterLock);
+        return Completion(Break);
+      }
+#else
       return Completion(Break);
+#endif
   }
 
@@ -1011 +1043 @@
     Object err = Error::create(globExec,SyntaxError,errMsg.ascii(),errLine);
     err.put(globExec,"sid",Number(sid));
+#ifdef APPLE_CHANGES
+    pthread_mutex_unlock(&interpreterLock);
+#endif
     return Completion(Throw,err);
   }
@@ -1053 +1088 @@
   recursion--;
 
+#ifdef APPLE_CHANGES
+    pthread_mutex_unlock(&interpreterLock);
+#endif
   return res;
 }