feat: support multi-isolates

yulingtianxia · yulingtianxia · commit 9f21cb5ca25e · 2021-05-09T23:45:23.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,6 @@ build/
 
 .idea/
 
-.cxx/
+.cxx/
+
+.fvm/
diff --git a/dart_native/example/lib/ios/unit_test.dart b/dart_native/example/lib/ios/unit_test.dart
@@ -1,4 +1,6 @@
+import 'dart:async';
 import 'dart:ffi';
+import 'dart:isolate';
 
 import 'package:dart_native/dart_native.dart';
 import 'package:dart_native_example/ios/delegatestub.dart';
@@ -153,4 +155,25 @@ testIOS(RuntimeStub stub, DelegateStub delegate) {
 
   NSNotificationCenter.defaultCenter.addObserver(
       delegate, delegate.handleNotification, 'SampleDartNotification', nil);
+
+  Isolate.spawn(_checkTimer, stub.pointer.address);
+  Isolate.spawn(_checkTimer1, stub.pointer.address);
+}
+
+void _checkTimer(int addr) async {
+  RuntimeStub stub = RuntimeStub.fromPointer(Pointer.fromAddress(addr));
+  Timer.periodic(new Duration(seconds: 1), (Timer t) {
+    stub.fooCompletion(() {
+      print('hello completion block on another isolate!');
+    });
+  });
+}
+
+void _checkTimer1(int addr) async {
+  RuntimeStub stub = RuntimeStub.fromPointer(Pointer.fromAddress(addr));
+  Timer.periodic(new Duration(seconds: 1), (Timer t) {
+    stub.fooCompletion(() {
+      print('hello completion block on third isolate!');
+    });
+  });
 }
diff --git a/dart_native/example/pubspec.lock b/dart_native/example/pubspec.lock
@@ -168,7 +168,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.3.16"
+    version: "0.3.17"
   dart_native_gen:
     dependency: transitive
     description:
diff --git a/dart_native/ios/Classes/DNBlockWrapper.h b/dart_native/ios/Classes/DNBlockWrapper.h
@@ -7,6 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import "DNMacro.h"
+#import "dart_api_dl.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -21,11 +22,13 @@ typedef void (*NativeBlockCallback)(void *_Nullable *_Null_unspecified args, voi
 @property (nonatomic, readonly) NativeBlockCallback callback;
 @property (nonatomic, getter=hasStret, readonly) BOOL stret;
 @property (nonatomic, readonly) int64_t sequence;
+@property (nonatomic, readonly) Dart_Port dartPort;
 
 - (intptr_t)blockAddress;
 
 - (instancetype)initWithTypeString:(char *)typeString
                           callback:(NativeBlockCallback)callback
+                          dartPort:(Dart_Port)dartPort
                              error:(out NSError **)error;
 
 @end
diff --git a/dart_native/ios/Classes/DNBlockWrapper.m b/dart_native/ios/Classes/DNBlockWrapper.m
@@ -125,6 +125,7 @@ @implementation DNBlockWrapper
 
 - (instancetype)initWithTypeString:(char *)typeString
                           callback:(NativeBlockCallback)callback
+                          dartPort:(Dart_Port)dartPort
                              error:(out NSError **)error {
     self = [super init];
     if (self) {
@@ -134,6 +135,7 @@ - (instancetype)initWithTypeString:(char *)typeString
         if (_typeString.length > 0) {
             _callback = callback;
             _thread = NSThread.currentThread;
+            _dartPort = dartPort;
             [self initBlockWithError:error];
             atomic_fetch_add(&_seq, 1);
             _sequence = _seq;
@@ -149,7 +151,7 @@ - (void)dealloc {
         free((void *)_typeEncodings[i]);
     }
     free(_typeEncodings);
-    NotifyDeallocToDart(_sequence);
+    NotifyDeallocToDart(_sequence, _dartPort);
 }
 
 - (void)initBlockWithError:(out NSError **)error {
diff --git a/dart_native/ios/Classes/DNMethodIMP.h b/dart_native/ios/Classes/DNMethodIMP.h
@@ -6,6 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "dart_api_dl.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -19,9 +20,11 @@ typedef void (*NativeMethodCallback)(void *_Nullable *_Null_unspecified args,
 
 @property (nonatomic, readonly) NativeMethodCallback callback;
 @property (nonatomic, getter=hasStret, readonly) BOOL stret;
+@property (nonatomic, readonly) Dart_Port dartPort;
 
 - (instancetype)initWithTypeEncoding:(const char *)typeEncodings
                             callback:(NativeMethodCallback)callback
+                            dartPort:(Dart_Port)dartPort
                                error:(NSError **)error;
 - (IMP)imp;
 
diff --git a/dart_native/ios/Classes/DNMethodIMP.m b/dart_native/ios/Classes/DNMethodIMP.m
@@ -40,6 +40,7 @@ @implementation DNMethodIMP
 
 - (instancetype)initWithTypeEncoding:(const char *)typeEncoding
                             callback:(NativeMethodCallback)callback
+                            dartPort:(Dart_Port)dartPort
                                error:(out NSError **)error {
     self = [super init];
     if (self) {
@@ -54,6 +55,7 @@ - (instancetype)initWithTypeEncoding:(const char *)typeEncoding
         strlcpy(_typeEncoding, typeEncoding, length);
         _callback = callback;
         _thread = NSThread.currentThread;
+        _dartPort = dartPort;
         _signature = [NSMethodSignature signatureWithObjCTypes:_typeEncoding];
     }
     return self;
diff --git a/dart_native/ios/Classes/DNObjectDealloc.h b/dart_native/ios/Classes/DNObjectDealloc.h
@@ -6,12 +6,13 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "dart_api_dl.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface DNObjectDealloc : NSObject
 
-+ (void)attachHost:(NSObject *)host;
++ (void)attachHost:(NSObject *)host dartPort:(Dart_Port)dartPort;
 
 @end
 
diff --git a/dart_native/ios/Classes/DNObjectDealloc.m b/dart_native/ios/Classes/DNObjectDealloc.m
@@ -34,35 +34,40 @@
 
 @interface DNObjectDealloc ()
 
-@property (nonatomic, weak) NSObject *host;
-@property (nonatomic) int64_t hostAddress;
+@property (nonatomic, readonly, weak) NSObject *host;
+@property (nonatomic, readonly) int64_t hostAddress;
+@property (nonatomic, readonly) Dart_Port dartPort;
 
 @end
 
 @implementation DNObjectDealloc
 
-+ (void)attachHost:(NSObject *)host {
-    if (!host || objc_getAssociatedObject(host, @selector(initWithHost:))) {
++ (void)attachHost:(NSObject *)host
+          dartPort:(Dart_Port)dartPort {
+    if (!host || objc_getAssociatedObject(host, @selector(initWithHost:dartPort:))) {
         return;
     }
     if (!_objc_isTaggedPointer((__bridge const void *)(host)) ||
         [host isKindOfClass:NSClassFromString(@"__NSMallocBlock")]) {
-        __unused DNObjectDealloc *dealloc = [[self alloc] initWithHost:host];
+        __unused DNObjectDealloc *dealloc = [[self alloc] initWithHost:host
+                                                              dartPort:dartPort];
     }
 }
 
-- (instancetype)initWithHost:(NSObject *)host {
+- (instancetype)initWithHost:(NSObject *)host
+                    dartPort:(Dart_Port)dartPort {
     self = [super init];
     if (self) {
         _host = host;
         _hostAddress = (int64_t)host;
+        _dartPort = dartPort;
         objc_setAssociatedObject(host, _cmd, self, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     }
     return self;
 }
 
 - (void)dealloc {
-    NotifyDeallocToDart(_hostAddress);
+    NotifyDeallocToDart(_hostAddress, _dartPort);
 }
 
 @end
diff --git a/dart_native/ios/Classes/native_runtime.h b/dart_native/ios/Classes/native_runtime.h
@@ -25,7 +25,7 @@ DN_EXTERN void
 native_signature_encoding_list(NSMethodSignature *signature, const char * _Nonnull * _Nonnull typeEncodings);
 
 DN_EXTERN BOOL
-native_add_method(id target, SEL selector, char *types, void *callback);
+native_add_method(id target, SEL selector, char *types, void *callback, Dart_Port dartPort);
 
 DN_EXTERN char * _Nullable
 native_protocol_method_types(Protocol *proto, SEL selector);
@@ -34,13 +34,13 @@ DN_EXTERN Class _Nullable
 native_get_class(const char *className, Class superclass);
 
 DN_EXTERN void * _Nullable
-native_instance_invoke(id object, SEL selector, NSMethodSignature *signature, dispatch_queue_t queue, void * _Nonnull * _Nullable args, void (^callback)(void *));
+native_instance_invoke(id object, SEL selector, NSMethodSignature *signature, dispatch_queue_t queue, void * _Nonnull * _Nullable args, void (^callback)(void *), Dart_Port dartPort);
 
 DN_EXTERN void *
-native_block_create(char *types, void *callback);
+native_block_create(char *types, void *callback, Dart_Port dartPort);
 
 DN_EXTERN void *
-native_block_invoke(void *block, void * _Nonnull * _Nullable args);
+native_block_invoke(void *block, void * _Nonnull * _Nullable args, Dart_Port dartPort);
 
 DN_EXTERN const char * _Nonnull * _Nonnull
 native_all_type_encodings(void);
@@ -72,7 +72,7 @@ native_convert_nsstring_to_utf16(NSString *string, NSUInteger *length);
 #pragma mark - Dart VM API
 
 DN_EXTERN
-intptr_t InitDartApiDL(void *data, Dart_Port port);
+intptr_t InitDartApiDL(void *data);
 
 #pragma mark - Async Block Callback
 
@@ -95,7 +95,7 @@ DN_EXTERN
 void PassObjectToCUseDynamicLinking(Dart_Handle h, id object);
 
 DN_EXTERN
-void NotifyDeallocToDart(intptr_t address);
+void NotifyDeallocToDart(intptr_t address, Dart_Port dartPort);
 
 DN_EXTERN
 void RegisterDeallocCallback(void (*callback)(intptr_t));
diff --git a/dart_native/ios/Classes/native_runtime.mm b/dart_native/ios/Classes/native_runtime.mm
@@ -44,7 +44,7 @@
 }
 
 BOOL
-native_add_method(id target, SEL selector, char *types, void *callback) {
+native_add_method(id target, SEL selector, char *types, void *callback, Dart_Port dartPort) {
     Class cls = object_getClass(target);
     NSString *selName = [NSString stringWithFormat:@"dart_native_%@", NSStringFromSelector(selector)];
     SEL key = NSSelectorFromString(selName);
@@ -57,6 +57,7 @@
         NSError *error;
         DNMethodIMP *methodIMP = [[DNMethodIMP alloc] initWithTypeEncoding:types
                                                                   callback:(NativeMethodCallback)callback
+                                                                  dartPort:dartPort
                                                                      error:&error];
         if (error.code) {
             return NO;
@@ -124,7 +125,7 @@
 }
 
 void *
-native_instance_invoke(id object, SEL selector, NSMethodSignature *signature, dispatch_queue_t queue, void **args, void (^callback)(void *)) {
+native_instance_invoke(id object, SEL selector, NSMethodSignature *signature, dispatch_queue_t queue, void **args, void (^callback)(void *), Dart_Port dartPort) {
     if (!object || !selector || !signature) {
         return NULL;
     }
@@ -143,7 +144,8 @@
             } else {
                 [invocation getReturnValue:&result];
                 if (returnType == '@') {
-                    [DNObjectDealloc attachHost:(__bridge id)result];
+                    [DNObjectDealloc attachHost:(__bridge id)result
+                                       dartPort:dartPort];
                 }
             }
         }
@@ -168,10 +170,11 @@
 }
 
 void *
-native_block_create(char *types, void *callback) {
+native_block_create(char *types, void *callback, Dart_Port dartPort) {
     NSError *error;
     DNBlockWrapper *wrapper = [[DNBlockWrapper alloc] initWithTypeString:types
                                                                 callback:(NativeBlockCallback)callback
+                                                                dartPort:dartPort
                                                                    error:&error];
     if (error.code) {
         return nil;
@@ -180,7 +183,7 @@
 }
 
 void *
-native_block_invoke(void *block, void **args) {
+native_block_invoke(void *block, void **args, Dart_Port dartPort) {
     const char *typeString = DNBlockTypeEncodeString((__bridge id)block);
     NSMethodSignature *signature = [NSMethodSignature signatureWithObjCTypes:typeString];
     NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -195,7 +198,8 @@
         } else {
             [invocation getReturnValue:&result];
             if (returnType == '@') {
-                [DNObjectDealloc attachHost:(__bridge id)result];
+                [DNObjectDealloc attachHost:(__bridge id)result
+                                   dartPort:dartPort];
             }
         }
     }
@@ -421,9 +425,7 @@
 
 #pragma mark Dart VM API Init
 
-Dart_Port native_callback_send_port;
-intptr_t InitDartApiDL(void *data, Dart_Port port) {
-    native_callback_send_port = port;
+intptr_t InitDartApiDL(void *data) {
     return Dart_InitializeApiDL(data);
 }
 
@@ -473,7 +475,7 @@ void NotifyBlockInvokeToDart(DNInvocation *invocation,
         }
     };
     const Work* work_ptr = new Work(work);
-    NotifyDart(native_callback_send_port, work_ptr);
+    NotifyDart(wrapper.dartPort, work_ptr);
     if (sema) {
         dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
     }
@@ -502,7 +504,7 @@ void NotifyMethodPerformToDart(DNInvocation *invocation,
         }
     };
     const Work* work_ptr = new Work(work);
-    NotifyDart(native_callback_send_port, work_ptr);
+    NotifyDart(methodIMP.dartPort, work_ptr);
     if (sema) {
         dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
     }
@@ -516,11 +518,11 @@ void RegisterDeallocCallback(void (*callback)(intptr_t)) {
     native_dealloc_callback = callback;
 }
 
-void NotifyDeallocToDart(intptr_t address) {
+void NotifyDeallocToDart(intptr_t address, Dart_Port dartPort) {
     auto callback = native_dealloc_callback;
     const Work work = [address, callback]() { callback(address); };
     const Work* work_ptr = new Work(work);
-    NotifyDart(native_callback_send_port, work_ptr);
+    NotifyDart(dartPort, work_ptr);
 }
 
 #pragma mark - Dart Finalizer
diff --git a/dart_native/ios/DartNative.framework/DartNative b/dart_native/ios/DartNative.framework/DartNative
diff --git a/dart_native/lib/src/android/common/library.dart b/dart_native/lib/src/android/common/library.dart
@@ -21,7 +21,6 @@ final _dartAPIResult = initializeApi(NativeApi.initializeApiDLData, nativePort);
 
 final initDartAPISuccess = _dartAPIResult == 0;
 
-
 class Library {
   static void setLibPath(String soPath) {
     _libPath = soPath;
diff --git a/dart_native/lib/src/ios/common/callback_register.dart b/dart_native/lib/src/ios/common/callback_register.dart
@@ -16,7 +16,8 @@ bool registerMethodCallback(
   Pointer<Void> selectorPtr = selector.toPointer();
   CallbackManager.shared
       .setCallbackForSelectorOnTarget(targetPtr, selectorPtr, function);
-  int result = nativeAddMethod(targetPtr, selectorPtr, types, _callbackPtr);
+  int result =
+      nativeAddMethod(targetPtr, selectorPtr, types, _callbackPtr, nativePort);
   return result != 0;
 }
 
diff --git a/dart_native/lib/src/ios/common/library.dart b/dart_native/lib/src/ios/common/library.dart
@@ -20,10 +20,9 @@ DynamicLibrary get runtimeLib {
 
 final DynamicLibrary nativeDylib = DynamicLibrary.process();
 
-final initializeApi = runtimeLib.lookupFunction<
-    IntPtr Function(Pointer<Void>, Int64),
-    int Function(Pointer<Void>, int)>("InitDartApiDL");
+final initializeApi = runtimeLib.lookupFunction<IntPtr Function(Pointer<Void>),
+    int Function(Pointer<Void>)>("InitDartApiDL");
 
-final _dartAPIResult = initializeApi(NativeApi.initializeApiDLData, nativePort);
+final _dartAPIResult = initializeApi(NativeApi.initializeApiDLData);
 
 final initDartAPISuccess = _dartAPIResult == 0;
diff --git a/dart_native/lib/src/ios/runtime/block.dart b/dart_native/lib/src/ios/runtime/block.dart
diff --git a/dart_native/lib/src/ios/runtime/internal/native_runtime.dart b/dart_native/lib/src/ios/runtime/internal/native_runtime.dart
diff --git a/dart_native/lib/src/ios/runtime/message.dart b/dart_native/lib/src/ios/runtime/message.dart

-Original file line number
+Diff line change
 .idea/
 -.cxx/
 +.cxx/
++
 +.fvm/