Skip to content

v3.1.x: Be conservative with the array_of_indices #5733

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

Merged
merged 1 commit into from
Sep 19, 2018
Merged

v3.1.x: Be conservative with the array_of_indices #5733

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
20 changes: 12 additions & 8 deletions ompi/request/req_wait.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2016 The University of Tennessee and The University
* Copyright (c) 2004-2018 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
Expand Down Expand Up @@ -378,13 +378,13 @@ int ompi_request_default_wait_some(size_t count,
int * indices,
ompi_status_public_t * statuses)
{
size_t num_requests_null_inactive=0, num_requests_done=0;
size_t num_requests_null_inactive, num_requests_done, num_active_reqs;
int rc = MPI_SUCCESS;
ompi_request_t **rptr = NULL;
ompi_request_t *request = NULL;
ompi_wait_sync_t sync;
size_t sync_sets = 0, sync_unsets = 0;

if (OPAL_UNLIKELY(0 == count)) {
*outcount = MPI_UNDEFINED;
return OMPI_SUCCESS;
Expand All @@ -397,6 +397,7 @@ int ompi_request_default_wait_some(size_t count,
rptr = requests;
num_requests_null_inactive = 0;
num_requests_done = 0;
num_active_reqs = 0;
for (size_t i = 0; i < count; i++, rptr++) {
request = *rptr;
/*
Expand All @@ -407,14 +408,14 @@ int ompi_request_default_wait_some(size_t count,
num_requests_null_inactive++;
continue;
}
indices[i] = OPAL_ATOMIC_CMPSET_PTR(&request->req_complete, REQUEST_PENDING, &sync);
if( !indices[i] ) {
indices[num_active_reqs] = OPAL_ATOMIC_CMPSET_PTR(&request->req_complete, REQUEST_PENDING, &sync);
if( !indices[num_active_reqs] ) {
/* If the request is completed go ahead and mark it as such */
assert( REQUEST_COMPLETE(request) );
num_requests_done++;
}
num_active_reqs++;
}
sync_sets = count - num_requests_null_inactive - num_requests_done;

if(num_requests_null_inactive == count) {
*outcount = MPI_UNDEFINED;
Expand All @@ -423,6 +424,7 @@ int ompi_request_default_wait_some(size_t count,
return rc;
}

sync_sets = num_active_reqs - num_requests_done;
if( 0 == num_requests_done ) {
/* One completed request is enough to satisfy the some condition */
SYNC_WAIT(&sync);
Expand All @@ -433,6 +435,7 @@ int ompi_request_default_wait_some(size_t count,

rptr = requests;
num_requests_done = 0;
num_active_reqs = 0;
for (size_t i = 0; i < count; i++, rptr++) {
request = *rptr;

Expand All @@ -452,13 +455,14 @@ int ompi_request_default_wait_some(size_t count,
* either slowly (in case of partial completion)
* OR in parallel with `i` (in case of full set completion)
*/
if( !indices[i] ){
if( !indices[num_active_reqs] ) {
indices[num_requests_done++] = i;
} else if( !OPAL_ATOMIC_CMPSET_PTR(&request->req_complete, &sync, REQUEST_PENDING) ) {
indices[num_requests_done++] = i;
}
num_active_reqs++;
}
sync_unsets = count - num_requests_null_inactive - num_requests_done;
sync_unsets = num_active_reqs - num_requests_done;

if( sync_sets == sync_unsets ){
/* nobody knows about us,
Expand Down