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

Marshal alive fibers in func envs as detached.

Browse Source 
This will help with marshaling fibers.
This commit is contained in:
Calvin Rose 2020-03-17 20:53:11 -05:00
parent 6554cc4a8d
commit de4f8f9aaf
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core/marsh.c
View File

@ -184,16 +184,24 @@ static void marshal_one_env(MarshalState *st, JanetFuncEnv *env, int flags) {
} }
} }
janet_v_push(st->seen_envs, env); janet_v_push(st->seen_envs, env);
janet_env_maybe_detach(env); if (env->offset && (JANET_STATUS_ALIVE == janet_fiber_status(env->as.fiber))) {
pushint(st, env->offset); pushint(st, 0);
pushint(st, env->length); pushint(st, env->length);
if (env->offset) { Janet *values = env->as.fiber->data + env->offset;
/* On stack variant */
marshal_one(st, janet_wrap_fiber(env->as.fiber), flags + 1);
} else {
/* Off stack variant */
for (int32_t i = 0; i < env->length; i++) for (int32_t i = 0; i < env->length; i++)
marshal_one(st, env->as.values[i], flags + 1); marshal_one(st, values[i], flags + 1);
} else {
janet_env_maybe_detach(env);
pushint(st, env->offset);
pushint(st, env->length);
if (env->offset) {
/* On stack variant */
marshal_one(st, janet_wrap_fiber(env->as.fiber), flags + 1);
} else {
/* Off stack variant */
for (int32_t i = 0; i < env->length; i++)
marshal_one(st, env->as.values[i], flags + 1);
}
} }
} }