mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-11-15 14:57:22 +00:00
Code Issues 1 Releases Wiki Activity

Use infinite timeout to indicate non-blocking.

Browse Source 
Makes more sense than negative numbers.
This commit is contained in:
Calvin Rose
2019-12-18 16:07:06 -05:00
parent 07b0ef1648
commit 94246f7574
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/thread.c
View File

@@ -184,11 +184,11 @@ static void janet_waiter_init(JanetWaiter *waiter, double sec) {
waiter->timedwait = 0; waiter->timedwait = 0;
waiter->nowait = 0; waiter->nowait = 0;
if (sec == 0.0 || isnan(sec)) { if (sec <= 0.0 || isnan(sec)) {
waiter->nowait = 1; waiter->nowait = 1;
return; return;
} }
waiter->timedwait = sec > 0.0; waiter->timedwait = sec > 0.0 && !isinf(sec);
/* Set maximum wait time to 30 days */ /* Set maximum wait time to 30 days */
if (sec > (60.0 * 60.0 * 24.0 * 30.0)) { if (sec > (60.0 * 60.0 * 24.0 * 30.0)) {
@@ -369,7 +369,7 @@ int janet_thread_receive(Janet *msg_out, double timeout) {
} }
} }
if (wait.nowait || mailbox->refCount <= 1) { if (wait.nowait) {
janet_mailbox_unlock(mailbox); janet_mailbox_unlock(mailbox);
return 1; return 1;
} }
@@ -430,7 +430,7 @@ static int thread_worker(JanetMailbox *mailbox) {
/* Unmarshal the function */ /* Unmarshal the function */
Janet funcv; Janet funcv;
int status = janet_thread_receive(&funcv, -1.0); int status = janet_thread_receive(&funcv, INFINITY);
if (status) goto error; if (status) goto error;
if (!janet_checktype(funcv, JANET_FUNCTION)) goto error; if (!janet_checktype(funcv, JANET_FUNCTION)) goto error;
@@ -551,7 +551,7 @@ static Janet cfun_thread_new(int32_t argc, Janet *argv) {
} }
/* If thread started, send the worker function. */ /* If thread started, send the worker function. */
if (janet_thread_send(thread, argv[0], -1.0)) { if (janet_thread_send(thread, argv[0], INFINITY)) {
janet_panicf("could not send worker function %v to thread", argv[0]); janet_panicf("could not send worker function %v to thread", argv[0]);
} }