Move jawaObjectPool into JawaExecutor to make sure that all JawaObjects are garbage-collected when the executor is destroyed.

Author: hackjackhack

JawaScriptExecutive-iOS/JawaExecutor.h

@@ -19,13 +19,14 @@ extern int release_count;
 @interface JawaExecutor : NSObject
 {
     JawaObjectRef* NULL_CONSTANT;
-   }
+}
 
 @property (weak) NSMutableDictionary* env;
 @property NSMutableDictionary* global;
 @property NSMutableArray* activations;
 @property NSMutableArray* currentActivation;
 @property NSMutableDictionary* currentIterationScope;
+@property NSMutableArray* jawaObjectPool;
 @property BOOL isFromCallExpression;
 @property id<JawaExternalCallback> externalCallback;
 

JawaScriptExecutive-iOS/JawaExecutor.m

@@ -32,7 +32,7 @@ -(id)init {
 
         NULL_CONSTANT = [JawaObjectRef RefIn:self];
 
-        jawaObjectPool = [[NSMutableArray alloc]init];
+        _jawaObjectPool = [[NSMutableArray alloc]init];
 
         arrayPrototype = [[NSMutableDictionary alloc]init];
         stringPrototype = [[NSMutableDictionary alloc]init];
@@ -205,14 +205,14 @@ -(NSMutableDictionary*)invoke:(NSString *)funcName with:(NSMutableDictionary*)as
          setObject:n.boolValue ? @"true" : @"false"
          forKey:@"retValue"];
     }
-    //printf("%lu objects are in pool.\n", jawaObjectPool.count);
+    //printf("%lu objects are in pool.\n", _jawaObjectPool.count);
     [self gc];
 
     return retJSON;
 }
 
 -(void)gc {
-    for (JawaObjectRef* obj in jawaObjectPool) {
+    for (JawaObjectRef* obj in _jawaObjectPool) {
         obj.marked = false;
         obj.discovered = false;
     }
@@ -222,12 +222,14 @@ -(void)gc {
     }
 
     NSMutableArray *markedObj = [NSMutableArray array];
-    for (JawaObjectRef* obj in jawaObjectPool) {
+    for (JawaObjectRef* obj in _jawaObjectPool) {
         if (obj.marked)
             [markedObj addObject:obj];
+        //else
+        //    printf("Recycled: %d\n", obj.obj_id);
     }
-    //printf("%lu objects recycled.\n", jawaObjectPool.count - markedObj.count);
-    [jawaObjectPool setArray:markedObj];
+    //printf("%lu objects recycled.\n", _jawaObjectPool.count - markedObj.count);
+    [_jawaObjectPool setArray:markedObj];
 }
 
 -(void)markAndTraverse:(JawaObjectRef*)objRef {
@@ -324,6 +326,10 @@ -(JawaObjectRef*)toJawaArray:(NSArray*)array {
     return [JawaObjectRef RefWithJawaArray:jawaArr];
 }
 
+//-(void)dealloc {
+//    printf("Executor Recycled:\n");
+//}
+
 -(JawaObjectRef*)evalInExpression:(NSDictionary*)ast {
     NSArray* subExpressions = [ast objectForKey:PR_subExpressions];
 

JawaScriptExecutive-iOS/JawaObjectRef.h

@@ -15,7 +15,6 @@
 @class JawaFunc;
 @class JawaObject;
 
-extern NSMutableArray* jawaObjectPool;
 extern int release_count;
 @interface JawaObjectRef : NSObject
 {
@@ -24,6 +23,7 @@ extern int release_count;
 
 @property bool marked;
 @property bool discovered;
+@property int obj_id;
 @property (strong) NSObject* object;
 @property (weak) JawaObjectRef* appliedOn;
 @property (weak) JawaExecutor* executor;

JawaScriptExecutive-iOS/JawaObjectRef.m

@@ -13,8 +13,8 @@
 #import "JawaNumber.h"
 #import "JawaObjectRef.h"
 
-NSMutableArray* jawaObjectPool;
 int release_count;
+int obj_count;
 
 @implementation JawaObjectRef
 
@@ -23,7 +23,9 @@ -(id)initIn:(JawaExecutor*)ex {
     if (self) {
         _object = NULL;
         _executor = ex;
-        [jawaObjectPool addObject:self];
+        _obj_id = obj_count++;
+        //printf("%d : null\n", _obj_id);
+        [ex.jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -33,7 +35,9 @@ -(id)initWithNumber:(double)number in:(JawaExecutor*)ex {
     if (self) {
         _object = [[JawaNumber alloc]init:number];
         _executor = ex;
-        [jawaObjectPool addObject:self];
+        _obj_id = obj_count++;
+        //printf("%d : number(%lf)\n", _obj_id, number);
+        [ex.jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -43,7 +47,9 @@ -(id)initWithString:(NSString*)string in:(JawaExecutor*)ex {
     if (self) {
         _object = [NSMutableString stringWithString:string];
         _executor = ex;
-        [jawaObjectPool addObject:self];
+        _obj_id = obj_count++;
+        //printf("%d : string(%s)\n", _obj_id, [string cStringUsingEncoding: NSUTF8StringEncoding]);
+        [ex.jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -53,7 +59,9 @@ -(id)initWithBoolean:(bool)tf in:(JawaExecutor*)ex {
     if (self) {
         _object = [NSNumber numberWithBool:tf];
         _executor = ex;
-        [jawaObjectPool addObject:self];
+        _obj_id = obj_count++;
+        //printf("%d : bool(%d)\n", _obj_id, tf);
+        [ex.jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -63,7 +71,9 @@ -(id)initWithJawaArray:(JawaArray*)array {
     if (self) {
         _object = array;
         _executor = array.executor;
-        [jawaObjectPool addObject:self];
+        _obj_id = obj_count++;
+        //printf("%d : array\n", _obj_id);
+        [_executor.jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -74,7 +84,9 @@ -(id)initWithJawaFunc:(JawaFunc*)func {
         _object = func;
         _appliedOn = nil;
         _executor = func.executor;
-        [jawaObjectPool addObject:self];
+        _obj_id = obj_count++;
+        //printf("%d : func(%s)\n", _obj_id, [[func.name description]cStringUsingEncoding:NSUTF8StringEncoding]);
+        [_executor.jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -85,7 +97,9 @@ -(id)initWithJawaFunc:(JawaFunc*)func on:(JawaObjectRef*)obj {
         _object = func;
         _appliedOn = obj;
         _executor = func.executor;
-        [jawaObjectPool addObject:self];
+        _obj_id = obj_count++;
+        //printf("%d : func(%s)\n", _obj_id, [[func.name description]cStringUsingEncoding:NSUTF8StringEncoding]);
+        [_executor.jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -95,7 +109,9 @@ -(id)initWithJawaObject:(JawaObject*)obj {
     if (self) {
         _object = obj;
         _executor = obj.executor;
-        [jawaObjectPool addObject:self];
+        _obj_id = obj_count++;
+        //printf("%d : object\n", _obj_id);
+        [_executor.jawaObjectPool addObject:self];
     }
     return self;
 }
@@ -124,9 +140,10 @@ -(id)transfer {
     } else
         return self.object;
 }
+
 -(void)dealloc {
     release_count++;
-    //printf("Releasing %s\n", [NSStringFromClass([self class]) cStringUsingEncoding:NSUTF8StringEncoding]);
+        //printf("Releasing %s\n", [NSStringFromClass([self class]) cStringUsingEncoding:NSUTF8StringEncoding]);
 }
 
 +(id)RefIn:(JawaExecutor *)ex {

JawaScriptExecutive-iOS/test.m

@@ -828,9 +828,20 @@ BOOL test34() {
     return true;
 }
 
+BOOL test35() {
+    JawaExecutor* ex = [[JawaExecutor alloc]init];
+    NSString *parsed = @"{\"t\":0,\"0\":[{\"t\":1,\"3\":\"test\",\"23\":[],\"24\":{\"t\":2,\"0\":[{\"t\":37,\"33\":[{\"t\":34,\"26\":\"a\",\"27\":{\"t\":28,\"6\":[{\"t\":39,\"4\":\"name\",\"5\":{\"t\":25,\"8\":\"STRING_LITERAL,a\"}}]}}]},{\"t\":37,\"33\":[{\"t\":34,\"26\":\"b\",\"27\":{\"t\":28,\"6\":[{\"t\":39,\"4\":\"name\",\"5\":{\"t\":25,\"8\":\"STRING_LITERAL,b\"}}]}}]},{\"t\":5,\"14\":\"PUNCTUATOR,=\",\"20\":{\"t\":20,\"10\":{\"t\":24,\"3\":\"a\"},\"11\":{\"t\":24,\"3\":\"key\"}},\"21\":{\"t\":24,\"3\":\"b\"}},{\"t\":5,\"14\":\"PUNCTUATOR,=\",\"20\":{\"t\":20,\"10\":{\"t\":24,\"3\":\"b\"},\"11\":{\"t\":24,\"3\":\"key\"}},\"21\":{\"t\":24,\"3\":\"a\"}},{\"t\":36,\"32\":{\"t\":25,\"8\":\"NULL,null\"}}]}}]}";
+    
+    NSDictionary* prog = jsonToDictionary(parsed);
+    
+    [ex execute:prog];
+    [ex invoke:@"test" with:nil];
+    printf("Test 35 passed.\n");
+    return true;
+}
+
 int main(int argc, char *argv[]) {
     @autoreleasepool {
-        
         if (!test1()) return -1;
         if (!test2()) return -1;
         if (!test3()) return -1;
@@ -865,6 +876,7 @@ int main(int argc, char *argv[]) {
         if (!test32()) return -1;
         if (!test33()) return -1;
         if (!test34()) return -1;
+        if (!test35()) return -1;
     }
     //printf("%d\n", release_count);
     return 0;