From f1111c135b8bbcc4d3ea4584c326423b740960a2 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sat, 7 Oct 2023 21:32:20 -0500 Subject: [PATCH] Work on kq --- src/core/ev.c | 2 +- src/core/gc.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/core/ev.c b/src/core/ev.c index 0425868f..fd23e73f 100644 --- a/src/core/ev.c +++ b/src/core/ev.c @@ -1659,7 +1659,7 @@ static void timestamp2timespec(struct timespec *t, JanetTimestamp ts) { void janet_register_stream(JanetStream *stream) { struct kevent kevs[2]; - EV_SETx(&kevs[1], stream->handle, EVFILT_READ, EV_ADD | EV_ENABLE | EV_CLEAR | EV_EOF, 0, 0, stream); + EV_SETx(&kevs[0], stream->handle, EVFILT_READ, EV_ADD | EV_ENABLE | EV_CLEAR | EV_EOF, 0, 0, stream); EV_SETx(&kevs[1], stream->handle, EVFILT_WRITE, EV_ADD | EV_ENABLE | EV_CLEAR | EV_EOF, 0, 0, stream); int status; do { diff --git a/src/core/gc.c b/src/core/gc.c index 0ae453b9..ba05a5a6 100644 --- a/src/core/gc.c +++ b/src/core/gc.c @@ -326,18 +326,17 @@ static void janet_deinit_block(JanetGCObject *mem) { case JANET_MEMORY_TABLE: janet_free(((JanetTable *) mem)->data); break; - case JANET_MEMORY_FIBER: - { - JanetFiber *f = (JanetFiber *)mem; + case JANET_MEMORY_FIBER: { + JanetFiber *f = (JanetFiber *)mem; #ifdef JANET_EV - if (f->ev_state && !(f->flags & JANET_FIBER_EV_FLAG_IN_FLIGHT)) { - janet_ev_dec_refcount(); - janet_free(f->ev_state); - } -#endif - janet_free(f->data); + if (f->ev_state && !(f->flags & JANET_FIBER_EV_FLAG_IN_FLIGHT)) { + janet_ev_dec_refcount(); + janet_free(f->ev_state); } - break; +#endif + janet_free(f->data); + } + break; case JANET_MEMORY_BUFFER: janet_buffer_deinit((JanetBuffer *) mem); break;