Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Current WIP on Hydra #5

Open
wants to merge 18 commits into
base: wip/pmi
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/pm/hydra/common/mpx.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ enum MPX_cmd_type {
MPX_CMD_TYPE__KVCACHE_OUT,
MPX_CMD_TYPE__PMI_PROCESS_MAPPING,
MPX_CMD_TYPE__SIGNAL,
MPX_CMD_TYPE__SPAWN_OUT,

/* downstream to upstream */
MPX_CMD_TYPE__PMI_BARRIER_IN,
Expand All @@ -33,6 +34,7 @@ enum MPX_cmd_type {
MPX_CMD_TYPE__KVCACHE_IN,
MPX_CMD_TYPE__PID,
MPX_CMD_TYPE__EXITCODE,
MPX_CMD_TYPE__PMI_SPAWN,
};

struct MPX_cmd {
Expand Down Expand Up @@ -78,6 +80,10 @@ struct MPX_cmd {
int proxy_id;
int pgid;
} exitcodes;

struct {
int status;
} spawn_result;
} u;
};

Expand Down
2 changes: 1 addition & 1 deletion src/pm/hydra/libhydra/bstrap/slurm/slurm_launch.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ HYD_status HYDI_bstrap_slurm_launch(const char *hostname, const char *launch_exe
}


status = HYD_spawn(targs, NULL, fd_stdin, fd_stdout, fd_stderr, pid, -1);
status = HYD_spawn(targs, 0, NULL, fd_stdin, fd_stdout, fd_stderr, pid, -1);
HYD_ERR_POP(status, "create process returned error\n");

fn_exit:
Expand Down
2 changes: 2 additions & 0 deletions src/pm/hydra/libhydra/spawn/hydra_spawn.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ HYD_status HYD_spawn(char **client_arg, int envcount, char *const *const env, in
int inpipe[2], outpipe[2], errpipe[2], tpid, i;
char *str;
HYD_status status = HYD_SUCCESS;
int j = 0;

HYD_FUNC_ENTER();

Expand Down Expand Up @@ -67,6 +68,7 @@ HYD_status HYD_spawn(char **client_arg, int envcount, char *const *const env, in
HYD_ERR_POP(status, "bind process failed\n");
}

/*HYD_PRINT(stdout, "%s with args", client_arg[0]);*/
if (execvp(client_arg[0], client_arg) < 0) {
/* The child process should never get back to the proxy
* code; if there is an error, just throw it here and
Expand Down
Loading