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.

Sign up for GitHub

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

Cleanup a few places in group support #2066

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Cleanup a few places in group support #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/mca/grpcomm/direct/grpcomm_direct_group.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,12 @@ void prte_grpcomm_direct_grp_recv(int status, pmix_proc_t *sender,
"%s grpcomm:direct grp_construct recvd from %s",
PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(sender)));

// empty buffer indicates lost connection
if (NULL == buffer || NULL == buffer->unpack_ptr) {
PMIX_ERROR_LOG(PMIX_ERR_EMPTY);
return;
}

/* unpack the signature */
rc = unpack_signature(buffer, &sig);
if (PRTE_SUCCESS != rc) {
Expand Down
2 changes: 1 addition & 1 deletion src/prted/pmix/pmix_server_group.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static void local_complete(int sd, short args, void *cbdata)
// check if they gave us any grp or endpt info
if (PMIX_CHECK_KEY(&cd->directives[n], PMIX_PROC_DATA) ||
PMIX_CHECK_KEY(&cd->directives[n], PMIX_GROUP_INFO)) {
rc = PMIx_Info_list_add_value(ilist, cd->directives[n].key, &cd->info[n].value);
rc = PMIx_Info_list_add_value(ilist, cd->directives[n].key, &cd->directives[n].value);
if (PMIX_SUCCESS != rc) {
PMIX_ERROR_LOG(rc);
}
Expand Down
3 changes: 2 additions & 1 deletion src/rml/rml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,8 +227,9 @@ static void recv_cons(prte_rml_recv_t *ptr)
}
static void recv_des(prte_rml_recv_t *ptr)
{
if (ptr->dbuf != NULL)
if (ptr->dbuf != NULL && 0 < ptr->dbuf->bytes_allocated) {
PMIX_DATA_BUFFER_RELEASE(ptr->dbuf);
}
}
PMIX_CLASS_INSTANCE(prte_rml_recv_t, pmix_list_item_t, recv_cons, recv_des);

Expand Down
Loading