correct caching

source/cell.c

@@ -9,6 +9,7 @@
 
 #include "cell.h"
 #include "cell_internal.h"
+#include "quickjs-internal.h"
 #include "cJSON.h"
 
 #define BOOTSTRAP_MCODE      "boot/bootstrap.cm.mcode"
@@ -325,7 +326,7 @@ void script_startup(cell_rt *prt)
   JS_SetGCScanExternal(js, actor_gc_scan);
   prt->context = js;
 
-  /* Set per-actor heap memory limit */
+  js->actor_label = prt->name;  /* may be NULL; updated when name is set */
   JS_SetHeapMemoryLimit(js, ACTOR_MEMORY_LIMIT);
 
   /* Register all GCRef fields so the Cheney GC can relocate them. */

source/cell_internal.h

@@ -29,7 +29,7 @@ typedef struct letter {
 #define ACTOR_FAST_TIMER_NS     (10ULL * 1000000)      // 10ms per turn
 #define ACTOR_SLOW_TIMER_NS     (60000ULL * 1000000)   // 60s for slow actors
 #define ACTOR_SLOW_STRIKES_MAX  3                       // consecutive slow turns -> kill
-#define ACTOR_MEMORY_LIMIT      (16ULL * 1024 * 1024)  // 16MB heap cap
+#define ACTOR_MEMORY_LIMIT      (1024ULL * 1024 * 1024)  // 1GB heap cap
 
 typedef struct cell_rt {
   JSContext *context;

source/qjs_actor.c

@@ -91,6 +91,7 @@ JSC_CCALL(actor_disrupt,
 JSC_SCALL(actor_setname,
   cell_rt *rt = JS_GetContextOpaque(js);
   rt->name = strdup(str);
+  js->actor_label = rt->name;
 )
 
 JSC_CCALL(actor_on_exception,

source/quickjs-internal.h

@@ -778,6 +778,7 @@ struct JSContext {
   uint32_t suspended_pc;          /* saved PC for resume */
   int vm_call_depth;              /* 0 = pure bytecode, >0 = C frames on stack */
   size_t heap_memory_limit;       /* 0 = no limit, else max heap bytes */
+  const char *actor_label;        /* human-readable label for OOM diagnostics */
 
   JSValue current_exception;
 

source/runtime.c

@@ -2071,6 +2071,7 @@ JSContext *JS_NewContextRawWithHeapSize (JSRuntime *rt, size_t heap_size) {
   ctx->suspended_pc = 0;
   ctx->vm_call_depth = 0;
   ctx->heap_memory_limit = 0;
+  ctx->actor_label = NULL;
   JS_AddGCRef(ctx, &ctx->suspended_frame_ref);
   ctx->suspended_frame_ref.val = JS_NULL;
 
@@ -3297,7 +3298,20 @@ JS_RaiseDisrupt (JSContext *ctx, const char *fmt, ...) {
 
 /* Log to "memory" channel + disrupt.  Skips JS callback (can't allocate). */
 JSValue JS_RaiseOOM (JSContext *ctx) {
-  fprintf (stderr, "out of memory\n");
+  size_t used = (size_t)((uint8_t *)ctx->heap_free - (uint8_t *)ctx->heap_base);
+  size_t block = ctx->current_block_size;
+  size_t limit = ctx->heap_memory_limit;
+  const char *label = ctx->actor_label;
+  if (limit > 0) {
+    fprintf(stderr, "out of memory: heap %zuKB / %zuKB block, limit %zuMB",
+            used / 1024, block / 1024, limit / (1024 * 1024));
+  } else {
+    fprintf(stderr, "out of memory: heap %zuKB / %zuKB block, no limit",
+            used / 1024, block / 1024);
+  }
+  if (label)
+    fprintf(stderr, " [%s]", label);
+  fprintf(stderr, "\n");
   ctx->current_exception = JS_TRUE;
   return JS_EXCEPTION;
 }