QJS patches for GPAC 2.5-dev

Author: jeanlf

GPAC_README.md

@@ -1,13 +1,13 @@
 # QuickJS in GPAC
-Base version is quickjs-2021-03-27 :
-	https://github.com/bellard/quickjs/commit/b5e62895c619d4ffc75c9d822c8d85f1ece77e5b
+Base version is quickjs-2025-10-15 :
+	https://github.com/bellard/quickjs/commit/eb2c89087def1829ed99630cb14b549d7a98408c
 
 ## Modifications to QuickJS
 - define CONFIG_VERSION in QuickJS.c
 - patched for MSVC compil, based on https://github.com/horhof/quickjs/compare/master...samhocevar:task/msvc-support
 - do not define CONFIG_STACK_CHECK (stack checking breaks multithread support)
-- patched for JS_GetOpaque_Nocheck (get opaque data without class_id check, needed in some places in gpac due to original SpiderMonkey design)
 - patched for exporting JS_AtomIsArrayIndex and JS_IsArrayBuffer
+- patched for switch classID on object (for webGL named textures in GPAC)
 
 ## Modifications to QuickJS-libc ('os' and 'std' modules)
 - moved from pthread to GF_Thread in 'os' module
@@ -16,5 +16,3 @@ Base version is quickjs-2021-03-27 :
 - patch js_std_loop to not run forever for main thread
 - added MSVC support for most 'os' functions (most importantly exec, waitpid and kill)
 - use gpac module loader
-- pacthes for sighandler_t and environ
-

cutils.h

@@ -144,7 +144,7 @@ static inline int clz32(unsigned int a)
 #if defined(_MSC_VER)
     unsigned long ret = 0;
     _BitScanReverse(&ret, a);
-    return (int)ret;
+	return 31 - ret;
 #else
     return __builtin_clz(a);
 #endif
@@ -462,17 +462,50 @@ static inline double uint64_as_float64(uint64_t u64)
     return u.d;
 }
 
+
+//taken from QuickJS-NG, original function is not protable due to 0x1p1008
+#if defined(_MSC_VER) && !defined(__clang__)
+#include <math.h>
+#define INF INFINITY
+#define NEG_INF -INFINITY
+
+static inline double fromfp16(uint16_t v) {
+	double d, s;
+	int e;
+	if ((v & 0x7C00) == 0x7C00) {
+		d = (v & 0x3FF) ? NAN : INFINITY;
+	}
+	else {
+		d = (v & 0x3FF) / 1024.;
+		e = (v & 0x7C00) >> 10;
+		if (e == 0) {
+			e = -14;
+		}
+		else {
+			d += 1;
+			e -= 15;
+		}
+		d = scalbn(d, e);
+	}
+	s = (v & 0x8000) ? -1.0 : 1.0;
+	return d * s;
+}
+#else
+
 static inline double fromfp16(uint16_t v)
 {
-    double d;
-    uint32_t v1;
-    v1 = v & 0x7fff;
-    if (unlikely(v1 >= 0x7c00))
-        v1 += 0x1f8000; /* NaN or infinity */
-    d = uint64_as_float64(((uint64_t)(v >> 15) << 63) | ((uint64_t)v1 << (52 - 10)));
-    return d * 0x1p1008;
+	double d;
+	uint32_t v1;
+	v1 = v & 0x7fff;
+	if (unlikely(v1 >= 0x7c00))
+		v1 += 0x1f8000; /* NaN or infinity */
+	d = uint64_as_float64(((uint64_t)(v >> 15) << 63) | ((uint64_t)v1 << (52 - 10)));
+	return d * 0x1p1008;
 }
 
+#endif
+
+
 static inline uint16_t tofp16(double d)
 {
     uint64_t a, addend;

dtoa.c

@@ -28,7 +28,9 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
+#if !defined(_MSC_VER)
 #include <sys/time.h>
+#endif
 #include <math.h>
 #include <setjmp.h>
 

quickjs-libc.c

@@ -124,6 +124,7 @@ typedef SSIZE_T ssize_t;
 /* enable the os.Worker API. It relies on POSIX threads */
 #define USE_WORKER
 
+#endif
 
 #ifdef USE_WORKER
 #include <gpac/thread.h>
@@ -678,8 +679,6 @@ int js_module_set_import_meta(JSContext *ctx, JSValueConst func_val,
 }
 
 
-#ifndef GPAC_DISABLE_QJS_LIBC
-
 static int json_module_init(JSContext *ctx, JSModuleDef *m)
 {
     JSValue val;
@@ -702,6 +701,9 @@ JSModuleDef *create_json_module(JSContext *ctx, const char *module_name, JSValue
     return m;
 }
 
+#ifndef GPAC_DISABLE_QJS_LIBC
+
+
 /* in order to conform with the specification, only the keys should be
    tested and not the associated values. */
 int js_module_check_attributes(JSContext *ctx, void *opaque,
@@ -733,6 +735,7 @@ int js_module_check_attributes(JSContext *ctx, void *opaque,
     JS_FreePropertyEnum(ctx, tab, len);
     return ret;
 }
+#endif
 
 /* return > 0 if the attributes indicate a JSON module */
 int js_module_test_json(JSContext *ctx, JSValueConst attributes)
@@ -763,6 +766,8 @@ int js_module_test_json(JSContext *ctx, JSValueConst attributes)
     return res;
 }
 
+#ifndef GPAC_DISABLE_QJS_LIBC
+
 #ifndef GPAC_HAS_QJS
 
 JSModuleDef *js_module_loader(JSContext *ctx,
@@ -2225,8 +2230,13 @@ static int64_t get_time_ms(void)
     clock_gettime(CLOCK_MONOTONIC, &ts);
     return (uint64_t)ts.tv_sec * 1000 + (ts.tv_nsec / 1000000);
 }
+static int64_t get_time_ns(void)
+{
+	struct timespec ts;
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	return (uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec;
+}
 
-/* CHECKME
 #elif defined(_WIN32) && defined(_MSC_VER)
 //more portable, but does not work if the date is updated
 static int64_t get_time_ms(void)
@@ -2235,16 +2245,12 @@ static int64_t get_time_ms(void)
 
 	_ftime(&tb);
 	return (int64_t)tb.time * 1000 + (tb.millitm);
-
 }
-*/
-
 static int64_t get_time_ns(void)
 {
-    struct timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-    return (uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec;
+	return gf_sys_clock_high_res() * 1000;
 }
+
 #else
 /* more portable, but does not work if the date is updated */
 static int64_t get_time_ms(void)
@@ -2560,8 +2566,10 @@ static int js_os_poll(JSContext *ctx)
             }
         }
     } else {
-        min_delay = -1;
-    }
+		//min_delay = -1;
+		//we need to exit - max 1sec wait
+		min_delay = 1000;
+	}
 
     count = 0;
     list_for_each(el, &ts->os_rw_handlers) {
@@ -2575,7 +2583,7 @@ static int js_os_poll(JSContext *ctx)
 
     list_for_each(el, &ts->port_list) {
         JSWorkerMessageHandler *port = list_entry(el, JSWorkerMessageHandler, link);
-        if (JS_IsNull(port->on_message_func))
+		if (JS_IsNull(port->on_message_func))
             continue;
         handles[count++] = port->recv_pipe->waker.handle;
         if (count == (int)countof(handles))
@@ -2609,13 +2617,18 @@ static int js_os_poll(JSContext *ctx)
                 }
             }
         }
-    } else {
-        Sleep(min_delay);
     }
- done:
+
+	//do not block if main thread !
+	if (!ts->recv_pipe || ts->terminated) {
+		return -1;
+	}
+
+done:
     return 0;
 }
 
+
 #else
 
 static int js_os_poll(JSContext *ctx)
@@ -2732,6 +2745,11 @@ static int js_os_poll(JSContext *ctx)
             }
         }
     }
+
+	//do not block if main thread !
+    else if (!ts->recv_pipe || ts->terminated) {
+		return -1;
+	}
  done:
     return 0;
 }
@@ -3730,6 +3748,14 @@ static JSValue js_os_waitpid(JSContext *ctx, JSValueConst this_val, int argc, JS
 	return obj;
 }
 
+/* getpid() -> pid */
+static JSValue js_os_getpid(JSContext *ctx, JSValueConst this_val,
+	int argc, JSValueConst *argv)
+{
+	return JS_NewInt32(ctx, GetCurrentProcessId());
+}
+
+
 /* kill(pid, sig) */
 static JSValue js_os_kill(JSContext *ctx, JSValueConst this_val,
 	int argc, JSValueConst *argv)
@@ -3834,6 +3860,7 @@ typedef struct {
     char *basename; /* module base name */
     JSWorkerMessagePipe *recv_pipe, *send_pipe;
     int strip_flags;
+    JSWorkerData *worker;
 } WorkerFuncArgs;
 
 typedef struct {
@@ -3900,10 +3927,6 @@ static JSWorkerMessagePipe *js_new_message_pipe(void)
 	char mxName[100];
 	sprintf(mxName, "Worker%pMx", ps);
 	ps->mutex = gf_mx_new(mxName);
-/* CHECKME
-    ps->read_fd = pipe_fds[0];
-    ps->write_fd = pipe_fds[1];
-*/
     return ps;
 }
 
@@ -3942,12 +3965,8 @@ static void js_free_message_pipe(JSWorkerMessagePipe *ps)
             js_free_message(msg);
         }
 
-/* CHECKME
-        close(ps->read_fd);
-        close(ps->write_fd);
-*/
-        gf_mx_del(ps->mutex);
         js_waker_close(&ps->waker);
+        gf_mx_del(ps->mutex);
         free(ps);
     }
 }
@@ -3990,7 +4009,7 @@ static unsigned int worker_func(void *opaque)
 {
     WorkerFuncArgs *args = opaque;
     JSRuntime *rt;
-	//JSWorkerData *worker;
+	JSWorkerData *worker;
     JSThreadState *ts;
     JSContext *ctx;
     JSValue val;
@@ -4009,10 +4028,9 @@ static unsigned int worker_func(void *opaque)
     ts = JS_GetRuntimeOpaque(rt);
     ts->recv_pipe = args->recv_pipe;
     ts->send_pipe = args->send_pipe;
-/* CHECKME
+
 	worker = args->worker;
 	worker->ts = ts;
-*/
 
     /* function pointer to avoid linking the whole JS_NewContext() if
        not needed */
@@ -4041,10 +4059,10 @@ static unsigned int worker_func(void *opaque)
     JS_FreeValue(ctx, val);
 
 	js_std_loop(ctx);
-/* CHECKME
+
 	worker->ts = NULL;
 	worker->msg_handler = NULL;
-*/
+
     JS_FreeContext(ctx);
     //do not free JSThreadState yet, it is used to unlink ports in worker finalizer
     js_std_free_handlers_ex(rt, 1);
@@ -4139,13 +4157,13 @@ static JSValue js_worker_ctor(JSContext *ctx, JSValueConst new_target,
     if (JS_IsException(obj))
         goto fail;
 
-    JSWorkerData *worker = JS_GetOpaque(obj, js_worker_class_id);
-    worker->th = gf_th_new("gf_js_worker");
-    if (!worker->th) {
+    args->worker = JS_GetOpaque(obj, js_worker_class_id);
+    args->worker->th = gf_th_new("gf_js_worker");
+    if (!args->worker->th) {
         goto oom_fail;
     }
 
-	ret = gf_th_run(worker->th, worker_func, args);
+	ret = gf_th_run(args->worker->th, worker_func, args);
     if (ret != 0) {
         JS_ThrowTypeError(ctx, "could not create worker");
         goto fail;
@@ -4251,7 +4269,7 @@ static JSValue js_worker_set_onmessage(JSContext *ctx, JSValueConst this_val,
     port = worker->msg_handler;
     if (JS_IsNull(func)) {
         if (port) {
-            js_free_port(rt, port);
+			js_free_port(rt, port);
             worker->msg_handler = NULL;
         }
     } else {
@@ -4801,6 +4819,5 @@ void js_std_eval_binary_json_module(JSContext *ctx,
         exit(1);
     }
 }
-#endif
 
 #endif //GPAC_DISABLE_QJS_LIBC