diff options
| author | Rickard Green <[email protected]> | 2017-01-24 17:29:18 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2017-02-06 19:54:49 +0100 |
| commit | 13f02f2bb6e1e3ce709abc9ff846b24331ada58d (patch) | |
| tree | edd4163abb26ff5852c4ac08929fb2728ae0520f /erts | |
| parent | 40d55ced08579e9fc0ade28ba0810bf800690394 (diff) | |
| download | otp-13f02f2bb6e1e3ce709abc9ff846b24331ada58d.tar.gz otp-13f02f2bb6e1e3ce709abc9ff846b24331ada58d.tar.bz2 otp-13f02f2bb6e1e3ce709abc9ff846b24331ada58d.zip | |
Use magic refs for distributed send trap context
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/bif.c | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/dist.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index bda7b9224c..2190c47262 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -2446,7 +2446,7 @@ BIF_RETTYPE send_2(BIF_ALIST_2) static BIF_RETTYPE dsend_continue_trap_1(BIF_ALIST_1) { - Binary* bin = ((ProcBin*) binary_val(BIF_ARG_1))->val; + Binary* bin = erts_magic_ref2bin(BIF_ARG_1); ErtsSendContext* ctx = (ErtsSendContext*) ERTS_MAGIC_BIN_DATA(bin); Sint initial_reds = (Sint) (ERTS_BIF_REDS_LEFT(BIF_P) * TERM_TO_BINARY_LOOP_FACTOR); int result; diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index 89d91065c2..390f2a0db3 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -741,7 +741,7 @@ Eterm erts_dsend_export_trap_context(Process* p, ErtsSendContext* ctx) Binary* ctx_bin = erts_create_magic_binary(sizeof(struct exported_ctx), erts_dsend_context_dtor); struct exported_ctx* dst = ERTS_MAGIC_BIN_DATA(ctx_bin); - Eterm* hp = HAlloc(p, PROC_BIN_SIZE); + Eterm* hp = HAlloc(p, ERTS_MAGIC_REF_THING_SIZE); sys_memcpy(&dst->ctx, ctx, sizeof(ErtsSendContext)); ASSERT(ctx->dss.ctl == make_tuple(ctx->ctl_heap)); @@ -750,7 +750,7 @@ Eterm erts_dsend_export_trap_context(Process* p, ErtsSendContext* ctx) sys_memcpy(&dst->acm, ctx->dss.acmp, sizeof(ErtsAtomCacheMap)); dst->ctx.dss.acmp = &dst->acm; } - return erts_mk_magic_binary_term(&hp, &MSO(p), ctx_bin); + return erts_mk_magic_ref(&hp, &MSO(p), ctx_bin); } |