1.0.5

yulingtianxia · Jun 26, 2019 · b8ca3d1 · b8ca3d1
1 parent 72204a3
commit b8ca3d1
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 29 deletions.
diff --git a/BlockTracker.podspec b/BlockTracker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name         = "BlockTracker"
-s.version      = "1.0.4"
+s.version      = "1.0.5"
 s.summary      = "Tracking block args of Objective-C method based on BlockHook"
 s.description  = <<-DESC
 BlockTracker can track block arguments of a method. It's based on BlockHook.

diff --git a/BlockTrackerSample iOS/ViewController.m b/BlockTrackerSample iOS/ViewController.m
@@ -26,15 +26,20 @@ - (void)viewDidLoad {
                 break;
             case BlockHookModeAfter:
                 NSLog(@"After block:%@, mangleName:%@", invocation.token.block, invocation.token.mangleName);
+                objc_setAssociatedObject(invocation.token, @"invoked", @YES, OBJC_ASSOCIATION_RETAIN);
                 break;
             case BlockHookModeDead:
                 NSLog(@"Block Dead! mangleName:%@", invocation.token.mangleName);
+                BOOL invoked = [objc_getAssociatedObject(invocation.token, @"invoked") boolValue];
+                if (!invoked) {
+                    NSLog(@"Block Not Invoked Before Dead! %@", invocation.token.mangleName);
+                }
                 break;
             default:
                 break;
         }
     }];
-
+    
     setMallocBlockCallback(^(BHInvocation * _Nonnull invocation) {
         switch (invocation.mode) {
             case BlockHookModeBefore: {
@@ -50,7 +55,7 @@ - (void)viewDidLoad {
                 NSLog(@"Block Dead! mangleName:%@", invocation.token.mangleName);
                 BOOL invoked = [objc_getAssociatedObject(invocation.token, @"invoked") boolValue];
                 if (!invoked) {
-                    NSLog(@"Block Not Invoked Before Dead! %@", invocation.token);
+                    NSLog(@"Block Not Invoked Before Dead! %@", invocation.token.mangleName);
                 }
                 break;
             }
@@ -79,8 +84,7 @@ - (void)viewDidLoad {
 }
 
 - (void)performBlock:(void(^)(void))block {
-    id b = block;
-//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), b);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), block);
 }
 
 @end
diff --git a/BlockTrackerSample macOS/ViewController.m b/BlockTrackerSample macOS/ViewController.m
@@ -36,29 +36,29 @@ - (void)viewDidLoad {
         }
     }];
 
-//    setMallocBlockCallback(^(BHInvocation * _Nonnull invocation) {
-//        switch (invocation.mode) {
-//            case BlockHookModeBefore: {
-//                NSLog(@"Before block:%@, mangleName:%@", invocation.token.block, invocation.token.mangleName);
-//                break;
-//            }
-//            case BlockHookModeAfter: {
-//                NSLog(@"After block:%@, mangleName:%@", invocation.token.block, invocation.token.mangleName);
-//                objc_setAssociatedObject(invocation.token, @"invoked", @YES, OBJC_ASSOCIATION_RETAIN);
-//                break;
-//            }
-//            case BlockHookModeDead: {
-//                NSLog(@"Block Dead! mangleName:%@", invocation.token.mangleName);
-//                BOOL invoked = [objc_getAssociatedObject(invocation.token, @"invoked") boolValue];
-//                if (!invoked) {
-//                    NSLog(@"Block Not Invoked Before Dead! %@", invocation.token.mangleName);
-//                }
-//                break;
-//            }
-//            default:
-//                break;
-//        }
-//    });
+    setMallocBlockCallback(^(BHInvocation * _Nonnull invocation) {
+        switch (invocation.mode) {
+            case BlockHookModeBefore: {
+                NSLog(@"Before block:%@, mangleName:%@", invocation.token.block, invocation.token.mangleName);
+                break;
+            }
+            case BlockHookModeAfter: {
+                NSLog(@"After block:%@, mangleName:%@", invocation.token.block, invocation.token.mangleName);
+                objc_setAssociatedObject(invocation.token, @"invoked", @YES, OBJC_ASSOCIATION_RETAIN);
+                break;
+            }
+            case BlockHookModeDead: {
+                NSLog(@"Block Dead! mangleName:%@", invocation.token.mangleName);
+                BOOL invoked = [objc_getAssociatedObject(invocation.token, @"invoked") boolValue];
+                if (!invoked) {
+                    NSLog(@"Block Not Invoked Before Dead! %@", invocation.token.mangleName);
+                }
+                break;
+            }
+            default:
+                break;
+        }
+    });
 
     // invoke blocks
     NSString *word = @"I'm a block";
@@ -78,7 +78,7 @@ - (void)viewDidLoad {
 }
 
 - (void)performBlock:(void(^)(void))block {
-//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), block);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), block);
 }
 
 - (void)setRepresentedObject:(id)representedObject {