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

Timestamp:

Nov 22, 2005, 9:41:23 PM (20 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Geoff.

<rdar://problem/4139620> Seed: WebKit: hang when sending XMLHttpRequest if automatic proxy config is used

Also factored locking code completely into a separate class, and
added a convenient packaged way to temporarily drop locks.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/JSLock.cpp: Added. (KJS::initializeInterpreterLock): (KJS::InterpreterLock::lock): (KJS::InterpreterLock::unlock): (KJS::InterpreterLock::lockCount): (KJS::InterpreterLock::DropAllLocks::DropAllLocks): (KJS::InterpreterLock::DropAllLocks::~DropAllLocks):
• kjs/JSLock.h: Added. (KJS::InterpreterLock::InterpreterLock): (KJS::InterpreterLock::~InterpreterLock):
• kjs/internal.cpp:
• kjs/internal.h:
• kjs/interpreter.cpp:
• kjs/interpreter.h:
• kjs/protect.h:
• kjs/testkjs.cpp: (TestFunctionImp::callAsFunction):

WebCore:

Reviewed by Geoff.

<rdar://problem/4139620> Seed: WebKit: hang when sending XMLHttpRequest if automatic proxy config is used

• khtml/ecma/kjs_events.cpp: (KJS::JSLazyEventListener::parseCode):
• khtml/ecma/xmlhttprequest.cpp: (KJS::XMLHttpRequest::send):
• kwq/WebCoreJavaScript.mm:

File:

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

trunk/JavaScriptCore/kjs/internal.cpp

@@ -74 +74 @@
  
 #endif // APPLE_CHANGES
-
-#if defined(KJS_MULTIPLE_THREADS) && KJS_MULTIPLE_THREADS
-
-static pthread_once_t interpreterLockOnce = PTHREAD_ONCE_INIT;
-static pthread_mutex_t interpreterLock;
-static int interpreterLockCount = 0;
-
-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);
-  interpreterLockCount++;
-  Collector::registerThread();
-}
-
-static inline void unlockInterpreter()
-{
-  interpreterLockCount--;
-  pthread_mutex_unlock(&interpreterLock);
-}
-
-#else
-
-static inline void initializeInterpreterLock() { }
-static inline void lockInterpreter() { }
-static inline void unlockInterpreter() { }
-
-const int interpreterLockCount = 1;
-
-#endif
 
 // ------------------------------ UndefinedImp ---------------------------------
@@ -472 +432 @@
 
   recursion = 0;
-}
-
-void InterpreterImp::lock()
-{
-  lockInterpreter();
-
-  // FIXME: Hack-o-rama. To prevent construction of a global object with a null prototype (4342216),
-  // we need to intialize our constants before the first object is constructed. InterpreterImp::lock()
-  // is a good place to do this because you have to call it before doing any allocations. Once we change our 
-  // implementation to use immediate values, we should remove this code.
-  ConstantValues::initIfNeeded();
-}
-
-int InterpreterImp::lockCount()
-{
-  return interpreterLockCount;
-}
-
-void InterpreterImp::unlock()
-{
-  unlockInterpreter();
 }