DoneJS/quickjs-done-nextgen
1
0
Fork 0
mirror of https://github.com/DoneJS-Runtime/quickjs-done-nextgen.git synced 2025-01-09 17:43:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid requiring atomics on quickjs-libc

Browse source
This commit is contained in:
Saúl Ibarra Corretgé 2024-10-22 10:24:58 +02:00 committed by GitHub
parent e21d09c347
commit 995de2592a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
quickjs-libc.c
View file

@ -87,11 +87,11 @@ extern char **environ;
#ifdef USE_WORKER #ifdef USE_WORKER
#include <pthread.h> #include <pthread.h>
#include "quickjs-c-atomics.h"
#endif #endif
#include "cutils.h" #include "cutils.h"
#include "list.h" #include "list.h"
#include "quickjs-c-atomics.h"
#include "quickjs-libc.h" #include "quickjs-libc.h"
#define MAX_SAFE_INTEGER (((int64_t) 1 << 53) - 1) #define MAX_SAFE_INTEGER (((int64_t) 1 << 53) - 1)
@ -162,6 +162,7 @@ typedef struct JSThreadState {
int eval_script_recurse; /* only used in the main thread */ int eval_script_recurse; /* only used in the main thread */
int64_t next_timer_id; /* for setTimeout / setInterval */ int64_t next_timer_id; /* for setTimeout / setInterval */
JSValue exc; /* current exception from one of our handlers */ JSValue exc; /* current exception from one of our handlers */
BOOL can_js_os_poll;
/* not used in the main thread */ /* not used in the main thread */
JSWorkerMessagePipe *recv_pipe, *send_pipe; JSWorkerMessagePipe *recv_pipe, *send_pipe;
JSClassID std_file_class_id; JSClassID std_file_class_id;
@ -169,7 +170,6 @@ typedef struct JSThreadState {
} JSThreadState; } JSThreadState;
static uint64_t os_pending_signals; static uint64_t os_pending_signals;
static _Atomic int can_js_os_poll;
static void js_std_dbuf_init(JSContext *ctx, DynBuf *s) static void js_std_dbuf_init(JSContext *ctx, DynBuf *s)
{ {
@ -3844,12 +3844,13 @@ static const JSCFunctionListEntry js_os_funcs[] = {
static int js_os_init(JSContext *ctx, JSModuleDef *m) static int js_os_init(JSContext *ctx, JSModuleDef *m)
{ {
atomic_store(&can_js_os_poll, TRUE); JSRuntime *rt = JS_GetRuntime(ctx);
JSThreadState *ts = JS_GetRuntimeOpaque(rt);
ts->can_js_os_poll = TRUE;
#ifdef USE_WORKER #ifdef USE_WORKER
{ {
JSRuntime *rt = JS_GetRuntime(ctx);
JSThreadState *ts = JS_GetRuntimeOpaque(rt);
JSValue proto, obj; JSValue proto, obj;
/* Worker class */ /* Worker class */
JS_NewClassID(rt, &ts->worker_class_id); JS_NewClassID(rt, &ts->worker_class_id);
@ -3973,12 +3974,11 @@ void js_std_init_handlers(JSRuntime *rt)
{ {
JSThreadState *ts; JSThreadState *ts;
ts = js_malloc_rt(rt, sizeof(*ts)); ts = js_mallocz_rt(rt, sizeof(*ts));
if (!ts) { if (!ts) {
fprintf(stderr, "Could not allocate memory for the worker"); fprintf(stderr, "Could not allocate memory for the worker");
exit(1); exit(1);
} }
memset(ts, 0, sizeof(*ts));
init_list_head(&ts->os_rw_handlers); init_list_head(&ts->os_rw_handlers);
init_list_head(&ts->os_signal_handlers); init_list_head(&ts->os_signal_handlers);
init_list_head(&ts->os_timers); init_list_head(&ts->os_timers);
@ -4099,7 +4099,7 @@ JSValue js_std_loop(JSContext *ctx)
} }
} }
if (!atomic_load(&can_js_os_poll) || js_os_poll(ctx)) if (!ts->can_js_os_poll || js_os_poll(ctx))
break; break;
} }
done: done:
@ -4111,6 +4111,8 @@ done:
rejection. */ rejection. */
JSValue js_std_await(JSContext *ctx, JSValue obj) JSValue js_std_await(JSContext *ctx, JSValue obj)
{ {
JSRuntime *rt = JS_GetRuntime(ctx);
JSThreadState *ts = JS_GetRuntimeOpaque(rt);
JSValue ret; JSValue ret;
int state; int state;
@ -4131,7 +4133,7 @@ JSValue js_std_await(JSContext *ctx, JSValue obj)
if (err < 0) { if (err < 0) {
js_std_dump_error(ctx1); js_std_dump_error(ctx1);
} }
if (atomic_load(&can_js_os_poll)) if (ts->can_js_os_poll)
js_os_poll(ctx); js_os_poll(ctx);
} else { } else {
/* not a promise */ /* not a promise */