Skip to content

v4.1.x: fbtl/posix: ensure progressing aio requests #8375

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
Jan 19, 2021
Merged

v4.1.x: fbtl/posix: ensure progressing aio requests #8375

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
34 changes: 22 additions & 12 deletions ompi/mca/fbtl/posix/fbtl_posix_ipreadv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
* Copyright (c) 2008-2021 University of Houston. All rights reserved.
* Copyright (c) 2015-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
Expand All @@ -33,6 +33,8 @@
#include "ompi/constants.h"
#include "ompi/mca/fbtl/fbtl.h"

#define MAX_ATTEMPTS 10

ssize_t mca_fbtl_posix_ipreadv (ompio_file_t *fh,
ompi_request_t *request)
{
Expand All @@ -44,7 +46,7 @@ ssize_t mca_fbtl_posix_ipreadv (ompio_file_t *fh,

data = (mca_fbtl_posix_request_data_t *) malloc ( sizeof (mca_fbtl_posix_request_data_t));
if ( NULL == data ) {
opal_output (1,"could not allocate memory\n");
opal_output (1,"mca_fbtl_posix_ipreadv: could not allocate memory\n");
return 0;
}

Expand All @@ -56,14 +58,14 @@ ssize_t mca_fbtl_posix_ipreadv (ompio_file_t *fh,
data->aio_reqs = (struct aiocb *) malloc (sizeof(struct aiocb) *
fh->f_num_of_io_entries);
if (NULL == data->aio_reqs) {
opal_output(1, "OUT OF MEMORY\n");
opal_output(1, "mca_fbtl_posix_ipreadv: could not allocate memory\n");
free(data);
return 0;
}

data->aio_req_status = (int *) malloc (sizeof(int) * fh->f_num_of_io_entries);
if (NULL == data->aio_req_status) {
opal_output(1, "OUT OF MEMORY\n");
opal_output(1, "mca_fbtl_posix_ipreadv: could not allocate memory\n");
free(data->aio_reqs);
free(data);
return 0;
Expand Down Expand Up @@ -103,14 +105,22 @@ ssize_t mca_fbtl_posix_ipreadv (ompio_file_t *fh,
}

for (i=0; i < data->aio_last_active_req; i++) {
if (-1 == aio_read(&data->aio_reqs[i])) {
opal_output(1, "mca_fbtl_posix_ipreadv: error in aio_read(): %s", strerror(errno));
mca_fbtl_posix_unlock ( &data->aio_lock, data->aio_fh );
free(data->aio_reqs);
free(data->aio_req_status);
free(data);
return OMPI_ERROR;
}
int counter=0;
while ( MAX_ATTEMPTS > counter ) {
if ( -1 != aio_read(&data->aio_reqs[i]) ) {
break;
}
counter++;
mca_common_ompio_progress();
}
if ( MAX_ATTEMPTS == counter ) {
opal_output(1, "mca_fbtl_posix_ipreadv: error in aio_read(): errno %d %s", errno, strerror(errno));
mca_fbtl_posix_unlock ( &data->aio_lock, data->aio_fh );
free(data->aio_reqs);
free(data->aio_req_status);
free(data);
return OMPI_ERROR;
}
}

req->req_data = data;
Expand Down
20 changes: 15 additions & 5 deletions ompi/mca/fbtl/posix/fbtl_posix_ipwritev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
* Copyright (c) 2008-2021 University of Houston. All rights reserved.
* Copyright (c) 2015-2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
Expand All @@ -32,6 +32,8 @@
#include "ompi/constants.h"
#include "ompi/mca/fbtl/fbtl.h"

#define MAX_ATTEMPTS 10

ssize_t mca_fbtl_posix_ipwritev (ompio_file_t *fh,
ompi_request_t *request)
{
Expand All @@ -43,7 +45,7 @@ ssize_t mca_fbtl_posix_ipwritev (ompio_file_t *fh,

data = (mca_fbtl_posix_request_data_t *) malloc ( sizeof (mca_fbtl_posix_request_data_t));
if ( NULL == data ) {
opal_output (1,"could not allocate memory\n");
opal_output (1,"mca_fbtl_posix_ipwritev: could not allocate memory\n");
return 0;
}

Expand All @@ -55,14 +57,14 @@ ssize_t mca_fbtl_posix_ipwritev (ompio_file_t *fh,
data->aio_reqs = (struct aiocb *) malloc (sizeof(struct aiocb) *
fh->f_num_of_io_entries);
if (NULL == data->aio_reqs) {
opal_output(1, "OUT OF MEMORY\n");
opal_output (1,"mca_fbtl_posix_ipwritev: could not allocate memory\n");
free(data);
return 0;
}

data->aio_req_status = (int *) malloc (sizeof(int) * fh->f_num_of_io_entries);
if (NULL == data->aio_req_status) {
opal_output(1, "OUT OF MEMORY\n");
opal_output (1,"mca_fbtl_posix_ipwritev: could not allocate memory\n");
free(data->aio_reqs);
free(data);
return 0;
Expand Down Expand Up @@ -102,7 +104,15 @@ ssize_t mca_fbtl_posix_ipwritev (ompio_file_t *fh,
}

for (i=0; i < data->aio_last_active_req; i++) {
if (-1 == aio_write(&data->aio_reqs[i])) {
int counter=0;
while ( MAX_ATTEMPTS > counter ) {
if (-1 != aio_write(&data->aio_reqs[i])) {
break;
}
counter++;
mca_common_ompio_progress();
}
if ( MAX_ATTEMPTS == counter ) {
opal_output(1, "mca_fbtl_posix_ipwritev: error in aio_write(): %s", strerror(errno));
mca_fbtl_posix_unlock ( &data->aio_lock, data->aio_fh );
free(data->aio_req_status);
Expand Down