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

Timestamp:

May 10, 2002, 9:41:01 AM (23 years ago)

Author:

mjs

Message:

Reviewed by: Ken Kocienda and Darin Adler

Fixed the following bug:

Radar 2890573 - JavaScriptCore needs to be thread-safe

Actually this is only a weak form of thread-safety - you can safely
use different interpreters from different threads at the same
time. If you try to use a single interpreter object from multiple
threads, you need to provide your own locking.

• kjs/collector.h, kjs/collector.cpp: (Collector::lock, Collector::unlock): Trivial implementation of a recursive mutex. (Collector::allocate): Lock around the body of this function. (Collector::collect): Likewise. (Collector::finalCheck): Likewise. (Collector::numInterpreters): Likewise. (Collector::numGCNotAllowedObjects): Likewise. (Collector::numReferencedObjects): Likewise.
• kjs/internal.cpp: (Parser::parse): use a mutex to lock around the whole parse, since it uses a bunch of global state. (InterpreterImp::InterpreterImp): Grab the Collector lock here, both the mutually exclude calls to the body of this function, and to protect the s_hook static member which the collector pokes at. (InterpreterImp::clear): Likewise.
• kjs/ustring.cpp: (statBufferKeyCleanup, statBufferKeyInit, UString::ascii): Convert use of static variable
• kjs/value.cpp: (ValueImp::ValueImp, ValueImp::mark, ValueImp::marked, ValueImp::setGcAllowed): Grab the GC lock around any flag changes.

File:

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

trunk/JavaScriptCore/kjs/internal.cpp

@@ -689 +689 @@
 ProgramNode *Parser::progNode = 0;
 int Parser::sid = 0;
+#ifdef APPLE_CHANGES
+static pthread_mutex_t parserLock = {_PTHREAD_MUTEX_SIG_init, {}};
+#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;
@@ -721 +727 @@
 #endif
     delete prog;
+#ifdef APPLE_CHANGES
+    pthread_mutex_unlock(&parserLock);
+#endif
     return 0;
   }
 
+#ifdef APPLE_CHANGES
+  pthread_mutex_unlock(&parserLock);
+#endif
   return prog;
 }
@@ -765 +777 @@
   // add this interpreter to the global chain
   // as a root set for garbage collection
+#ifdef APPLE_CHANGES
+  Collector::lock();
+#endif
   if (s_hook) {
     prev = s_hook;
@@ -775 +790 @@
     globalInit();
   }
+#ifdef APPLE_CHANGES
+  Collector::unlock();
+#endif
 
   m_interpreter = interp;
@@ -927 +945 @@
   //fprintf(stderr,"InterpreterImp::clear\n");
   // remove from global chain (see init())
+#ifdef APPLE_CHANGES
+  Collector::lock();
+#endif
   next->prev = prev;
   prev->next = next;
@@ -936 +957 @@
     globalClear();
   }
+#ifdef APPLE_CHANGES
+  Collector::unlock();
+#endif
 }