diff options
| author | Micael Karlberg <[email protected]> | 2011-03-07 13:23:00 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-07 13:23:00 +0100 |
| commit | 0674fe5dfde78dd611ee17d97541c4f02fddf774 (patch) | |
| tree | ef23074d46e14a2af8b983315986d97226aca419 /lib/erl_interface/src/legacy/global_register.c | |
| parent | d9ca1a4e66bed40b4bf4ed7b9e734192d6f6d00a (diff) | |
| parent | 29a6063aadd2b3b81442a711ee262ff347ca88fc (diff) | |
| download | otp-0674fe5dfde78dd611ee17d97541c4f02fddf774.tar.gz otp-0674fe5dfde78dd611ee17d97541c4f02fddf774.tar.bz2 otp-0674fe5dfde78dd611ee17d97541c4f02fddf774.zip | |
Merge branch 'dev' into bmk/snmp/snmpc/OTP-9004
Diffstat (limited to 'lib/erl_interface/src/legacy/global_register.c')
| -rw-r--r-- | lib/erl_interface/src/legacy/global_register.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/erl_interface/src/legacy/global_register.c b/lib/erl_interface/src/legacy/global_register.c index 3a4de8b08e..f12eb6b448 100644 --- a/lib/erl_interface/src/legacy/global_register.c +++ b/lib/erl_interface/src/legacy/global_register.c @@ -31,7 +31,7 @@ int erl_global_register(int fd, const char *name, ETERM *pid) int index = 0; erlang_pid self; erlang_msg msg; - int needlink, needatom; + int needlink, needatom, needmonitor; int arity; int version; int msglen; @@ -65,7 +65,7 @@ int erl_global_register(int fd, const char *name, ETERM *pid) if (ei_send_reg_encoded(fd,&self,"rex",buf,index)) return -1; /* get the reply: expect link and an atom, or just an atom */ - needlink = needatom = 1; + needlink = needatom = needmonitor = 1; while (1) { /* get message */ while (1) { @@ -78,9 +78,15 @@ int erl_global_register(int fd, const char *name, ETERM *pid) case ERL_LINK: /* got link */ if (!needlink) return -1; - needlink = 0; + needlink = 0; break; + case ERL_MONITOR_P-10: + /* got monitor */ + if (!needmonitor) { return -1;} + needmonitor = 0; + break; + case ERL_SEND: /* got message - does it contain our atom? */ if (!needatom) return -1; |