Changeset 10563 in webkit for trunk/JavaScriptCore/kjs/protected_values.cpp

Timestamp:

Sep 18, 2005, 11:57:28 PM (20 years ago)

Author:

mjs

Message:

Reviewed by Geoff.

• fixed <rdar://problem/4214783> REGRESSION: kjs_fast_malloc crash due to lack of locking on multiple threads (seen selecting volumes in the installer)

Make sure to lock using the InterpreterLock class in all places that need it
(including anything that uses the collector, the parser, the protect count hash table,
and anything that allocates via fast_malloc).

Also added assertions to ensure that the locking rules are followed for the relevant
resources.

• Makefile.am:
• bindings/NP_jsobject.cpp: (identifierFromNPIdentifier): (_NPN_Invoke): (_NPN_Evaluate): (_NPN_GetProperty): (_NPN_SetProperty): (_NPN_RemoveProperty): (_NPN_HasProperty): (_NPN_HasMethod): (_NPN_SetException):
• bindings/jni/jni_jsobject.cpp: (JSObject::call): (JSObject::eval): (JSObject::getMember): (JSObject::setMember): (JSObject::removeMember): (JSObject::getSlot): (JSObject::setSlot): (JSObject::toString): (JSObject::convertJObjectToValue):
• bindings/objc/WebScriptObject.mm: (-[WebScriptObject callWebScriptMethod:withArguments:]): (-[WebScriptObject evaluateWebScript:]): (-[WebScriptObject setValue:forKey:]): (-[WebScriptObject valueForKey:]): (-[WebScriptObject removeWebScriptKey:]): (-[WebScriptObject stringRepresentation]): (-[WebScriptObject webScriptValueAtIndex:]): (-[WebScriptObject setWebScriptValueAtIndex:value:]): (+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
• bindings/runtime.cpp: (Instance::createRuntimeObject):
• bindings/runtime_root.h:
• bindings/testbindings.cpp: (main):
• bindings/testbindings.mm: (main):
• kjs/fast_malloc.cpp: (KJS::kjs_fast_malloc): (KJS::kjs_fast_calloc): (KJS::kjs_fast_free): (KJS::kjs_fast_realloc):
• kjs/fast_malloc.h:
• kjs/identifier.h:
• kjs/internal.cpp: (InterpreterImp::InterpreterImp): (InterpreterImp::clear): (InterpreterImp::mark): (InterpreterImp::checkSyntax): (InterpreterImp::evaluate):
• kjs/internal.h: (KJS::InterpreterImp::globalObject):
• kjs/interpreter.cpp: (Interpreter::evaluate):
• kjs/interpreter.h: (KJS::InterpreterLock::InterpreterLock): (KJS::InterpreterLock::~InterpreterLock):
• kjs/nodes.h:
• kjs/protect.h: (KJS::ProtectedValue::ProtectedValue): (KJS::ProtectedValue::~ProtectedValue): (KJS::ProtectedValue::operator=): (KJS::ProtectedObject::ProtectedObject): (KJS::ProtectedObject::~ProtectedObject): (KJS::ProtectedObject::operator=): (KJS::ProtectedReference::ProtectedReference): (KJS::ProtectedReference::~ProtectedReference): (KJS::ProtectedReference::operator=):
• kjs/protected_object.h:
• kjs/protected_values.cpp: (KJS::ProtectedValues::getProtectCount): (KJS::ProtectedValues::increaseProtectCount): (KJS::ProtectedValues::decreaseProtectCount):
• kjs/string_object.cpp: (StringObjectImp::StringObjectImp):
• kjs/testkjs.cpp: (main):

File:

• trunk/JavaScriptCore/kjs/protected_values.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/protected_values.cpp

@@ -25 +25 @@
 #include "pointer_hash.h"
 #include "simple_number.h"
+#include "internal.h"
 #include <stdint.h>
 #include "value.h"
@@ -39 +40 @@
 int ProtectedValues::getProtectCount(ValueImp *k)
 {
+    assert(k);
+    assert(InterpreterImp::lockCount() > 0);
+
     if (!_table)
         return 0;
@@ -66 +70 @@
 {
     assert(k);
+    assert(InterpreterImp::lockCount() > 0);
 
     if (SimpleNumber::is(k))
@@ -115 +120 @@
 {
     assert(k);
+    assert(InterpreterImp::lockCount() > 0);
 
     if (SimpleNumber::is(k))