Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use unfairlock instead OSSpinLock #168

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

use unfairlock instead OSSpinLock #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15703ab
使用unfairlock取代OSSpinLock
Aug 25, 2019
e4089d3
modify lines
Aug 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions Aspects.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#import "Aspects.h"
#import <libkern/OSAtomic.h>
#import <os/lock.h>
#import <objc/runtime.h>
#import <objc/message.h>

Expand Down Expand Up @@ -159,10 +160,15 @@ static BOOL aspect_remove(AspectIdentifier *aspect, NSError **error) {
}

static void aspect_performLocked(dispatch_block_t block) {
static OSSpinLock aspect_lock = OS_SPINLOCK_INIT;
OSSpinLockLock(&aspect_lock);
os_unfair_lock_t aspect_lock = &(OS_UNFAIR_LOCK_INIT);
os_unfair_lock_lock(aspect_lock);
block();
OSSpinLockUnlock(&aspect_lock);
os_unfair_lock_unlock(aspect_lock);
/*
static OSSpinLock aspect_lock = OS_SPINLOCK_INIT;
OSSpinLockLock(&aspect_lock);
block();
OSSpinLockUnlock(&aspect_lock);*/
}

static SEL aspect_aliasForSelector(SEL selector) {
Expand Down Expand Up @@ -269,9 +275,12 @@ static IMP aspect_getMsgForwardIMP(NSObject *self, SEL selector) {

static void aspect_prepareClassAndHookSelector(NSObject *self, SEL selector, NSError **error) {
NSCParameterAssert(selector);
//以下是为了把转发调用的函数给交换掉
Class klass = aspect_hookClass(self, error);
Method targetMethod = class_getInstanceMethod(klass, selector);
IMP targetMethodIMP = method_getImplementation(targetMethod);

//此处说明类或者是对象是有该方法的。然后将方法的实现替换为转发调用（_objc_msgForward）,而这个函数已经被替换为,__ASPECTS_ARE_BEING_CALLED__,故而最终的调用以及options的解析之行是在这里进行的
if (!aspect_isMsgForwardIMP(targetMethodIMP)) {
// Make a method alias for the existing method implementation, it not already copied.
const char *typeEncoding = method_getTypeEncoding(targetMethod);
Expand Down
8 changes: 8 additions & 0 deletions Aspects.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>