diff options
| author | Sverker Eriksson <[email protected]> | 2015-04-08 17:49:12 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2015-04-08 17:49:12 +0200 |
| commit | d6ce7b7c14be17c2184878b0bae3f2715bb45358 (patch) | |
| tree | 8ef93e0fef28ed9449838f616617e9014736ee28 /erts/emulator/beam/dist.c | |
| parent | fca1348be883e25fcdeca0e9879036b6cd87ac23 (diff) | |
| parent | 8f7246a7c02a50561c171f3d91170a2af96eddbf (diff) | |
| download | otp-d6ce7b7c14be17c2184878b0bae3f2715bb45358.tar.gz otp-d6ce7b7c14be17c2184878b0bae3f2715bb45358.tar.bz2 otp-d6ce7b7c14be17c2184878b0bae3f2715bb45358.zip | |
Merge branch 'sverk/refactor-encode-size/OTP-12585'
* sverk/refactor-encode-size/OTP-12585:
erts: Optimize insert and delete for big maps
erts: Optimize == and /= for unequal big maps
erts: Refactor encode_size_struct_int
Conflicts:
erts/emulator/beam/erl_map.c
Diffstat (limited to 'erts/emulator/beam/dist.c')
| -rw-r--r-- | erts/emulator/beam/dist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index bfecac1612..32f3cda4f5 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -712,7 +712,7 @@ void erts_dsend_context_dtor(Binary* ctx_bin) ErtsSendContext* ctx = ERTS_MAGIC_BIN_DATA(ctx_bin); switch (ctx->dss.phase) { case ERTS_DSIG_SEND_PHASE_MSG_SIZE: - DESTROY_SAVED_ESTACK(&ctx->dss.u.sc.estack); + DESTROY_SAVED_WSTACK(&ctx->dss.u.sc.wstack); break; case ERTS_DSIG_SEND_PHASE_MSG_ENCODE: DESTROY_SAVED_WSTACK(&ctx->dss.u.ec.wstack); @@ -1800,7 +1800,7 @@ erts_dsig_send(ErtsDSigData *dsdp, struct erts_dsig_send_context* ctx) erts_encode_dist_ext_size(ctx->ctl, ctx->flags, ctx->acmp, &ctx->data_size); if (is_value(ctx->msg)) { - ctx->u.sc.estack.start = NULL; + ctx->u.sc.wstack.wstart = NULL; ctx->u.sc.flags = ctx->flags; ctx->u.sc.level = 0; ctx->phase = ERTS_DSIG_SEND_PHASE_MSG_SIZE; |