Changeset 1126 in webkit for trunk/JavaScriptCore/kjs/ustring.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/ustring.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -122 +122 @@
 UString::Rep UString::Rep::null = { 0, 0, 1 };
 UString UString::null;
+#ifdef APPLE_CHANGES
+// FIXME: fix this once static initializers for pthread_once_t
+pthread_once_t statBufferKeyOnce = {_PTHREAD_ONCE_SIG_init, {}};
+pthread_key_t statBufferKey;
+#else
 static char *statBuffer = 0L;
+#endif
 
 UChar::UChar(const UCharReference &c)
@@ -278 +284 @@
 }
 
+#ifdef APPLE_CHANGES
+static void statBufferKeyCleanup(void *statBuffer)
+{
+  if (statBuffer != NULL)
+    delete [] (char *)statBuffer;
+}
+
+static void statBufferKeyInit(void)
+{
+  pthread_key_create(&statBufferKey, statBufferKeyCleanup);
+}
+#endif
+
 char *UString::ascii() const
 {
+#ifdef APPLE_CHANGES
+  pthread_once(&statBufferKeyOnce, statBufferKeyInit);
+  char *statBuffer = (char *)pthread_getspecific(statBufferKey);
+#endif
   if (statBuffer)
     delete [] statBuffer;
@@ -288 +311 @@
   statBuffer[size()] = '\0';
 
+#ifdef APPLE_CHANGES
+  pthread_setspecific(statBufferKey, statBuffer);
+#endif
   return statBuffer;
 }