Mark & Sweep GC done.

Author: hackjackhack

JawaScriptExecutive-iOS/JawaExecutor.h

@@ -12,7 +12,7 @@
 #import "JawaExternalCallback.h"
 
 extern NSMutableDictionary* builtinFunctions;
-
+extern int release_count;
 @class JawaObjectRef;
 
 

JawaScriptExecutive-iOS/JawaExecutor.m

@@ -205,10 +205,51 @@ -(NSMutableDictionary*)invoke:(NSString *)funcName with:(NSMutableDictionary*)as
          setObject:n.boolValue ? @"true" : @"false"
          forKey:@"retValue"];
     }
+    //printf("%lu objects are in pool.\n", jawaObjectPool.count);
+    [self gc];
 
     return retJSON;
 }
 
+-(void)gc {
+    for (JawaObjectRef* obj in jawaObjectPool) {
+        obj.marked = false;
+        obj.discovered = false;
+    }
+    for (NSString* key in self.global) {
+        JawaObjectRef *objRef = [self.global objectForKey:key];
+        [self markAndTraverse:objRef];
+    }
+    
+    NSMutableArray *markedObj = [NSMutableArray array];
+    for (JawaObjectRef* obj in jawaObjectPool) {
+        if (obj.marked)
+            [markedObj addObject:obj];
+    }
+    //printf("%lu objects recycled.\n", jawaObjectPool.count - markedObj.count);
+    [jawaObjectPool setArray:markedObj];
+}
+
+-(void)markAndTraverse:(JawaObjectRef*)objRef {
+    objRef.marked = true;
+    objRef.discovered = true;
+    
+    if ([objRef.object isMemberOfClass:[JawaArray class]]) {
+        JawaArray* arr = ((JawaArray*)objRef.object);
+        for (JawaObjectRef* elementRef in arr.elements) {
+            if (!elementRef.discovered)
+                [self markAndTraverse:elementRef];
+        }
+    } else if ([objRef.object isMemberOfClass:[JawaObject class]]) {
+        JawaObject* obj = ((JawaObject*)objRef.object);
+        for (NSString* key in obj.properties) {
+            JawaObjectRef *elementRef = [obj.properties objectForKey:key];
+            if (!elementRef.discovered)
+                [self markAndTraverse:elementRef];
+        }
+    }
+}
+
 -(NSInteger)compare:(JawaObjectRef*)o1 and:(JawaObjectRef*)o2 with:(JawaObjectRef*)comparator {
     if (comparator != nil && comparator.object != nil) {
         if (![comparator.object isMemberOfClass:[JawaFunc class]])

JawaScriptExecutive-iOS/JawaObjectRef.h

@@ -16,12 +16,14 @@
 @class JawaObject;
 
 extern NSMutableArray* jawaObjectPool;
-
+extern int release_count;
 @interface JawaObjectRef : NSObject
 {
 
 }
 
+@property bool marked;
+@property bool discovered;
 @property (strong) NSObject* object;
 @property (weak) JawaObjectRef* appliedOn;
 @property (weak) JawaExecutor* executor;

JawaScriptExecutive-iOS/JawaObjectRef.m

@@ -14,6 +14,7 @@
 #import "JawaObjectRef.h"
 
 NSMutableArray* jawaObjectPool;
+int release_count;
 
 @implementation JawaObjectRef
 
@@ -124,6 +125,7 @@ -(id)transfer {
         return self.object;
 }
 -(void)dealloc {
+    release_count++;
     //printf("Releasing %s\n", [NSStringFromClass([self class]) cStringUsingEncoding:NSUTF8StringEncoding]);
 }
 

JawaScriptExecutive-iOS/test.m

@@ -866,6 +866,7 @@ int main(int argc, char *argv[]) {
         if (!test33()) return -1;
         if (!test34()) return -1;
     }
+    //printf("%d\n", release_count);
     return 0;
 }