The first one exports eio_new_initial_obj to the plugins. The second one initialize kvs_seq on mpi/pmi2 setup to support launching multiple steps in one process.
From ab26e8db049afb1b205c3a2420185717581ab7dd Mon Sep 17 00:00:00 2001 From: Hongjia Cao <[email protected]> Date: Thu, 11 Dec 2014 12:51:43 +0800 Subject: [PATCH] export eio_new_initial_obj (missed in commit 87e968065)
--- src/common/eio.c | 1 + src/common/slurm_xlator.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/common/eio.c b/src/common/eio.c index 071f8fa..2113b49 100644 --- a/src/common/eio.c +++ b/src/common/eio.c @@ -64,6 +64,7 @@ strong_alias(eio_handle_mainloop, slurm_eio_handle_mainloop); strong_alias(eio_message_socket_readable, slurm_eio_message_socket_readable); strong_alias(eio_message_socket_accept, slurm_eio_message_socket_accept); strong_alias(eio_new_obj, slurm_eio_new_obj); +strong_alias(eio_new_initial_obj, slurm_eio_new_initial_obj); strong_alias(eio_obj_create, slurm_eio_obj_create); strong_alias(eio_obj_destroy, slurm_eio_obj_destroy); strong_alias(eio_remove_obj, slurm_eio_remove_obj); diff --git a/src/common/slurm_xlator.h b/src/common/slurm_xlator.h index 8a837e2..45c33d3 100644 --- a/src/common/slurm_xlator.h +++ b/src/common/slurm_xlator.h @@ -399,6 +399,7 @@ #define eio_message_socket_accept slurm_eio_message_socket_accept #define eio_message_socket_readable slurm_eio_message_socket_readable #define eio_new_obj slurm_eio_new_obj +#define eio_new_initial_obj slurm_eio_new_initial_obj #define eio_obj_create slurm_eio_obj_create #define eio_obj_destroy slurm_eio_obj_destroy #define eio_remove_obj slurm_eio_remove_obj -- 2.1.3
From 9543ad8e6aab092e1bcf8f2276152a9e6ccaee9f Mon Sep 17 00:00:00 2001 From: Hongjia Cao <[email protected]> Date: Thu, 11 Dec 2014 12:55:36 +0800 Subject: [PATCH] init kvs_seq in mpi/pmi2 --- src/plugins/mpi/pmi2/setup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/mpi/pmi2/setup.c b/src/plugins/mpi/pmi2/setup.c index 268569a..30153ea 100644 --- a/src/plugins/mpi/pmi2/setup.c +++ b/src/plugins/mpi/pmi2/setup.c @@ -305,6 +305,7 @@ _setup_stepd_kvs(const stepd_step_rec_t *job, char ***env) int rc = SLURM_SUCCESS, i = 0, pp_cnt = 0; char *p, env_key[32], *ppkey, *ppval; + kvs_seq = 1; rc = temp_kvs_init(); if (rc != SLURM_SUCCESS) return rc; @@ -643,6 +644,7 @@ _setup_srun_kvs(const mpi_plugin_client_info_t *job) { int rc; + kvs_seq = 1; rc = temp_kvs_init(); return rc; } -- 2.1.3
