修复iOS／OSX下Function提早释放问题

Former-commit-id: b84f6c870e78dd302b9ca0dc343e34ebdff5cb5e
vimfung · May 31, 2017 · f7c26af · f7c26af
1 parent f7cd282
commit f7c26af
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/Source/iOS_OSX/Code/LSCFunction.m b/Source/iOS_OSX/Code/LSCFunction.m
@@ -11,16 +11,6 @@
 #import "LSCContext_Private.h"
 #import "LSCValue_Private.h"
 #import "LSCTuple_Private.h"
-#import "LSCManagedObjectProtocol.h"
-
-@interface LSCFunction () <LSCManagedObjectProtocol>
-
-/**
- 连接标识
- */
-@property (nonatomic, copy) NSString *_linkId;
-
-@end
 
 @implementation LSCFunction
 
@@ -29,8 +19,11 @@ - (instancetype)initWithContext:(LSCContext *)context index:(NSInteger)index
     if (self = [super init])
     {
         self.context = context;
-        self._linkId = [NSString stringWithFormat:@"%p", self];
+        self.linkId = [NSString stringWithFormat:@"%p", self];
 
+        //设置Lua对象到_vars_表中
+        [self.context.dataExchanger setLubObjectByStackIndex:index objectId:self.linkId];
+        //进行引用
         [self.context retainValue:[LSCValue functionValue:self]];
     }
 
@@ -112,11 +105,6 @@ - (LSCValue *)invokeWithArguments:(NSArray<LSCValue *> *)arguments
 
 #pragma mark - LSCManagedObjectProtocol
 
-- (NSString *)linkId
-{
-    return self._linkId;
-}
-
 - (BOOL)pushWithContext:(LSCContext *)context
 {
     return YES;

diff --git a/Source/iOS_OSX/Code/LSCFunction_Private.h b/Source/iOS_OSX/Code/LSCFunction_Private.h
@@ -8,10 +8,11 @@
 
 #import "LSCFunction.h"
 #import "lua.h"
+#import "LSCManagedObjectProtocol.h"
 
 @class LSCContext;
 
-@interface LSCFunction ()
+@interface LSCFunction () <LSCManagedObjectProtocol>
 
 /**
  上下文对象
@@ -24,6 +25,11 @@
  */
 @property (nonatomic, copy) NSString *index;
 
+/**
+ 连接标识
+ */
+@property (nonatomic, copy) NSString *linkId;
+
 /**
  初始化Lua方法
 

diff --git a/Source/iOS_OSX/LSCDataExchanger.h b/Source/iOS_OSX/LSCDataExchanger.h
@@ -46,6 +46,14 @@
  */
 - (void)getLuaObject:(id)nativeObject;
 
+/**
+ 设置Lua对象
+
+ @param index Lua对象在栈中索引
+ @param objectId 对象标识
+ */
+- (void)setLubObjectByStackIndex:(NSInteger)index objectId:(NSString *)objectId;
+
 /**
  保留对象对应在Lua中的引用
 
@@ -60,4 +68,6 @@
  */
 - (void)releaseLuaObject:(id)nativeObject;
 
+
+
 @end
diff --git a/Source/iOS_OSX/LSCDataExchanger.m b/Source/iOS_OSX/LSCDataExchanger.m
@@ -205,13 +205,7 @@ - (LSCValue *)valueByStackIndex:(int)index
     if (objectId && (type == LUA_TTABLE || type == LUA_TUSERDATA || type == LUA_TLIGHTUSERDATA || type == LUA_TFUNCTION))
     {
         //将引用对象放入表中
-        [self doActionInVarsTable:^{
-
-            //放入对象到_vars_表中
-            lua_pushvalue(state, (int)index);
-            lua_setfield(state, -2, objectId.UTF8String);
-
-        }];
+        [self setLubObjectByStackIndex:index objectId:objectId];
     }
 
     return value;
@@ -328,6 +322,19 @@ - (void)getLuaObject:(id)nativeObject
     }
 }
 
+- (void)setLubObjectByStackIndex:(NSInteger)index objectId:(NSString *)objectId
+{
+    lua_State *state = self.context.state;
+
+    [self doActionInVarsTable:^{
+
+        //放入对象到_vars_表中
+        lua_pushvalue(state, (int)index);
+        lua_setfield(state, -2, objectId.UTF8String);
+
+    }];
+}
+
 - (void)retainLuaObject:(id)nativeObject
 {
     if (nativeObject)