diff options
| author | Sverker Eriksson <[email protected]> | 2016-04-12 18:54:23 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-04-12 18:54:23 +0200 |
| commit | 0f8f4e96ff8479018e5e921775654adc15f5e771 (patch) | |
| tree | 33554de3cf013e6df61977bb5af4cd409197583f /lib/erl_interface/src/encode/encode_pid.c | |
| parent | 5b31b2196bbb13ba650207f4ef94b2e1fa8f6121 (diff) | |
| parent | e4b8b9be39601b1c79dfd5d8e807ae4c404b6935 (diff) | |
| download | otp-0f8f4e96ff8479018e5e921775654adc15f5e771.tar.gz otp-0f8f4e96ff8479018e5e921775654adc15f5e771.tar.bz2 otp-0f8f4e96ff8479018e5e921775654adc15f5e771.zip | |
Merge branch 'sverk/big-external-creations.OTP-13488'
Diffstat (limited to 'lib/erl_interface/src/encode/encode_pid.c')
| -rw-r--r-- | lib/erl_interface/src/encode/encode_pid.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/erl_interface/src/encode/encode_pid.c b/lib/erl_interface/src/encode/encode_pid.c index 7b01b7045f..3eabbdcc02 100644 --- a/lib/erl_interface/src/encode/encode_pid.c +++ b/lib/erl_interface/src/encode/encode_pid.c @@ -24,7 +24,8 @@ int ei_encode_pid(char *buf, int *index, const erlang_pid *p) { - char *s = buf + *index; + char* s = buf + *index; + const char tag = (p->creation > 3) ? ERL_NEW_PID_EXT : ERL_PID_EXT; ++(*index); /* skip ERL_PID_EXT */ if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node), @@ -32,17 +33,21 @@ int ei_encode_pid(char *buf, int *index, const erlang_pid *p) return -1; if (buf) { - put8(s,ERL_PID_EXT); + put8(s, tag); s = buf + *index; /* now the integers */ put32be(s,p->num & 0x7fff); /* 15 bits */ put32be(s,p->serial & 0x1fff); /* 13 bits */ - put8(s,(p->creation & 0x03)); /* 2 bits */ + if (tag == ERL_PID_EXT) { + put8(s,(p->creation & 0x03)); /* 2 bits */ + } else { + put32be(s, p->creation); /* 32 bits */ + } } - *index += 4 + 4 + 1; + *index += 4 + 4 + (tag == ERL_PID_EXT ? 1 : 4); return 0; } |