[iOS] Release jscontext in bridge thread to avoid main thread deadloc…

…k. (#1822)
apache · Nov 27, 2018 · 78b887c · 78b887c
1 parent 1e757cd
commit 78b887c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm b/ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.mm
@@ -79,6 +79,10 @@ - (instancetype)initWithoutDefaultContext
 - (void)dealloc
 {
     _jsContext.instanceId = nil;
+    __block JSContext* theContext = _jsContext;
+    WXPerformBlockOnBridgeThread(^{
+        theContext = nil; // release the context in js thread to avoid main-thread deadlock
+    });
 }
 
 - (void)setJSContext:(JSContext *)context

diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h
@@ -23,7 +23,13 @@
 @class WXBridgeMethod;
 @class WXSDKInstance;
 
-extern void WXPerformBlockOnBridgeThread(void (^block)(void));
+#ifdef __cplusplus
+extern "C" {
+#endif
+    void WXPerformBlockOnBridgeThread(void (^block)(void));
+#ifdef __cplusplus
+}
+#endif
 
 @interface WXBridgeManager : NSObject