1
1
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain 2017-03-24 08:09:46 -07:00
родитель c0bcd11bcf
Коммит 35f817911e
4 изменённых файлов: 16 добавлений и 2 удалений

Просмотреть файл

@ -113,7 +113,7 @@ static void ft_destructor(file_tracker_t *ft)
if (NULL != ft->id) { if (NULL != ft->id) {
free(ft->id); free(ft->id);
} }
if (event_active) { if (ft->event_active) {
pmix_event_del(&ft->ev); pmix_event_del(&ft->ev);
} }
if (NULL != ft->file) { if (NULL != ft->file) {

Просмотреть файл

@ -88,7 +88,7 @@ static void ft_destructor(pmix_heartbeat_trkr_t *ft)
if (NULL != ft->id) { if (NULL != ft->id) {
free(ft->id); free(ft->id);
} }
if (event_active) { if (ft->event_active) {
pmix_event_del(&ft->ev); pmix_event_del(&ft->ev);
} }
if (NULL != ft->info) { if (NULL != ft->info) {

Просмотреть файл

@ -1113,10 +1113,15 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
} }
if (NULL != effective_dir) { if (NULL != effective_dir) {
free(effective_dir); free(effective_dir);
effective_dir = NULL;
} }
} }
GETOUT: GETOUT:
if (NULL != effective_dir) {
free(effective_dir);
effective_dir = NULL;
}
/* tell the state machine that all local procs for this job /* tell the state machine that all local procs for this job
* were launched so that it can do whatever it needs to do, * were launched so that it can do whatever it needs to do,
* like send a state update message for all procs to the HNP * like send a state update message for all procs to the HNP
@ -1124,6 +1129,10 @@ void orte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
ORTE_ACTIVATE_JOB_STATE(jobdat, ORTE_JOB_STATE_LOCAL_LAUNCH_COMPLETE); ORTE_ACTIVATE_JOB_STATE(jobdat, ORTE_JOB_STATE_LOCAL_LAUNCH_COMPLETE);
ERROR_OUT: ERROR_OUT:
if (NULL != effective_dir) {
free(effective_dir);
effective_dir = NULL;
}
/* ensure we reset our working directory back to our default location */ /* ensure we reset our working directory back to our default location */
chdir(basedir); chdir(basedir);
/* release the event */ /* release the event */
@ -1716,6 +1725,9 @@ int orte_odls_base_default_restart_proc(orte_proc_t *child,
/* setup the path */ /* setup the path */
if (ORTE_SUCCESS != (rc = setup_path(app, &wdir))) { if (ORTE_SUCCESS != (rc = setup_path(app, &wdir))) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
if (NULL != wdir) {
free(wdir);
}
goto CLEANUP; goto CLEANUP;
} }

Просмотреть файл

@ -148,9 +148,11 @@ static int get_remaining_time(uint32_t *timeleft)
} }
if (NULL == fgets(output, 256, fp)) { if (NULL == fgets(output, 256, fp)) {
free(cmd); free(cmd);
pclose(fp);
return ORTE_ERR_FILE_READ_FAILURE; return ORTE_ERR_FILE_READ_FAILURE;
} }
free(cmd); free(cmd);
pclose(fp);
/* the output is returned in a colon-delimited set of fields */ /* the output is returned in a colon-delimited set of fields */
res = opal_argv_split(output, ':'); res = opal_argv_split(output, ':');
cnt = opal_argv_count(res); cnt = opal_argv_count(res);