core: use the JS allocator for all bindings

saghul · saghul · commit 8fbd438aaf6d · 2024-02-29T11:18:26.000+01:00
diff --git a/src/fswatch.c b/src/fswatch.c
@@ -44,7 +44,7 @@ static void uv__fsevent_close_cb(uv_handle_t *handle) {
     if (fw) {
         fw->closed = 1;
         if (fw->finalized)
-            free(fw);
+            js_free(fw->ctx, fw);
     }
 }
 
@@ -59,7 +59,7 @@ static void tjs_fswatch_finalizer(JSRuntime *rt, JSValue val) {
         JS_FreeValueRT(rt, fw->callback);
         fw->finalized = 1;
         if (fw->closed)
-            free(fw);
+            js_free_rt(rt, fw);
         else
             maybe_close(fw);
     }
@@ -167,7 +167,7 @@ static JSValue tjs_fs_watch(JSContext *ctx, JSValueConst this_val, int argc, JSV
         return JS_EXCEPTION;
     }
 
-    TJSFsWatch *fw = calloc(1, sizeof(*fw));
+    TJSFsWatch *fw = js_mallocz(ctx, sizeof(*fw));
     if (!fw) {
         JS_FreeCString(ctx, path);
         JS_FreeValue(ctx, obj);
@@ -178,15 +178,15 @@ static JSValue tjs_fs_watch(JSContext *ctx, JSValueConst this_val, int argc, JSV
     if (r != 0) {
         JS_FreeCString(ctx, path);
         JS_FreeValue(ctx, obj);
-        free(fw);
+        js_free(ctx, fw);
         return JS_ThrowInternalError(ctx, "couldn't initialize handle");
     }
 
     r = uv_fs_event_start(&fw->handle, uv__fs_event_cb, path, UV_FS_EVENT_RECURSIVE);
     if (r != 0) {
         JS_FreeCString(ctx, path);
         JS_FreeValue(ctx, obj);
-        free(fw);
+        js_free(ctx, fw);
         return tjs_throw_errno(ctx, r);
     }
 
diff --git a/src/process.c b/src/process.c
@@ -50,7 +50,7 @@ static void uv__close_cb(uv_handle_t *handle) {
     CHECK_NOT_NULL(p);
     p->closed = true;
     if (p->finalized)
-        free(p);
+        js_free(p->ctx, p);
 }
 
 static void maybe_close(TJSProcess *p) {
@@ -67,7 +67,7 @@ static void tjs_process_finalizer(JSRuntime *rt, JSValue val) {
         JS_FreeValueRT(rt, p->stdio[2]);
         p->finalized = true;
         if (p->closed)
-            free(p);
+            js_free_rt(rt, p);
         else
             maybe_close(p);
     }
@@ -178,7 +178,7 @@ static JSValue tjs_spawn(JSContext *ctx, JSValueConst this_val, int argc, JSValu
     if (JS_IsException(obj))
         return obj;
 
-    TJSProcess *p = calloc(1, sizeof(*p));
+    TJSProcess *p = js_mallocz(ctx, sizeof(*p));
     if (!p) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
@@ -441,7 +441,7 @@ static JSValue tjs_spawn(JSContext *ctx, JSValueConst this_val, int argc, JSValu
     JS_FreeValue(ctx, p->stdio[0]);
     JS_FreeValue(ctx, p->stdio[1]);
     JS_FreeValue(ctx, p->stdio[2]);
-    free(p);
+    js_free(ctx, p);
     JS_FreeValue(ctx, obj);
     ret = JS_EXCEPTION;
 cleanup:
diff --git a/src/signals.c b/src/signals.c
@@ -43,7 +43,7 @@ static void uv__signal_close_cb(uv_handle_t *handle) {
     if (sh) {
         sh->closed = 1;
         if (sh->finalized)
-            free(sh);
+            js_free(sh->ctx, sh);
     }
 }
 
@@ -58,7 +58,7 @@ static void tjs_signal_handler_finalizer(JSRuntime *rt, JSValue val) {
         JS_FreeValueRT(rt, sh->func);
         sh->finalized = 1;
         if (sh->closed)
-            free(sh);
+            js_free_rt(rt, sh);
         else
             maybe_close(sh);
     }
@@ -96,7 +96,7 @@ static JSValue tjs_signal(JSContext *ctx, JSValueConst this_val, int argc, JSVal
     if (JS_IsException(obj))
         return obj;
 
-    TJSSignalHandler *sh = calloc(1, sizeof(*sh));
+    TJSSignalHandler *sh = js_mallocz(ctx, sizeof(*sh));
     if (!sh) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
@@ -105,14 +105,14 @@ static JSValue tjs_signal(JSContext *ctx, JSValueConst this_val, int argc, JSVal
     int r = uv_signal_init(tjs_get_loop(ctx), &sh->handle);
     if (r != 0) {
         JS_FreeValue(ctx, obj);
-        free(sh);
+        js_free(ctx, sh);
         return JS_ThrowInternalError(ctx, "couldn't initialize Signal handle");
     }
 
     r = uv_signal_start(&sh->handle, uv__signal_cb, sig_num);
     if (r != 0) {
         JS_FreeValue(ctx, obj);
-        free(sh);
+        js_free(ctx, sh);
         return tjs_throw_errno(ctx, r);
     }
     uv_unref((uv_handle_t *) &sh->handle);
diff --git a/src/streams.c b/src/streams.c
@@ -36,6 +36,7 @@ static JSValue tjs_new_tcp(JSContext *ctx, int af);
 
 typedef struct {
     JSContext *ctx;
+    JSRuntime *rt;
     int closed;
     int finalized;
     union {
@@ -82,7 +83,7 @@ static void uv__stream_close_cb(uv_handle_t *handle) {
     CHECK_NOT_NULL(s);
     s->closed = 1;
     if (s->finalized)
-        free(s);
+        js_free_rt(s->rt, s);
 }
 
 static void maybe_close(TJSStream *s) {
@@ -399,6 +400,7 @@ static JSValue tjs_stream_set_blocking(JSContext *ctx, TJSStream *s, int argc, J
 
 static JSValue tjs_init_stream(JSContext *ctx, JSValue obj, TJSStream *s) {
     s->ctx = ctx;
+    s->rt = JS_GetRuntime(ctx);
     s->closed = 0;
     s->finalized = 0;
 
@@ -422,7 +424,7 @@ static void tjs_stream_finalizer(JSRuntime *rt, TJSStream *s) {
         JS_FreeValueRT(rt, s->read.b.tarray);
         s->finalized = 1;
         if (s->closed)
-            free(s);
+            js_free_rt(rt, s);
         else
             maybe_close(s);
     }
@@ -466,7 +468,7 @@ static JSValue tjs_new_tcp(JSContext *ctx, int af) {
     if (JS_IsException(obj))
         return obj;
 
-    s = calloc(1, sizeof(*s));
+    s = js_mallocz(ctx, sizeof(*s));
     if (!s) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
@@ -475,7 +477,7 @@ static JSValue tjs_new_tcp(JSContext *ctx, int af) {
     r = uv_tcp_init_ex(tjs_get_loop(ctx), &s->h.tcp, af);
     if (r != 0) {
         JS_FreeValue(ctx, obj);
-        free(s);
+        js_free(ctx, s);
         return JS_ThrowInternalError(ctx, "couldn't initialize TCP handle");
     }
 
@@ -644,7 +646,7 @@ static JSValue tjs_tty_constructor(JSContext *ctx, JSValueConst new_target, int
     if (JS_IsException(obj))
         return obj;
 
-    s = calloc(1, sizeof(*s));
+    s = js_mallocz(ctx, sizeof(*s));
     if (!s) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
@@ -653,7 +655,7 @@ static JSValue tjs_tty_constructor(JSContext *ctx, JSValueConst new_target, int
     r = uv_tty_init(tjs_get_loop(ctx), &s->h.tty, fd, readable);
     if (r != 0) {
         JS_FreeValue(ctx, obj);
-        free(s);
+        js_free(ctx, s);
         return JS_ThrowInternalError(ctx, "couldn't initialize TTY handle");
     }
 
@@ -726,7 +728,7 @@ JSValue tjs_new_pipe(JSContext *ctx) {
     if (JS_IsException(obj))
         return obj;
 
-    s = calloc(1, sizeof(*s));
+    s = js_mallocz(ctx, sizeof(*s));
     if (!s) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
@@ -735,7 +737,7 @@ JSValue tjs_new_pipe(JSContext *ctx) {
     r = uv_pipe_init(tjs_get_loop(ctx), &s->h.pipe, 0);
     if (r != 0) {
         JS_FreeValue(ctx, obj);
-        free(s);
+        js_free(ctx, s);
         return JS_ThrowInternalError(ctx, "couldn't initialize Pipe handle");
     }
 
diff --git a/src/timers.c b/src/timers.c
@@ -28,6 +28,7 @@
 
 typedef struct {
     JSContext *ctx;
+    JSRuntime *rt;
     uv_timer_t handle;
     int interval;
     JSValue func;
@@ -63,7 +64,7 @@ static void call_timer(TJSTimer *th) {
 static void uv__timer_close(uv_handle_t *handle) {
     TJSTimer *th = handle->data;
     CHECK_NOT_NULL(th);
-    free(th);
+    js_free_rt(th->rt, th);
 }
 
 static void uv__timer_cb(uv_timer_t *handle) {
@@ -129,13 +130,14 @@ static JSValue tjs_setTimeout(JSContext *ctx, JSValueConst this_val, int argc, J
         nargs = 0;
     }
 
-    th = calloc(1, sizeof(*th) + nargs * sizeof(JSValue));
+    th = js_mallocz(ctx, sizeof(*th) + nargs * sizeof(JSValue));
     if (!th) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
     }
 
     th->ctx = ctx;
+    th->rt = JS_GetRuntime(ctx);
     CHECK_EQ(uv_timer_init(tjs_get_loop(ctx), &th->handle), 0);
     th->handle.data = th;
     th->interval = magic;
diff --git a/src/udp.c b/src/udp.c
@@ -56,7 +56,7 @@ static void uv__udp_close_cb(uv_handle_t *handle) {
     CHECK_NOT_NULL(u);
     u->closed = 1;
     if (u->finalized)
-        free(u);
+        js_free(u->ctx, u);
 }
 
 static void maybe_close(TJSUdp *u) {
@@ -71,7 +71,7 @@ static void tjs_udp_finalizer(JSRuntime *rt, JSValue val) {
         JS_FreeValueRT(rt, u->read.b.tarray);
         u->finalized = 1;
         if (u->closed)
-            free(u);
+            js_free_rt(rt, u);
         else
             maybe_close(u);
     }
@@ -282,7 +282,7 @@ static JSValue tjs_new_udp(JSContext *ctx, int af) {
     if (JS_IsException(obj))
         return obj;
 
-    u = calloc(1, sizeof(*u));
+    u = js_mallocz(ctx, sizeof(*u));
     if (!u) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
@@ -291,7 +291,7 @@ static JSValue tjs_new_udp(JSContext *ctx, int af) {
     r = uv_udp_init_ex(tjs_get_loop(ctx), &u->udp, af);
     if (r != 0) {
         JS_FreeValue(ctx, obj);
-        free(u);
+        js_free(ctx, u);
         return JS_ThrowInternalError(ctx, "couldn't initialize UDP handle");
     }
 
diff --git a/src/worker.c b/src/worker.c
@@ -131,7 +131,7 @@ static void worker_entry(void *arg) {
 static void uv__close_cb(uv_handle_t *handle) {
     TJSWorker *w = handle->data;
     CHECK_NOT_NULL(w);
-    free(w);
+    js_free(w->ctx, w);
 }
 
 static void tjs_worker_finalizer(JSRuntime *rt, JSValue val) {
@@ -227,7 +227,7 @@ static JSValue tjs_new_worker(JSContext *ctx, uv_os_sock_t channel_fd, bool is_m
     if (JS_IsException(obj))
         return obj;
 
-    TJSWorker *w = calloc(1, sizeof(*w));
+    TJSWorker *w = js_mallocz(ctx, sizeof(*w));
     if (!w) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
diff --git a/src/ws.c b/src/ws.c
@@ -50,7 +50,7 @@ static void tjs_ws_finalizer(JSRuntime *rt, JSValue val) {
         }
         for (int i = 0; i < WS_EVENT_MAX; i++)
             JS_FreeValueRT(rt, w->events[i]);
-        free(w);
+        js_free_rt(rt, w);
     }
 }
 
@@ -140,7 +140,7 @@ static JSValue tjs_ws_constructor(JSContext *ctx, JSValueConst new_target, int a
     if (JS_IsException(obj))
         return obj;
 
-    TJSWs *w = calloc(1, sizeof(*w));
+    TJSWs *w = js_mallocz(ctx, sizeof(*w));
     if (!w) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;
diff --git a/src/xhr.c b/src/xhr.c
@@ -107,7 +107,7 @@ static void tjs_xhr_finalizer(JSRuntime *rt, JSValue val) {
         JS_FreeValueRT(rt, x->result.response_text);
         dbuf_free(&x->result.hbuf);
         dbuf_free(&x->result.bbuf);
-        free(x);
+        js_free_rt(rt, x);
     }
 }
 
@@ -301,7 +301,7 @@ static JSValue tjs_xhr_constructor(JSContext *ctx, JSValueConst new_target, int
     if (JS_IsException(obj))
         return obj;
 
-    TJSXhr *x = calloc(1, sizeof(*x));
+    TJSXhr *x = js_mallocz(ctx, sizeof(*x));
     if (!x) {
         JS_FreeValue(ctx, obj);
         return JS_EXCEPTION;

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ static void tjs_ws_finalizer(JSRuntime *rt, JSValue val) {`
`50`	`50`	`}`
`51`	`51`	`for (int i = 0; i < WS_EVENT_MAX; i++)`
`52`	`52`	`JS_FreeValueRT(rt, w->events[i]);`
`53`		`- free(w);`
	`53`	`+ js_free_rt(rt, w);`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`@@ -140,7 +140,7 @@ static JSValue tjs_ws_constructor(JSContext *ctx, JSValueConst new_target, int a`
`140`	`140`	`if (JS_IsException(obj))`
`141`	`141`	`return obj;`
`142`	`142`
`143`		`- TJSWs w = calloc(1, sizeof(w));`
	`143`	`+ TJSWs w = js_mallocz(ctx, sizeof(w));`
`144`	`144`	`if (!w) {`
`145`	`145`	`JS_FreeValue(ctx, obj);`
`146`	`146`	`return JS_EXCEPTION;`