fix: change address to sequence on block.

yulingtianxia · yulingtianxia · commit 0522a0a78477 · 2021-04-22T00:29:38.000+08:00
diff --git a/dart_native/example/ios/Podfile.lock b/dart_native/example/ios/Podfile.lock
@@ -23,9 +23,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   CocoaLumberjack: e8955b9d337ac307103b0a34fd141c32f27e53c5
-  dart_native: e10848b23206739fc16a2455f41847418a8ceb3d
+  dart_native: ba4adc85a5cf6faafbfa7de2252397388d9480da
   Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
 
 PODFILE CHECKSUM: f10e42e188a012076f9d5e111f499229a501832a
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.10.0
diff --git a/dart_native/example/ios/Runner.xcodeproj/project.pbxproj b/dart_native/example/ios/Runner.xcodeproj/project.pbxproj
@@ -248,12 +248,10 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${PODS_ROOT}/../Flutter/Flutter.framework",
-				"${PODS_ROOT}/../.symlinks/plugins/dart_native/ios/DartNative.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DartNative.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
diff --git a/dart_native/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/dart_native/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -59,6 +59,13 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "NSZombieEnabled"
+            value = "YES"
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"
diff --git a/dart_native/example/ios/Runner/RuntimeStub.m b/dart_native/example/ios/Runner/RuntimeStub.m
@@ -257,7 +257,7 @@ - (void)fooStructDelegate:(id<SampleDelegate>)delegate {
 }
 
 - (NSString *)fooNSString:(NSString *)str {
-    DDLogInfo(@"%s arg: %@", __FUNCTION__, str);
+//    DDLogInfo(@"%s arg: %@", __FUNCTION__, str);
     return @"test nsstring";
 }
 
diff --git a/dart_native/example/lib/ios/ios_main.dart b/dart_native/example/lib/ios/ios_main.dart
@@ -1,5 +1,6 @@
 import 'package:dart_native_example/ios/delegatestub.dart';
 import 'package:dart_native_example/ios/runtimeson.dart';
+import 'package:dart_native_example/ios/runtimestub.dart';
 import 'package:dart_native_example/ios/unit_test.dart';
 import 'package:flutter/material.dart';
 import 'dart:async';
@@ -23,24 +24,23 @@ class _IOSAppState extends State<IOSApp> {
   Future<void> initPlatformState() async {
     RuntimeSon stub = RuntimeSon();
     DelegateStub delegate = DelegateStub();
-    testIOS(stub, delegate);
+    // testIOS(stub, delegate);
     // Benchmark
     String testString =
         'This is a long string: sdlfdksjflksndhiofuu2893873(*（%￥#@）*&……￥撒肥料开发时傅雷家书那份会计师东方丽景三等奖';
     int time = DateTime.now().millisecondsSinceEpoch;
 
-    for (var i = 0; i < 10000; i++) {
-      String _ = await platform.invokeMethod('fooNSString:', testString);
-    }
+    // for (var i = 0; i < 10000; i++) {
+    //   String _ = await platform.invokeMethod('fooNSString:', testString);
+    // }
 
     print(
         "Flutter Channel Cost: ${DateTime.now().millisecondsSinceEpoch - time}");
     time = DateTime.now().millisecondsSinceEpoch;
-
-    for (var i = 0; i < 10000; i++) {
+    var count = 0;
+    for (count = 0; count < 10000; count++) {
       // String _ = stub.fooNSString(testString);
       String a = await stub.fooNSStringAsync(testString);
-      print(a);
     }
 
     print("DartNative Cost: ${DateTime.now().millisecondsSinceEpoch - time}");
diff --git a/dart_native/example/lib/ios/runtimestub.dart b/dart_native/example/lib/ios/runtimestub.dart
@@ -249,10 +249,8 @@ class RuntimeStub extends NSObject {
     return NSString.fromPointer(result).raw;
   }
 
-  Future<String> fooNSStringAsync(String str) async {
-    return performAsync(SEL('fooNSString:'),
-            args: [str], onQueue: DispatchQueue.global())
-        .then((value) {
+  Future<dynamic> fooNSStringAsync(String str) async {
+    return performAsync(SEL('fooNSString:'), args: [str]).then((value) {
       return NSString.fromPointer(value.pointer).raw;
     });
   }
diff --git a/dart_native/ios/Classes/DNBlockWrapper.h b/dart_native/ios/Classes/DNBlockWrapper.h
@@ -13,13 +13,14 @@ NS_ASSUME_NONNULL_BEGIN
 DN_EXTERN
 const char *DNBlockTypeEncodeString(id blockObj);
 
-typedef void (*NativeBlockCallback)(void *_Nullable *_Null_unspecified args, void *ret, int numberOfArguments, BOOL stret);
+typedef void (*NativeBlockCallback)(void *_Nullable *_Null_unspecified args, void *ret, int numberOfArguments, BOOL stret, int64_t seq);
 
 @interface DNBlockWrapper : NSObject
 
 @property (nonatomic, readonly) const char *_Nonnull *_Nonnull typeEncodings;
 @property (nonatomic, readonly) NativeBlockCallback callback;
 @property (nonatomic, getter=hasStret, readonly) BOOL stret;
+@property (nonatomic, readonly) int64_t sequence;
 
 - (intptr_t)blockAddress;
 
diff --git a/dart_native/ios/Classes/DNBlockWrapper.m b/dart_native/ios/Classes/DNBlockWrapper.m
@@ -14,6 +14,7 @@
 #import "DNPointerWrapper.h"
 #import "native_runtime.h"
 #import "DNError.h"
+#import <stdatomic.h>
 
 #if !__has_feature(objc_arc)
 #error
@@ -120,6 +121,8 @@ @interface DNBlockWrapper ()
 
 @implementation DNBlockWrapper
 
+static atomic_uint_fast64_t _seq = 0;
+
 - (instancetype)initWithTypeString:(char *)typeString
                           callback:(NativeBlockCallback)callback
                              error:(out NSError **)error {
@@ -132,6 +135,8 @@ - (instancetype)initWithTypeString:(char *)typeString
             _callback = callback;
             _thread = NSThread.currentThread;
             [self initBlockWithError:error];
+            atomic_fetch_add(&_seq, 1);
+            _sequence = _seq;
         }
     }
     return self;
@@ -141,7 +146,7 @@ - (void)dealloc {
     ffi_closure_free(_closure);
     free(_descriptor);
     free(_typeEncodings);
-    NotifyDeallocToDart(_blockAddress);
+    NotifyDeallocToDart(_sequence);
 }
 
 - (void)initBlockWithError:(out NSError **)error {
@@ -358,7 +363,11 @@ static void DNFFIBlockClosureFunc(ffi_cif *cif, void *ret, void **args, void *us
     int64_t retAddr = (int64_t)(invocation.realRetValue);
     
     if (wrapper.thread == NSThread.currentThread) {
-        wrapper.callback(args, ret, (int)numberOfArguments, wrapper.hasStret);
+        wrapper.callback(args,
+                         ret,
+                         (int)numberOfArguments,
+                         wrapper.hasStret,
+                         wrapper.sequence);
     } else {
         [invocation retainArguments];
         NotifyBlockInvokeToDart(invocation, wrapper, (int)numberOfArguments);
diff --git a/dart_native/ios/Classes/native_runtime.mm b/dart_native/ios/Classes/native_runtime.mm
@@ -151,7 +151,8 @@
     };
     
     if (queue != NULL) {
-        // Return nil immediately.
+        // Retain arguments and return nil immediately.
+        [invocation retainArguments];
         dispatch_async(queue, ^{
             [invocation invoke];
             if (callback) {
@@ -465,7 +466,8 @@ void NotifyBlockInvokeToDart(DNInvocation *invocation,
         callback(invocation.realArgs,
                  invocation.realRetValue,
                  numberOfArguments,
-                 wrapper.hasStret);
+                 wrapper.hasStret,
+                 wrapper.sequence);
         if (sema) {
             dispatch_semaphore_signal(sema);
         }
diff --git a/dart_native/ios/dart_native.podspec b/dart_native/ios/dart_native.podspec
@@ -15,12 +15,12 @@ Write native code using Dart. This package liberates you from native code and lo
   s.source           = { :path => '.' }
   
   # Debug
-  # s.source_files = 'Classes/**/*', 'libffi/*.h', 'common/**/*'
-  # s.vendored_libraries = 'libffi/libffi.a'
+  s.source_files = 'Classes/**/*', 'libffi/*.h', 'common/**/*'
+  s.vendored_libraries = 'libffi/libffi.a'
 
   # Release
-  s.source_files = 'Classes/DartNativePlugin.*'
-  s.vendored_frameworks = 'DartNative.framework'
+  # s.source_files = 'Classes/DartNativePlugin.*'
+  # s.vendored_frameworks = 'DartNative.framework'
   
   s.public_header_files = 'Classes/DartNativePlugin.h'
   s.dependency 'Flutter'
diff --git a/dart_native/lib/src/ios/runtime/block.dart b/dart_native/lib/src/ios/runtime/block.dart
@@ -29,6 +29,7 @@ class Block extends id {
   Function function;
   NSObject _wrapper; // Block hold wrapper
   List<String> types = [];
+  int sequence = -1;
 
   /// Creating a [Block] from a [Function].
   ///
@@ -45,12 +46,17 @@ class Block extends id {
     }
     NSObject blockWrapper = NSObject.fromPointer(blockWrapperPtr);
     int blockAddr = blockWrapper.perform(SEL('blockAddress'));
+    int sequence = blockWrapper.perform(SEL('sequence'));
     Block result = Block.fromPointer(Pointer.fromAddress(blockAddr));
     free(typeStringPtr);
     result.types = dartTypes;
     result._wrapper = blockWrapper;
     result.function = function;
-    blockForAddress[result.pointer.address] = result;
+    result.sequence = sequence;
+    if (blockForSequence[sequence] != null) {
+      throw 'Already exists a block on sequence $sequence';
+    }
+    blockForSequence[sequence] = result;
     return result;
   }
 
@@ -106,7 +112,6 @@ class Block extends id {
     if (function != null) {
       result._wrapper = _wrapper;
       result.function = function;
-      blockForAddress[newPtr.address] = result;
       result.types = types;
     }
     return result;
@@ -157,19 +162,13 @@ Pointer<NativeFunction<BlockCallbackC>> _callbackPtr =
     Pointer.fromFunction(_syncCallback);
 
 _callback(Pointer<Pointer<Pointer<Void>>> argsPtrPtrPtr,
-    Pointer<Pointer<Void>> retPtrPtr, int argCount, bool stret) {
+    Pointer<Pointer<Void>> retPtrPtr, int argCount, bool stret, int seq) {
   // If stret, the first arg contains address of a pointer of returned struct. Other args move backwards.
   // This is the index for first argument of block in argsPtrPtrPtr list.
   int argStartIndex = stret ? 2 : 1;
-
-  Pointer<Void> blockPtr = argsPtrPtrPtr
-      .elementAt(argStartIndex - 1)
-      .value
-      .cast<Pointer<Void>>()
-      .value;
-  Block block = blockForAddress[blockPtr.address];
+  Block block = blockForSequence[seq];
   if (block == null) {
-    return null;
+    throw 'Can\'t find block by sequence $seq';
   }
   List args = [];
   Pointer pointer = block._wrapper.perform(SEL('typeEncodings'));
@@ -214,7 +213,9 @@ _callback(Pointer<Pointer<Pointer<Void>>> argsPtrPtrPtr,
   }
 }
 
+int cc = 0;
+
 void _syncCallback(Pointer<Pointer<Pointer<Void>>> argsPtrPtr,
-    Pointer<Pointer<Void>> retPtr, int argCount, int stret) {
-  _callback(argsPtrPtr, retPtr, argCount, stret != 0);
+    Pointer<Pointer<Void>> retPtr, int argCount, int stret, int seq) {
+  _callback(argsPtrPtr, retPtr, argCount, stret != 0, seq);
 }
diff --git a/dart_native/lib/src/ios/runtime/internal/block_lifecycle.dart b/dart_native/lib/src/ios/runtime/internal/block_lifecycle.dart
@@ -1,10 +1,10 @@
 import 'package:dart_native/src/ios/runtime/block.dart';
 
-Map<int, Block> blockForAddress = {};
+Map<int, Block> blockForSequence = {};
 
-void removeBlockOnAddress(int addr) {
-  Block block = blockForAddress[addr];
+void removeBlockOnSequence(int seq) {
+  Block block = blockForSequence[seq];
   if (block != null) {
-    blockForAddress.remove(addr);
+    blockForSequence.remove(seq);
   }
 }
diff --git a/dart_native/lib/src/ios/runtime/internal/native_runtime.dart b/dart_native/lib/src/ios/runtime/internal/native_runtime.dart
@@ -80,7 +80,8 @@ typedef BlockCallbackC = Void Function(
     Pointer<Pointer<Pointer<Void>>> argsPtrPtrPtr,
     Pointer<Pointer<Void>> retPtrPtr,
     Int32 argCount,
-    Int32 stret);
+    Int32 stret,
+    Int64 seq);
 typedef BlockCreateC = Pointer<Void> Function(Pointer<Utf8> typeEncodings,
     Pointer<NativeFunction<BlockCallbackC>> callback);
 typedef BlockCreateD = Pointer<Void> Function(Pointer<Utf8> typeEncodings,
diff --git a/dart_native/lib/src/ios/runtime/message.dart b/dart_native/lib/src/ios/runtime/message.dart
@@ -150,6 +150,9 @@ dynamic msgSend(Pointer<Void> target, SEL selector,
 /// Return value will be converted to Dart types.
 Future<dynamic> msgSendAsync(Pointer<Void> target, SEL selector,
     {List args, DispatchQueue onQueue}) async {
+  if (onQueue == null) {
+    onQueue = DispatchQueue.main;
+  }
   final completer = Completer<dynamic>();
   _msgSend(target, selector, args: args, onQueue: onQueue,
       callback: (dynamic result) {
diff --git a/dart_native/lib/src/ios/runtime/nsobject.dart b/dart_native/lib/src/ios/runtime/nsobject.dart
@@ -121,7 +121,7 @@ Map<String, ConvertorFromPointer> _convertorCache = {};
 void _dealloc(Pointer<Void> ptr) {
   if (ptr != nullptr) {
     CallbackManager.shared.clearAllCallbackOnTarget(ptr);
-    removeBlockOnAddress(ptr.address);
+    removeBlockOnSequence(ptr.address);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ - (void)fooStructDelegate:(id<SampleDelegate>)delegate {`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`- (NSString )fooNSString:(NSString )str {`
`260`		`- DDLogInfo(@"%s arg: %@", __FUNCTION__, str);`
	`260`	`+// DDLogInfo(@"%s arg: %@", __FUNCTION__, str);`
`261`	`261`	`return @"test nsstring";`
`262`	`262`	`}`
`263`	`263`
Original file line number	Diff line number	Diff line change
`@@ -249,10 +249,8 @@ class RuntimeStub extends NSObject {`
`249`	`249`	`return NSString.fromPointer(result).raw;`
`250`	`250`	`}`
`251`	`251`
`252`		`- Future<String> fooNSStringAsync(String str) async {`
`253`		`- return performAsync(SEL('fooNSString:'),`
`254`		`- args: [str], onQueue: DispatchQueue.global())`
`255`		`- .then((value) {`
	`252`	`+ Future<dynamic> fooNSStringAsync(String str) async {`
	`253`	`+ return performAsync(SEL('fooNSString:'), args: [str]).then((value) {`
`256`	`254`	`return NSString.fromPointer(value.pointer).raw;`
`257`	`255`	`});`
`258`	`256`	`}`