mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-28 11:09:54 +00:00
Code Issues 1 Releases Wiki Activity

Add marshal/unmarshal to items pushed to threaded channel.

Browse Source
This commit is contained in:
Calvin Rose 2021-08-15 16:12:40 -05:00
parent 894a3b2fe2
commit 81b5904188
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/ev.c
View File

@ -579,8 +579,16 @@ static inline int janet_chan_is_threaded(JanetChannel *chan) {
static int janet_chan_pack(JanetChannel *chan, Janet *x) { static int janet_chan_pack(JanetChannel *chan, Janet *x) {
if (chan->ref_count < 0) return 0; if (chan->ref_count < 0) return 0;
switch (janet_type(*x)) { switch (janet_type(*x)) {
default: default: {
return 1; JanetBuffer *buf = janet_malloc(sizeof(JanetBuffer));
if (NULL == buf) {
JANET_OUT_OF_MEMORY;
}
janet_buffer_init(buf, 10);
janet_marshal(buf, *x, NULL, JANET_MARSHAL_UNSAFE);
*x = janet_wrap_buffer(buf);
return 0;
}
case JANET_NIL: case JANET_NIL:
case JANET_NUMBER: case JANET_NUMBER:
case JANET_POINTER: case JANET_POINTER:
@ -595,6 +603,13 @@ static int janet_chan_unpack(JanetChannel *chan, Janet *x) {
switch (janet_type(*x)) { switch (janet_type(*x)) {
default: default:
return 1; return 1;
case JANET_BUFFER: {
JanetBuffer *buf = janet_unwrap_buffer(*x);
*x = janet_unmarshal(buf->data, buf->count, JANET_MARSHAL_UNSAFE, NULL, NULL);
janet_buffer_deinit(buf);
janet_free(buf);
return 0;
}
case JANET_NIL: case JANET_NIL:
case JANET_NUMBER: case JANET_NUMBER:
case JANET_POINTER: case JANET_POINTER:
@ -1812,7 +1827,7 @@ void janet_ev_post_event(JanetVM *vm, JanetCallback cb, JanetEVGenericMessage ms
sleep(0); sleep(0);
tries--; tries--;
} }
//janet_assert(tries > 0, "failed to write event to self-pipe"); janet_assert(tries > 0, "failed to write event to self-pipe");
#endif #endif
} }