diff options
| author | Sverker Eriksson <[email protected]> | 2017-08-24 17:20:21 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-11-15 20:10:33 +0100 |
| commit | d736e87ff94ab8191f33dca55516e6c1d440b915 (patch) | |
| tree | 900fd5ccbfbaae7e24bde62d66e9a43e1bd6b771 /erts/emulator/beam/dist.h | |
| parent | 5857245406584b8bfcbdf0be450ad494a992d5c8 (diff) | |
| download | otp-d736e87ff94ab8191f33dca55516e6c1d440b915.tar.gz otp-d736e87ff94ab8191f33dca55516e6c1d440b915.tar.bz2 otp-d736e87ff94ab8191f33dca55516e6c1d440b915.zip | |
Add optimistic DFLAG_DIST_HOPEFULLY for pending connections
to avoid tuple fallbacks for export funs and bitstrings.
ToDo: Re-encode if receiver turn out to be erl_interface/jinterface.
Diffstat (limited to 'erts/emulator/beam/dist.h')
| -rw-r--r-- | erts/emulator/beam/dist.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h index 505d510473..f9a2037687 100644 --- a/erts/emulator/beam/dist.h +++ b/erts/emulator/beam/dist.h @@ -45,7 +45,7 @@ #define DFLAG_MAP_TAG 0x20000 #define DFLAG_BIG_CREATION 0x40000 #define DFLAG_SEND_SENDER 0x80000 -#define DFLAG_PENDING_CONNECTION 0x100000 +#define DFLAG_NO_MAGIC 0x100000 /* Mandatory flags for distribution (sync with dist_util.erl) */ #define DFLAG_DIST_MANDATORY (DFLAG_EXTENDED_REFERENCES \ @@ -53,6 +53,11 @@ | DFLAG_UTF8_ATOMS \ | DFLAG_NEW_FUN_TAGS) +/* Additional optimistic flags when encoding toward pending connection */ +#define DFLAG_DIST_HOPEFULLY (DFLAG_NO_MAGIC \ + | DFLAG_EXPORT_PTR_TAG \ + | DFLAG_BIT_BINARIES) + /* All flags that should be enabled when term_to_binary/1 is used. */ #define TERM_TO_BINARY_DFLAGS (DFLAG_EXTENDED_REFERENCES \ | DFLAG_NEW_FUN_TAGS \ @@ -206,7 +211,7 @@ retry: Eterm msg, conn_id; dep->status = ERTS_DE_SFLG_PENDING; - dep->flags = DFLAG_DIST_MANDATORY | DFLAG_PENDING_CONNECTION; + dep->flags = (DFLAG_DIST_MANDATORY | DFLAG_DIST_HOPEFULLY); dep->connection_id++; dep->connection_id &= ERTS_DIST_CON_ID_MASK; conn_id = make_small(dep->connection_id); |