diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-11-26 09:41:42 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-11-26 09:41:42 +0100 |
| commit | 2d974c56b23a7544b13f78061850a877316ae938 (patch) | |
| tree | e62a1374f414eae4d25b3386b603c5c3ec902e63 /lib | |
| parent | ac4f18141f4dd56f07b22cfcd2d642a2d449c1d4 (diff) | |
| parent | 6b9369ea8357b8365cea461f3a73e9f9a0d1b56f (diff) | |
| download | otp-2d974c56b23a7544b13f78061850a877316ae938.tar.gz otp-2d974c56b23a7544b13f78061850a877316ae938.tar.bz2 otp-2d974c56b23a7544b13f78061850a877316ae938.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kernel/src/heart.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/kernel/src/heart.erl b/lib/kernel/src/heart.erl index de287bfa43..87cb9d7f51 100644 --- a/lib/kernel/src/heart.erl +++ b/lib/kernel/src/heart.erl @@ -46,6 +46,7 @@ -define(TIMEOUT, 5000). -define(CYCLE_TIMEOUT, 10000). +-define(HEART_PORT_NAME, heart_port). %%--------------------------------------------------------------------- @@ -132,7 +133,7 @@ start_portprogram() -> case wait_ack(Port) of ok -> %% register port so the vm can find it if need be - register(heart_port, Port), + register(?HEART_PORT_NAME, Port), {ok, Port}; {error, Reason} -> report_problem({{port_problem, Reason}, @@ -228,6 +229,7 @@ no_reboot_shutdown(Port) -> end. do_cycle_port_program(Caller, Parent, Port, Cmd) -> + unregister(?HEART_PORT_NAME), case catch start_portprogram() of {ok, NewPort} -> send_shutdown(Port), |