Fix GC interface and collect automatically (#848)

AssemblyScript · Sep 20, 2019 · bc6a944 · bc6a944
1 parent 5b51057
commit bc6a944
Show file tree

Hide file tree

Showing 39 changed files with 15,152 additions and 10,146 deletions.
diff --git a/std/assembly/gc.ts b/std/assembly/gc.ts
@@ -0,0 +1,13 @@
+/// <reference path="./rt/index.d.ts" />
+
+/** Garbage collector interface. */
+export namespace gc {
+
+  /** Can be set to `false` to disable automatic collection. Defaults to `true`. */
+  export var auto: bool = true;
+
+  /** Performs a full garbage collection cycle. */
+  export function collect(): void {
+    __collect();
+  }
+}
diff --git a/std/assembly/index.d.ts b/std/assembly/index.d.ts
@@ -1032,16 +1032,12 @@ declare namespace memory {
   export function compare(vl: usize, vr: usize, n: usize): i32;
 }
 
-/** Garbage collector operations. */
+/** Garbage collector interface. */
 declare namespace gc {
-  /** Whether the garbage collector interface is implemented. */
-  export const implemented: bool;
+  /** Can be set to `false` to disable automatic collection. Defaults to `true`. */
+  export var auto: bool;
   /** Performs a full garbage collection cycle. */
   export function collect(): void;
-  /** Retains a reference, making sure that it doesn't become collected. */
-  export function retain(ref: usize): void;
-  /** Releases a reference, allowing it to become collected. */
-  export function release(ref: usize): void;
 }
 
 /** Table operations. */

diff --git a/std/assembly/rt/tlsf.ts b/std/assembly/rt/tlsf.ts
@@ -477,14 +477,31 @@ export function initializeRoot(): void {
   ROOT = root;
 }
 
+// @ts-ignore: decorator
+@lazy
+var collectLock: bool = false;
+
 /** Allocates a block of the specified size. */
 export function allocateBlock(root: Root, size: usize): Block {
+  if (DEBUG) assert(!collectLock); // must not allocate while collecting
   var payloadSize = prepareSize(size);
   var block = searchBlock(root, payloadSize);
   if (!block) {
-    growMemory(root, payloadSize);
-    block = <Block>searchBlock(root, payloadSize);
-    if (DEBUG) assert(block); // must be found now
+    if (gc.auto) {
+      if (DEBUG) collectLock = true;
+      __collect();
+      if (DEBUG) collectLock = false;
+      block = searchBlock(root, payloadSize);
+      if (!block) {
+        growMemory(root, payloadSize);
+        block = <Block>searchBlock(root, payloadSize);
+        if (DEBUG) assert(block); // must be found now
+      }
+    } else {
+      growMemory(root, payloadSize);
+      block = <Block>searchBlock(root, payloadSize);
+      if (DEBUG) assert(block); // must be found now
+    }
   }
   if (DEBUG) assert((block.mmInfo & ~TAGS_MASK) >= payloadSize); // must fit
   block.gcInfo = 0; // RC=0