diff --git a/src/pm/hydra/libhydra/bstrap/src/hydra_bstrap_proxy.c b/src/pm/hydra/libhydra/bstrap/src/hydra_bstrap_proxy.c index 46f24073979..29af1968a1b 100644 --- a/src/pm/hydra/libhydra/bstrap/src/hydra_bstrap_proxy.c +++ b/src/pm/hydra/libhydra/bstrap/src/hydra_bstrap_proxy.c @@ -332,6 +332,8 @@ int main(int argc, char **argv) char dbg_prefix[2 * HYD_MAX_HOSTNAME_LEN]; HYD_status status = HYD_SUCCESS; + HYD_sock_init(); + status = HYD_print_set_prefix_str("bstrap:unset"); HYD_ERR_POP(status, "unable to set dbg prefix\n"); @@ -369,6 +371,8 @@ int main(int argc, char **argv) HYD_ERR_POP(status, "error sending proxy ID upstream\n"); } + HYD_sock_finalize(); + fn_exit: return status; diff --git a/src/pm/hydra/libhydra/sock/hydra_sock.c b/src/pm/hydra/libhydra/sock/hydra_sock.c index 2cf664c6bee..e6fea70a3d6 100644 --- a/src/pm/hydra/libhydra/sock/hydra_sock.c +++ b/src/pm/hydra/libhydra/sock/hydra_sock.c @@ -7,6 +7,16 @@ #include "hydra_sock.h" #include "hydra_err.h" +HYD_status HYD_sock_init() +{ + return HYD_SUCCESS; +} + +void HYD_sock_finalize() +{ + return; +} + HYD_status HYD_sock_listen_on_port(int *listen_fd, uint16_t port) { struct sockaddr_in sa; diff --git a/src/pm/hydra/libhydra/sock/hydra_sock.h b/src/pm/hydra/libhydra/sock/hydra_sock.h index 4beb3128844..97861fdff58 100644 --- a/src/pm/hydra/libhydra/sock/hydra_sock.h +++ b/src/pm/hydra/libhydra/sock/hydra_sock.h @@ -14,6 +14,8 @@ enum HYD_sock_comm_flag { HYD_SOCK_COMM_TYPE__BLOCKING = 1 }; +HYD_status HYD_sock_init(); +void HYD_sock_finalize(); HYD_status HYD_sock_listen_on_port(int *listen_fd, uint16_t port); HYD_status HYD_sock_listen_on_any_port(int *listen_fd, uint16_t * port); HYD_status HYD_sock_listen_on_port_range(int *listen_fd, const char *port_range, uint16_t * port); diff --git a/src/pm/hydra/mpiexec/mpiexec.c b/src/pm/hydra/mpiexec/mpiexec.c index 9611a6be55d..3105136bfa2 100644 --- a/src/pm/hydra/mpiexec/mpiexec.c +++ b/src/pm/hydra/mpiexec/mpiexec.c @@ -740,6 +740,8 @@ int main(int argc, char **argv) HYD_FUNC_ENTER(); + HYD_sock_init(); + status = HYD_print_set_prefix_str("mpiexec"); HYD_ERR_POP(status, "unable to set dbg prefix\n"); @@ -1087,6 +1089,8 @@ int main(int argc, char **argv) if (mpiexec_params.errfile_pattern) MPL_free(mpiexec_params.errfile_pattern); + HYD_sock_finalize(); + fn_exit: HYD_FUNC_EXIT(); if (status != HYD_SUCCESS) diff --git a/src/pm/hydra/nameserver/hydra_nameserver.c b/src/pm/hydra/nameserver/hydra_nameserver.c index 0e759057885..e62873a371f 100644 --- a/src/pm/hydra/nameserver/hydra_nameserver.c +++ b/src/pm/hydra/nameserver/hydra_nameserver.c @@ -277,6 +277,8 @@ int main(int argc, char **argv) int listen_fd; HYD_status status = HYD_SUCCESS; + HYD_sock_init(); + status = HYD_print_set_prefix_str("nameserver"); HYD_ERR_POP(status, "unable to initialize debugging\n"); @@ -314,6 +316,8 @@ int main(int argc, char **argv) HYD_ERR_POP(status, "demux engine error waiting for event\n"); } + HYD_sock_finalize(); + fn_exit: return status; diff --git a/src/pm/hydra/proxy/proxy.c b/src/pm/hydra/proxy/proxy.c index cb0d847c919..94d41a57e77 100644 --- a/src/pm/hydra/proxy/proxy.c +++ b/src/pm/hydra/proxy/proxy.c @@ -588,6 +588,8 @@ int main(int argc, char **argv) HYD_status status = HYD_SUCCESS; int *nodemap, i, local_rank, tmp_ret; + HYD_sock_init(); + status = HYD_print_set_prefix_str("proxy:unset"); HYD_ERR_POP(status, "unable to set dbg prefix\n"); @@ -855,6 +857,8 @@ int main(int argc, char **argv) if (proxy_params.all.pmi_process_mapping) MPL_free(proxy_params.all.pmi_process_mapping); + HYD_sock_finalize(); + fn_exit: return status;