Ignore:
Timestamp:
Jul 2, 2008, 12:00:53 AM (17 years ago)
Author:
[email protected]
Message:

Reviewed by Darin.

Disable JSLock for per-thread contexts.

No change on SunSpider.

  • kjs/JSGlobalData.h:
  • kjs/JSGlobalData.cpp: (KJS::JSGlobalData::JSGlobalData): (KJS::JSGlobalData::sharedInstance): Added isSharedInstance as a better way to tell whether the instance is shared (legacy).
  • kjs/JSLock.cpp: (KJS::createJSLockCount): (KJS::JSLock::lockCount): (KJS::setLockCount): (KJS::JSLock::JSLock): (KJS::JSLock::lock): (KJS::JSLock::unlock): (KJS::JSLock::currentThreadIsHoldingLock): (KJS::JSLock::DropAllLocks::DropAllLocks): (KJS::JSLock::DropAllLocks::~DropAllLocks):
  • kjs/JSLock.h: (KJS::JSLock::JSLock): (KJS::JSLock::~JSLock): Made JSLock and JSLock::DropAllLocks constructors take a parameter to decide whether to actually lock a mutex, or only to increment recursion count. We cannot turn it into no-op if we want to keep existing assertions working. Made recursion count per-thread, now that locks may not lock.
  • API/JSBase.cpp: (JSEvaluateScript): Take JSLock after casting JSContextRef to ExecState* (which doesn't need locking in any case), so that a decision whether to actually lock can be made. (JSCheckScriptSyntax): Ditto. (JSGarbageCollect): Only lock while collecting the shared heap, not the per-thread one.
  • API/JSObjectRef.cpp: (JSClassCreate): Don't lock, as there is no reason to. (JSClassRetain): Ditto. (JSClassRelease): Ditto. (JSPropertyNameArrayRetain): Ditto. (JSPropertyNameArrayRelease): Only lock while deleting the array, as that may touch identifier table. (JSPropertyNameAccumulatorAddName): Adding a string also involves an identifier table lookup, and possibly modification.
  • API/JSStringRef.cpp: (JSStringCreateWithCharacters): (JSStringCreateWithUTF8CString): (JSStringRetain): (JSStringRelease): (JSStringGetUTF8CString): (JSStringIsEqual):
  • API/JSStringRefCF.cpp: (JSStringCreateWithCFString): JSStringRef operations other than releasing do not need locking.
  • VM/Machine.cpp: Don't include unused JSLock.h.
  • kjs/CollectorHeapIntrospector.cpp: (KJS::CollectorHeapIntrospector::statistics): Don't take the lock for real, as heap introspection pauses the process anyway. It seems that the existing code could cause deadlocks.
  • kjs/Shell.cpp: (functionGC): (main): (jscmain): The test tool uses a per-thread context, so no real locking is required.
  • kjs/collector.h: (KJS::Heap::setGCProtectNeedsLocking): Optionally protect m_protectedValues access with a per-heap mutex. This is only needed for WebCore Database code, which violates the "no data migration between threads" by using ProtectedPtr on a background thread. (KJS::Heap::isShared): Keep a shared flag here, as well.
  • kjs/protect.h: (KJS::::ProtectedPtr): (KJS::::~ProtectedPtr): (KJS::::operator): (KJS::operator==): (KJS::operator!=): ProtectedPtr is ony used from WebCore, so it doesn't need to take JSLock. An assertion in Heap::protect/unprotect guards agains possible future unlocked uses of ProtectedPtr in JSC.
  • kjs/collector.cpp: (KJS::Heap::Heap): Initialize m_isShared. (KJS::Heap::~Heap): No need to lock for real during destruction, but must keep assertions in sweep() working. (KJS::destroyRegisteredThread): Registered thread list is only accessed for shared heap, so locking is always needed here. (KJS::Heap::registerThread): Ditto. (KJS::Heap::markStackObjectsConservatively): Use m_isShared instead of comparing to a shared instance for a small speedup. (KJS::Heap::setGCProtectNeedsLocking): Create m_protectedValuesMutex. There is currently no way to undo this - and ideally, Database code will be fixed to lo longer require this quirk. (KJS::Heap::protect): Take m_protectedValuesMutex (if it exists) while accessing m_protectedValues. (KJS::Heap::unprotect): Ditto. (KJS::Heap::markProtectedObjects): Ditto. (KJS::Heap::protectedGlobalObjectCount): Ditto. (KJS::Heap::protectedObjectCount): Ditto. (KJS::Heap::protectedObjectTypeCounts): Ditto.
  • kjs/ustring.cpp:
  • kjs/ustring.h: Don't include JSLock.h, which is no longer used here. As a result, an explicit include had to be added to many files in JavaScriptGlue, WebCore and WebKit.
  • kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::init):
  • API/JSCallbackConstructor.cpp: (KJS::constructJSCallback):
  • API/JSCallbackFunction.cpp: (KJS::JSCallbackFunction::call):
  • API/JSCallbackObjectFunctions.h: (KJS::::init): (KJS::::getOwnPropertySlot): (KJS::::put): (KJS::::deleteProperty): (KJS::::construct): (KJS::::hasInstance): (KJS::::call): (KJS::::getPropertyNames): (KJS::::toNumber): (KJS::::toString): (KJS::::staticValueGetter): (KJS::::callbackGetter):
  • API/JSContextRef.cpp: (JSGlobalContextCreate): (JSGlobalContextRetain): (JSGlobalContextRelease):
  • API/JSValueRef.cpp: (JSValueIsEqual): (JSValueIsStrictEqual): (JSValueIsInstanceOfConstructor): (JSValueMakeNumber): (JSValueMakeString): (JSValueToNumber): (JSValueToStringCopy): (JSValueToObject): (JSValueProtect): (JSValueUnprotect):
  • JavaScriptCore.exp:
  • kjs/PropertyNameArray.h: (KJS::PropertyNameArray::globalData):
  • kjs/interpreter.cpp: (KJS::Interpreter::checkSyntax): (KJS::Interpreter::evaluate): Pass a parameter to JSLock/JSLock::DropAllLocks to decide whether the lock needs to be taken.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/API/JSObjectRef.cpp

    r34854 r34947  
    4848JSClassRef JSClassCreate(const JSClassDefinition* definition)
    4949{
    50     JSLock lock;
    5150    RefPtr<OpaqueJSClass> jsClass = (definition->attributes & kJSClassAttributeNoAutomaticPrototype)
    5251        ? OpaqueJSClass::createNoAutomaticPrototype(definition)
    … …  
    5857JSClassRef JSClassRetain(JSClassRef jsClass)
    5958{
    60     JSLock lock;
    6159    jsClass->ref();
    6260    return jsClass;
    … …  
    6563void JSClassRelease(JSClassRef jsClass)
    6664{
    67     JSLock lock;
    6865    jsClass->deref();
    6966}
    … …  
    7168JSObjectRef JSObjectMake(JSContextRef ctx, JSClassRef jsClass, void* data)
    7269{
    73     JSLock lock;
    74     ExecState* exec = toJS(ctx);
     70    ExecState* exec = toJS(ctx);
     71    JSLock lock(exec);
    7572
    7673    if (!jsClass)
    … …  
    8683JSObjectRef JSObjectMakeFunctionWithCallback(JSContextRef ctx, JSStringRef name, JSObjectCallAsFunctionCallback callAsFunction)
    8784{
    88     JSLock lock;
    89     ExecState* exec = toJS(ctx);
     85    ExecState* exec = toJS(ctx);
     86    JSLock lock(exec);
    9087    Identifier nameID = name ? Identifier(exec, toJS(name)) : Identifier(exec, "anonymous");
    9188   
    … …  
    9592JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsClass, JSObjectCallAsConstructorCallback callAsConstructor)
    9693{
    97     JSLock lock;
    98     ExecState* exec = toJS(ctx);
     94    ExecState* exec = toJS(ctx);
     95    JSLock lock(exec);
    9996   
    10097    JSValue* jsPrototype = jsClass
    … …  
    109106JSObjectRef JSObjectMakeFunction(JSContextRef ctx, JSStringRef name, unsigned parameterCount, const JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
    110107{
    111     JSLock lock;
    112    
    113     ExecState* exec = toJS(ctx);
     108    ExecState* exec = toJS(ctx);
     109    JSLock lock(exec);
     110
    114111    UString::Rep* bodyRep = toJS(body);
    115112    UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
    … …  
    148145bool JSObjectHasProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName)
    149146{
    150     JSLock lock;
    151     ExecState* exec = toJS(ctx);
     147    ExecState* exec = toJS(ctx);
     148    JSLock lock(exec);
    152149    JSObject* jsObject = toJS(object);
    153150    UString::Rep* nameRep = toJS(propertyName);
    … …  
    158155JSValueRef JSObjectGetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
    159156{
    160     JSLock lock;
    161     ExecState* exec = toJS(ctx);
     157    ExecState* exec = toJS(ctx);
     158    JSLock lock(exec);
    162159    JSObject* jsObject = toJS(object);
    163160    UString::Rep* nameRep = toJS(propertyName);
    … …  
    174171void JSObjectSetProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef value, JSPropertyAttributes attributes, JSValueRef* exception)
    175172{
    176     JSLock lock;
    177     ExecState* exec = toJS(ctx);
     173    ExecState* exec = toJS(ctx);
     174    JSLock lock(exec);
    178175    JSObject* jsObject = toJS(object);
    179176    Identifier name(exec, toJS(propertyName));
    … …  
    194191JSValueRef JSObjectGetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef* exception)
    195192{
    196     JSLock lock;
    197     ExecState* exec = toJS(ctx);
     193    ExecState* exec = toJS(ctx);
     194    JSLock lock(exec);
    198195    JSObject* jsObject = toJS(object);
    199196
    … …  
    210207void JSObjectSetPropertyAtIndex(JSContextRef ctx, JSObjectRef object, unsigned propertyIndex, JSValueRef value, JSValueRef* exception)
    211208{
    212     JSLock lock;
    213     ExecState* exec = toJS(ctx);
     209    ExecState* exec = toJS(ctx);
     210    JSLock lock(exec);
    214211    JSObject* jsObject = toJS(object);
    215212    JSValue* jsValue = toJS(value);
    … …  
    225222bool JSObjectDeleteProperty(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception)
    226223{
    227     JSLock lock;
    228     ExecState* exec = toJS(ctx);
     224    ExecState* exec = toJS(ctx);
     225    JSLock lock(exec);
    229226    JSObject* jsObject = toJS(object);
    230227    UString::Rep* nameRep = toJS(propertyName);
    … …  
    274271JSValueRef JSObjectCallAsFunction(JSContextRef ctx, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    275272{
    276     JSLock lock;
    277     ExecState* exec = toJS(ctx);
     273    ExecState* exec = toJS(ctx);
     274    JSLock lock(exec);
    278275    JSObject* jsObject = toJS(object);
    279276    JSObject* jsThisObject = toJS(thisObject);
    … …  
    310307JSObjectRef JSObjectCallAsConstructor(JSContextRef ctx, JSObjectRef object, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
    311308{
    312     JSLock lock;
    313     ExecState* exec = toJS(ctx);
     309    ExecState* exec = toJS(ctx);
     310    JSLock lock(exec);
    314311    JSObject* jsObject = toJS(object);
    315312
    … …  
    344341JSPropertyNameArrayRef JSObjectCopyPropertyNames(JSContextRef ctx, JSObjectRef object)
    345342{
    346     JSLock lock;
    347     JSObject* jsObject = toJS(object);
    348     ExecState* exec = toJS(ctx);
     343    JSObject* jsObject = toJS(object);
     344    ExecState* exec = toJS(ctx);
     345    JSLock lock(exec);
    349346   
    350347    JSPropertyNameArrayRef propertyNames = new OpaqueJSPropertyNameArray(&exec->globalData());
    … …  
    356353JSPropertyNameArrayRef JSPropertyNameArrayRetain(JSPropertyNameArrayRef array)
    357354{
    358     JSLock lock;
    359355    ++array->refCount;
    360356    return array;
    … …  
    363359void JSPropertyNameArrayRelease(JSPropertyNameArrayRef array)
    364360{
    365     JSLock lock;
    366     if (--array->refCount == 0)
     361    if (--array->refCount == 0) {
     362        JSLock lock(array->array.globalData()->isSharedInstance);
    367363        delete array;
     364    }
    368365}
    369366
    … …  
    380377void JSPropertyNameAccumulatorAddName(JSPropertyNameAccumulatorRef array, JSStringRef propertyName)
    381378{
    382     JSLock lock;
    383379    PropertyNameArray* propertyNames = toJS(array);
    384380    UString::Rep* rep = toJS(propertyName);
     381
     382    JSLock lock(propertyNames->globalData()->isSharedInstance);
    385383    propertyNames->add(rep);
    386384}
Note: See TracChangeset for help on using the changeset viewer.