Skip to content

Commit 9254336

Browse files
committed
plm/rsh: fix parameter handling in rsh_wait_daemon()
since 8f496b0 rsh_wait_daemon is invoked with an orte_wait_tracker_t *, that must be used to reach the orte_plm_rsh_caddy_t *. Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 39d5988 commit 9254336

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

orte/mca/plm/rsh/plm_rsh_module.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,8 @@ static int rsh_init(void)
263263
static void rsh_wait_daemon(int sd, short flags, void *cbdata)
264264
{
265265
orte_job_t *jdata;
266-
orte_plm_rsh_caddy_t *caddy=(orte_plm_rsh_caddy_t*)cbdata;
266+
orte_wait_tracker_t *t2 = (orte_wait_tracker_t*)cbdata;
267+
orte_plm_rsh_caddy_t *caddy=(orte_plm_rsh_caddy_t*)t2->cbdata;
267268
orte_proc_t *daemon = caddy->daemon;
268269
char *rtmod;
269270

@@ -272,6 +273,7 @@ static void rsh_wait_daemon(int sd, short flags, void *cbdata)
272273
* session attached, e.g., while debugging
273274
*/
274275
OBJ_RELEASE(caddy);
276+
OBJ_RELEASE(t2);
275277
return;
276278
}
277279

@@ -325,7 +327,7 @@ static void rsh_wait_daemon(int sd, short flags, void *cbdata)
325327
opal_event_active(&launch_event, EV_WRITE, 1);
326328
}
327329
/* cleanup */
328-
OBJ_RELEASE(caddy);
330+
OBJ_RELEASE(t2);
329331
}
330332

331333
static int setup_launch(int *argcptr, char ***argvptr,

0 commit comments

Comments
 (0)