tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat:fix iOS memory leak in debugging

Browse Source
This commit is contained in:
pengfei.zhou
2021-03-04 10:02:29 +08:00
committed by osborn
parent b972cce1cd
commit 627f323ae3
14 changed files with 124 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
doric-iOS/Devkit/Classes/DoricDebugDriver.m
View File

@@ -57,7 +57,7 @@ - (DoricRegistry *)registry {
- (DoricAsyncResult *)invokeDoricMethod:(NSString *)method argumentsArray:(NSArray *)args {
DoricAsyncResult *ret = [[DoricAsyncResult alloc] init];
__weak typeof(self) _self = self;
[self.jsExecutor ensureRunOnJSThread:^{
[self runInJSQueue:^{
__strong typeof(_self) self = _self;
if (!self) return;
@try {
@@ -78,7 +78,7 @@ - (DoricAsyncResult *)invokeDoricMethod:(NSString *)method argumentsArray:(NSArr
[array addObject:arg];
}
__weak typeof(self) _self = self;
[self.jsExecutor ensureRunOnJSThread:^{
[self runInJSQueue:^{
__strong typeof(_self) self = _self;
if (!self) return;
@try {
@@ -110,7 +110,7 @@ - (DoricAsyncResult *)invokeContextEntity:(NSString *)contextId method:(NSString
arg = va_arg(args, JSValue *);
}
__weak typeof(self) _self = self;
[self.jsExecutor ensureRunOnJSThread:^{
[self runInJSQueue:^{
__strong typeof(_self) self = _self;
if (!self) return;
@try {
@@ -132,7 +132,7 @@ - (DoricAsyncResult *)invokeContextEntity:(NSString *)contextId method:(NSString
[array addObject:arg];
}
__weak typeof(self) _self = self;
[self.jsExecutor ensureRunOnJSThread:^{
[self runInJSQueue:^{
__strong typeof(_self) self = _self;
if (!self) return;
@try {
@@ -148,7 +148,7 @@ - (DoricAsyncResult *)invokeContextEntity:(NSString *)contextId method:(NSString
- (DoricAsyncResult *)createContext:(NSString *)contextId script:(NSString *)script source:(NSString *)source {
DoricAsyncResult *ret = [[DoricAsyncResult alloc] init];
__weak typeof(self) _self = self;
[self.jsExecutor ensureRunOnJSThread:^{
[self runInJSQueue:^{
__strong typeof(_self) self = _self;
if (!self) return;
@try {
@@ -164,7 +164,7 @@ - (DoricAsyncResult *)createContext:(NSString *)contextId script:(NSString *)scr
- (DoricAsyncResult *)destroyContext:(NSString *)contextId {
DoricAsyncResult *ret = [[DoricAsyncResult alloc] init];
NSString *theContextId = self.theContextId;
[self.jsExecutor ensureRunOnJSThread:^{
[self runInJSQueue:^{
@try {
if ([contextId isEqualToString:theContextId]) {
[DoricDev.instance stopDebugging:NO];
@@ -177,6 +177,12 @@ - (DoricAsyncResult *)destroyContext:(NSString *)contextId {
return ret;
}
- (void)runInJSQueue:(dispatch_block_t)block {
[self.jsExecutor ensureRunOnJSThread:^{
block();
}];
}
- (void)ensureSyncInMainQueue:(dispatch_block_t)block {
if (strcmp(dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL), dispatch_queue_get_label(dispatch_get_main_queue())) == 0) {
block();
@@ -184,4 +190,12 @@ - (void)ensureSyncInMainQueue:(dispatch_block_t)block {
dispatch_async(dispatch_get_main_queue(), block);
}
}
- (void)dealloc {
[self.jsExecutor teardown];
}
- (void)teardown {
[self.jsExecutor teardown];
}
@end