Skip to content

Fix ThreadSanitizer warning in quickjs-libc #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnoordhuis merged 1 commit into from
Sep 28, 2024
Merged

Fix ThreadSanitizer warning in quickjs-libc #562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions quickjs-libc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@ extern char **environ;

#ifdef USE_WORKER
#include <pthread.h>
#include "quickjs-c-atomics.h"
#endif

#include "cutils.h"
#include "list.h"
#include "quickjs-c-atomics.h"
#include "quickjs-libc.h"

#define MAX_SAFE_INTEGER (((int64_t) 1 << 53) - 1)
Expand Down Expand Up @@ -167,7 +167,7 @@ typedef struct JSThreadState {
} JSThreadState;

static uint64_t os_pending_signals;
static int (*os_poll_func)(JSContext *ctx);
static _Atomic int can_js_os_poll;

static void js_std_dbuf_init(JSContext *ctx, DynBuf *s)
{
Expand Down Expand Up @@ -3827,7 +3827,7 @@ static const JSCFunctionListEntry js_os_funcs[] = {

static int js_os_init(JSContext *ctx, JSModuleDef *m)
{
os_poll_func = js_os_poll;
atomic_store(&can_js_os_poll, TRUE);

#ifdef USE_WORKER
{
Expand Down Expand Up @@ -4058,7 +4058,7 @@ JSValue js_std_loop(JSContext *ctx)
}
}

if (!os_poll_func || os_poll_func(ctx))
if (!atomic_load(&can_js_os_poll) || js_os_poll(ctx))
break;
}
done:
Expand Down Expand Up @@ -4090,8 +4090,8 @@ JSValue js_std_await(JSContext *ctx, JSValue obj)
if (err < 0) {
js_std_dump_error(ctx1);
}
if (os_poll_func)
os_poll_func(ctx);
if (atomic_load(&can_js_os_poll))
js_os_poll(ctx);
} else {
/* not a promise */
ret = obj;
Expand Down