mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-01-06 22:00:27 +00:00
Code Issues 1 Releases Wiki Activity

Undo workaround for unsetting reference from streams -> fibers after

Browse Source 
async event completes. Moves this logic back into janet_async_end.
This commit is contained in:
Calvin Rose 2024-09-06 00:20:50 -05:00
parent 75bdea5155
commit 4f65c2707e
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/ev.c
View File

@ -2283,7 +2283,6 @@ void ev_callback_read(JanetFiber *fiber, JanetAsyncEvent event) {
break; break;
case JANET_ASYNC_EVENT_CLOSE: case JANET_ASYNC_EVENT_CLOSE:
janet_schedule(fiber, janet_wrap_nil()); janet_schedule(fiber, janet_wrap_nil());
stream->read_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
#ifdef JANET_WINDOWS #ifdef JANET_WINDOWS
@ -2410,7 +2409,6 @@ void ev_callback_read(JanetFiber *fiber, JanetAsyncEvent event) {
nread = 0; nread = 0;
} else { } else {
janet_cancel(fiber, janet_ev_lasterr()); janet_cancel(fiber, janet_ev_lasterr());
stream->read_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
} }
@ -2420,7 +2418,6 @@ void ev_callback_read(JanetFiber *fiber, JanetAsyncEvent event) {
state->bytes_read += nread; state->bytes_read += nread;
if (state->bytes_read == 0 && (state->mode != JANET_ASYNC_READMODE_RECVFROM)) { if (state->bytes_read == 0 && (state->mode != JANET_ASYNC_READMODE_RECVFROM)) {
janet_schedule(fiber, janet_wrap_nil()); janet_schedule(fiber, janet_wrap_nil());
stream->read_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
} }
@ -2444,7 +2441,6 @@ void ev_callback_read(JanetFiber *fiber, JanetAsyncEvent event) {
resume_val = janet_wrap_buffer(buffer); resume_val = janet_wrap_buffer(buffer);
} }
janet_schedule(fiber, resume_val); janet_schedule(fiber, resume_val);
stream->read_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
} }
@ -2537,7 +2533,6 @@ void ev_callback_write(JanetFiber *fiber, JanetAsyncEvent event) {
} }
case JANET_ASYNC_EVENT_CLOSE: case JANET_ASYNC_EVENT_CLOSE:
janet_cancel(fiber, janet_cstringv("stream closed")); janet_cancel(fiber, janet_cstringv("stream closed"));
stream->write_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
#ifdef JANET_WINDOWS #ifdef JANET_WINDOWS
@ -2624,12 +2619,10 @@ void ev_callback_write(JanetFiber *fiber, JanetAsyncEvent event) {
#else #else
case JANET_ASYNC_EVENT_ERR: case JANET_ASYNC_EVENT_ERR:
janet_cancel(fiber, janet_cstringv("stream err")); janet_cancel(fiber, janet_cstringv("stream err"));
stream->write_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
case JANET_ASYNC_EVENT_HUP: case JANET_ASYNC_EVENT_HUP:
janet_cancel(fiber, janet_cstringv("stream hup")); janet_cancel(fiber, janet_cstringv("stream hup"));
stream->write_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
case JANET_ASYNC_EVENT_INIT: case JANET_ASYNC_EVENT_INIT:
@ -2667,7 +2660,6 @@ void ev_callback_write(JanetFiber *fiber, JanetAsyncEvent event) {
if (nwrote == -1) { if (nwrote == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) break; if (errno == EAGAIN || errno == EWOULDBLOCK) break;
janet_cancel(fiber, janet_ev_lasterr()); janet_cancel(fiber, janet_ev_lasterr());
stream->write_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
} }
@ -2675,7 +2667,6 @@ void ev_callback_write(JanetFiber *fiber, JanetAsyncEvent event) {
/* Unless using datagrams, empty message is a disconnect */ /* Unless using datagrams, empty message is a disconnect */
if (nwrote == 0 && !dest_abst) { if (nwrote == 0 && !dest_abst) {
janet_cancel(fiber, janet_cstringv("disconnect")); janet_cancel(fiber, janet_cstringv("disconnect"));
stream->write_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
} }
@ -2689,7 +2680,6 @@ void ev_callback_write(JanetFiber *fiber, JanetAsyncEvent event) {
state->start = start; state->start = start;
if (start >= len) { if (start >= len) {
janet_schedule(fiber, janet_wrap_nil()); janet_schedule(fiber, janet_wrap_nil());
stream->write_fiber = NULL;
janet_async_end(fiber); janet_async_end(fiber);
break; break;
} }