Add a JSC API to allow acquiring the JSLock

tadeuzagallo · tadeuzagallo · commit 799392581447 · 2020-12-10T23:10:36.000Z
https://bugs.webkit.org/show_bug.cgi?id=219663 Reviewed by Filip Pizlo. PerformanceTests: This patch does 3 things: - Change how the geomean is calculated in api-bench to avoid overflowing - Allow linking against the local build we're benchmarking - Adopt the new JSLock API in the UpcomingAPI subtests Using the new API the score improves by ~13.5%. Here are the results for each of the "UpcomingAPI" subtests plus the total score: Before After RichardsMostlyC: 77ms 23ms RichardsMostlyObjC: 309ms 282ms RichardsMostlySwift 305ms 280ms RichardsSomeC: 101ms 95ms RichardsSomeObjC: 160ms 157ms RichardsSomeSwift: 201ms 202ms ------------------------------------------ Score: 29.5974 33.6404 * APIBench/UpcomingAPI/RichardsMostlyC/RichardsMostlyC/richards.c: (workfn): * APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC.xcodeproj/xcshareddata/xcschemes/RichardsMostlyObjC.xcscheme: Renamed from PerformanceTests/APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC.xcodeproj/xcshareddata/xcschemes/RichardsMostlySwift.xcscheme. * APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC/WorkerTask.m: (+[WorkerTask context]): * APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift.xcodeproj/project.pbxproj: * APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/BridgingHeader.h: Copied from PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/WorkerTask.swift. * APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/WorkerTask.swift: * APIBench/UpcomingAPI/RichardsSomeC/RichardsSomeC/main.m: (main): * APIBench/UpcomingAPI/RichardsSomeObjC/RichardsSomeObjC/main.m: (main): * APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift.xcodeproj/project.pbxproj: * APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift/BridgingHeader.h: Copied from PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/WorkerTask.swift. * APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift/main.swift: * APIBench/api-bench: Source/JavaScriptCore: Introduce two new functions to the C API: JSLock and JSUnlock. These functions allow users to take control of the JSContext's lock, which can greatly reduce the overhead of bridging between JS and native. * API/JSLockRef.cpp: Added. (JSLock): (JSUnlock): * API/JSLockRefPrivate.h: Added. * API/JSValueRef.cpp: * JavaScriptCore.xcodeproj/project.pbxproj: * Sources.txt: Canonical link: https://commits.webkit.org/232323@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270659 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/PerformanceTests/APIBench/CurrentAPI/RichardsMostlyC/RichardsMostlyC/richards.c b/PerformanceTests/APIBench/CurrentAPI/RichardsMostlyC/RichardsMostlyC/richards.c
@@ -10,9 +10,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <JavaScriptCore/JavaScriptCore.h>
-#import <QuartzCore/QuartzCore.h>
+#include <QuartzCore/QuartzCore.h>
 
 #if 1
 #define                Count           1000
diff --git a/PerformanceTests/APIBench/References/RichardsC/RichardsC/richards.c b/PerformanceTests/APIBench/References/RichardsC/RichardsC/richards.c
@@ -10,9 +10,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <JavaScriptCore/JavaScriptCore.h>
-#import <QuartzCore/QuartzCore.h>
+#include <QuartzCore/QuartzCore.h>
 
 #if 1
 #define                Count           1000
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlyC/RichardsMostlyC/richards.c b/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlyC/RichardsMostlyC/richards.c
@@ -10,9 +10,9 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <JavaScriptCore/JSLockRefPrivate.h>
 #include <JavaScriptCore/JavaScriptCore.h>
-#import <QuartzCore/QuartzCore.h>
+#include <QuartzCore/QuartzCore.h>
 
 #if 1
 #define                Count           1000
@@ -322,6 +322,7 @@ struct task *workfn(struct packet *pkt)
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         ctx = JSGlobalContextCreate(NULL);
+        JSLock(ctx);
         JSObjectRef globalObject = JSContextGetGlobalObject(ctx);
         
         JSStringRef source = readFile("richards.js");
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC.xcodeproj/xcshareddata/xcschemes/RichardsMostlyObjC.xcscheme b/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC.xcodeproj/xcshareddata/xcschemes/RichardsMostlyObjC.xcscheme
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC/WorkerTask.m b/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC/WorkerTask.m
@@ -25,6 +25,7 @@
 
 #import "WorkerTask.h"
 
+#import <JavaScriptCore/JSLockRefPrivate.h>
 #import <JavaScriptCore/JavaScriptCore.h>
 
 @implementation WorkerTask {
@@ -44,6 +45,7 @@ + (JSContext *)context {
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         context = [[JSContext alloc] init];
+        JSLock(context.JSGlobalContextRef);
         [context setExceptionHandler:^(JSContext *context, JSValue *exception) {
             NSLog(@"%@", exception.toString);
             exit(2);
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift.xcodeproj/project.pbxproj b/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift.xcodeproj/project.pbxproj
@@ -44,6 +44,7 @@
 		140AAC3F249B01D10001F11E /* DeviceTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceTask.swift; sourceTree = "<group>"; };
 		1415AD222499BC5C005BB2E4 /* RichardsMostlySwift */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = RichardsMostlySwift; sourceTree = BUILT_PRODUCTS_DIR; };
 		1415AD252499BC5C005BB2E4 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+		145087E92580581900D94197 /* BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -76,6 +77,7 @@
 		1415AD242499BC5C005BB2E4 /* RichardsMostlySwift */ = {
 			isa = PBXGroup;
 			children = (
+				145087E92580581900D94197 /* BridgingHeader.h */,
 				140AAC3F249B01D10001F11E /* DeviceTask.swift */,
 				140AAC3D249B01D10001F11E /* HandlerTask.swift */,
 				140AAC3C249B01D10001F11E /* IdleTask.swift */,
@@ -282,6 +284,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = RichardsMostlySwift/BridgingHeader.h;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -291,6 +294,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = RichardsMostlySwift/BridgingHeader.h;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/BridgingHeader.h b/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/BridgingHeader.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#pragma once
+
+#include <JavaScriptCore/JSLockRefPrivate.h>
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/WorkerTask.swift b/PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/WorkerTask.swift
@@ -31,6 +31,7 @@ class WorkerTask : Task {
     private static let context : JSContext = {
         let context = JSContext()!
         let source = try! String(contentsOfFile: "richards.js")
+        JSLock(context.jsGlobalContextRef)
         context.evaluateScript(source)
         context.exceptionHandler = { context, exception in
             print(exception!.toString()!)
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeC/RichardsSomeC/main.m b/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeC/RichardsSomeC/main.m
@@ -24,6 +24,7 @@
 */
 
 #import <Foundation/Foundation.h>
+#import <JavaScriptCore/JSLockRefPrivate.h>
 #import <JavaScriptCore/JavaScriptCore.h>
 #import <QuartzCore/QuartzCore.h>
 
@@ -132,7 +133,7 @@ int main()
     JSGlobalContextRef context = JSGlobalContextCreate(NULL);
     if (!context)
         exit(1);
-    
+    JSLock(context);
     JSValueRef exception = NULL;
     JSObjectRef globalObject = JSContextGetGlobalObject(context);
     
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeObjC/RichardsSomeObjC/main.m b/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeObjC/RichardsSomeObjC/main.m
@@ -24,6 +24,7 @@
 */
 
 #import <Foundation/Foundation.h>
+#import <JavaScriptCore/JSLockRefPrivate.h>
 #import <JavaScriptCore/JavaScriptCore.h>
 #import <QuartzCore/QuartzCore.h>
 
@@ -93,7 +94,7 @@ int main()
     JSContext *context = [[JSContext alloc] init];
     if (!context)
         exit(1);
-
+    JSLock(context.JSGlobalContextRef);
     [context setObject:WorkerTask.self forKeyedSubscript:@"WorkerTask"];
     [context setExceptionHandler:^(JSContext *context, JSValue *exception) {
         NSLog(@"%@", exception.toString);
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift.xcodeproj/project.pbxproj b/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift.xcodeproj/project.pbxproj
@@ -28,6 +28,7 @@
 		1401181824998517003987A9 /* RichardsSomeSwift */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = RichardsSomeSwift; sourceTree = BUILT_PRODUCTS_DIR; };
 		1401181B24998517003987A9 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
 		1415AD1624998605005BB2E4 /* richards.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = richards.js; sourceTree = "<group>"; };
+		145087EC258058B800D94197 /* BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -60,6 +61,7 @@
 		1401181A24998517003987A9 /* RichardsSomeSwift */ = {
 			isa = PBXGroup;
 			children = (
+				145087EC258058B800D94197 /* BridgingHeader.h */,
 				1401181B24998517003987A9 /* main.swift */,
 				1415AD1624998605005BB2E4 /* richards.js */,
 			);
@@ -250,6 +252,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = RichardsSomeSwift/BridgingHeader.h;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -259,6 +262,7 @@
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_OBJC_BRIDGING_HEADER = RichardsSomeSwift/BridgingHeader.h;
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift/BridgingHeader.h b/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift/BridgingHeader.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#pragma once
+
+#include <JavaScriptCore/JSLockRefPrivate.h>
diff --git a/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift/main.swift b/PerformanceTests/APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift/main.swift
@@ -83,6 +83,8 @@ guard let context = JSContext() else {
     exit(1)
 }
 
+JSLock(context.jsGlobalContextRef)
+
 context.setObject(WorkerTask.self, forKeyedSubscript: "WorkerTask" as NSString)
 context.exceptionHandler = { context, exception in
     print(exception?.toString() as Any)
diff --git a/PerformanceTests/APIBench/api-bench b/PerformanceTests/APIBench/api-bench
@@ -36,6 +36,7 @@ BUILD_DIRECTORIES=()
 REFERENCES=("X")
 CURRENT_API=()
 UPCOMING_API=()
+ARCHS=${ARCHS:-$(uname -m)}
 
 shouldBuild=true
 runReferences=true
@@ -146,11 +147,12 @@ buildBenchmark() {
         return
     fi
 
-    log "Building $BENCHMARK_NAME..."
-    xcodebuild -project "$project" -target "$BENCHMARK_NAME" -configuration Release build
+    log "Building $BENCHMARK_NAME... (FRAMEWORK_SEARCH_PATHS='$BUILD_DIRECTORY')"
+    xcodebuild -project "$project" -target "$BENCHMARK_NAME" -configuration Release build "FRAMEWORK_SEARCH_PATHS='$BUILD_DIRECTORY'" "ARCHS='$ARCHS'"
 }
 
 build() {
+    BUILD_DIRECTORY=$1
     forEachBenchmark "buildBenchmark"
 }
 
@@ -223,7 +225,7 @@ printResults() {
     fi
 
     local score count
-    score=1
+    score=0
     count=0
     
     printCategory() {
@@ -237,12 +239,12 @@ printResults() {
             avg=$(computeAverage "$benchmarkID")
             printAverage "$benchmarkID" "$avg"
             count=$((count + 1))
-            score=$((score * avg))
+            score=$(echo "$score" "$avg" | awk '{print ($1 + log($2)) }')
         done
     }
     printCategory "CURRENT_API"
     printCategory "UPCOMING_API"
-    score=$(echo "$score" "$count" | awk '{ print(5000.0 / ($1.0 ^ (1.0 / $2))) }')
+    score=$(echo "$score" "$count" | awk '{ print(5000.0 / exp($1 / $2)) }')
 
     echo ""
     echo "Score: $score"
@@ -265,11 +267,11 @@ run() {
 main() {
     collectFlags "$@"
     collectBenchmarks
-    if [ "$shouldBuild" == true ]; then
-        build
-    fi
-
     for buildDirectory in "${BUILD_DIRECTORIES[@]}"; do
+        if [ "$shouldBuild" == true ]; then
+            build "$buildDirectory"
+        fi
+
         run "$buildDirectory"
     done
 }
diff --git a/PerformanceTests/ChangeLog b/PerformanceTests/ChangeLog
@@ -1,3 +1,45 @@
+2020-12-10  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Add a JSC API to allow acquiring the JSLock
+        https://bugs.webkit.org/show_bug.cgi?id=219663
+
+        Reviewed by Filip Pizlo.
+
+        This patch does 3 things:
+        - Change how the geomean is calculated in api-bench to avoid overflowing
+        - Allow linking against the local build we're benchmarking
+        - Adopt the new JSLock API in the UpcomingAPI subtests
+
+        Using the new API the score improves by ~13.5%. Here are the results for each
+        of the "UpcomingAPI" subtests plus the total score:
+
+                                Before       After
+        RichardsMostlyC:          77ms        23ms
+        RichardsMostlyObjC:      309ms       282ms
+        RichardsMostlySwift      305ms       280ms
+        RichardsSomeC:           101ms        95ms
+        RichardsSomeObjC:        160ms       157ms
+        RichardsSomeSwift:       201ms       202ms
+        ------------------------------------------
+        Score:                 29.5974     33.6404
+
+        * APIBench/UpcomingAPI/RichardsMostlyC/RichardsMostlyC/richards.c:
+        (workfn):
+        * APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC.xcodeproj/xcshareddata/xcschemes/RichardsMostlyObjC.xcscheme: Renamed from PerformanceTests/APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC.xcodeproj/xcshareddata/xcschemes/RichardsMostlySwift.xcscheme.
+        * APIBench/UpcomingAPI/RichardsMostlyObjC/RichardsMostlyObjC/WorkerTask.m:
+        (+[WorkerTask context]):
+        * APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift.xcodeproj/project.pbxproj:
+        * APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/BridgingHeader.h: Copied from PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/WorkerTask.swift.
+        * APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/WorkerTask.swift:
+        * APIBench/UpcomingAPI/RichardsSomeC/RichardsSomeC/main.m:
+        (main):
+        * APIBench/UpcomingAPI/RichardsSomeObjC/RichardsSomeObjC/main.m:
+        (main):
+        * APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift.xcodeproj/project.pbxproj:
+        * APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift/BridgingHeader.h: Copied from PerformanceTests/APIBench/UpcomingAPI/RichardsMostlySwift/RichardsMostlySwift/WorkerTask.swift.
+        * APIBench/UpcomingAPI/RichardsSomeSwift/RichardsSomeSwift/main.swift:
+        * APIBench/api-bench:
+
 2020-12-07  Don Olmstead  <don.olmstead@sony.com>
 
         [CMake] Remove WEBKIT_WRAP_SOURCELIST
diff --git a/Source/JavaScriptCore/API/JSLockRef.cpp b/Source/JavaScriptCore/API/JSLockRef.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "JSLockRefPrivate.h"
+
+#include "JSLock.h"
+
+using namespace JSC;
+
+void JSLock(JSContextRef ctx)
+{
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+    JSGlobalObject* globalObject = toJS(ctx);
+    globalObject->vm().apiLock().lock();
+}
+
+void JSUnlock(JSContextRef ctx)
+{
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return;
+    }
+    JSGlobalObject* globalObject = toJS(ctx);
+    globalObject->vm().apiLock().unlock();
+}
diff --git a/Source/JavaScriptCore/API/JSLockRefPrivate.h b/Source/JavaScriptCore/API/JSLockRefPrivate.h
diff --git a/Source/JavaScriptCore/API/JSValueRef.cpp b/Source/JavaScriptCore/API/JSValueRef.cpp
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
diff --git a/Source/JavaScriptCore/Sources.txt b/Source/JavaScriptCore/Sources.txt
