Skip to content

Commit 7dd34d0

Browse files
author
Ralph Castain
committed
Use the correct callback data - the callback function was expecting a bool*, not a pmix_ptl_sr_t*.
Signed-off-by: Ralph Castain <[email protected]>
1 parent d782542 commit 7dd34d0

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

opal/mca/pmix/pmix2x/pmix/src/client/pmix_client.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ PMIX_EXPORT pmix_status_t PMIx_Abort(int flag, const char msg[],
492492
pmix_buffer_t *bfr;
493493
pmix_cmd_t cmd = PMIX_ABORT_CMD;
494494
pmix_status_t rc;
495-
pmix_ptl_sr_t cb;
495+
volatile bool active;
496496

497497
pmix_output_verbose(2, pmix_globals.debug_output,
498498
"pmix:client abort called");
@@ -541,23 +541,15 @@ PMIX_EXPORT pmix_status_t PMIx_Abort(int flag, const char msg[],
541541
}
542542
}
543543

544-
/* create a callback object as we need to pass it to the
545-
* recv routine so we know which callback to use when
546-
* the return message is recvd */
547-
PMIX_CONSTRUCT(&cb, pmix_ptl_sr_t);
548-
cb.active = true;
549-
cb.cbfunc = wait_cbfunc;
550-
551544
/* send to the server */
545+
active = true;
552546
if (PMIX_SUCCESS != (rc = pmix_ptl.send_recv(&pmix_client_globals.myserver, bfr,
553-
wait_cbfunc, &cb))){
554-
PMIX_DESTRUCT(&cb);
547+
wait_cbfunc, (void*)&active))){
555548
return rc;
556549
}
557550

558551
/* wait for the release */
559-
PMIX_WAIT_FOR_COMPLETION(cb.active);
560-
PMIX_DESTRUCT(&cb);
552+
PMIX_WAIT_FOR_COMPLETION(active);
561553
return PMIX_SUCCESS;
562554
}
563555

0 commit comments

Comments
 (0)