Skip to content

Commit 3b11a8b

Browse files
edgargabrieledgargabriel
committed
making the current work compile.
1 parent cc21928 commit 3b11a8b

File tree

5 files changed

+48
-28
lines changed

5 files changed

+48
-28
lines changed

‎ompi/mca/fcoll/fcoll.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,14 +144,6 @@ typedef bool (*mca_fcoll_base_module_progress_fn_t)
144144
typedef void (*mca_fcoll_base_module_request_free_fn_t)
145145
( struct mca_fcoll_request_t *request);
146146

147-
148-
typedef bool (*mca_fcoll_base_module_progress_fn_t)
149-
( struct mca_fcoll_request_t *request);
150-
151-
typedef void (*mca_fcoll_base_module_request_free_fn_t)
152-
( struct mca_fcoll_request_t *request);
153-
154-
155147
/*
156148
* ***********************************************************************
157149
* *************************** module structure *************************

‎ompi/mca/io/ompio/io_ompio.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -788,6 +788,18 @@ int mca_io_ompio_file_read_all (struct ompi_file_t *fh,
788788
int count,
789789
struct ompi_datatype_t *datatype,
790790
ompi_status_public_t *status);
791+
int mca_io_ompio_file_iread_all (ompi_file_t *fh,
792+
void *buf,
793+
int count,
794+
struct ompi_datatype_t *datatype,
795+
ompi_request_t **request);
796+
int mca_io_ompio_file_iread_at_all (ompi_file_t *fh,
797+
OMPI_MPI_OFFSET_TYPE offset,
798+
void *buf,
799+
int count,
800+
struct ompi_datatype_t *datatype,
801+
ompi_request_t **request);
802+
791803
int mca_io_ompio_file_write (struct ompi_file_t *fh,
792804
void *buf,
793805
int count,
@@ -798,6 +810,17 @@ int mca_io_ompio_file_write_all (struct ompi_file_t *fh,
798810
int count,
799811
struct ompi_datatype_t *datatype,
800812
ompi_status_public_t *status);
813+
int mca_io_ompio_file_iwrite_all (ompi_file_t *fh,
814+
void *buf,
815+
int count,
816+
struct ompi_datatype_t *datatype,
817+
ompi_request_t **request);
818+
int mca_io_ompio_file_iwrite_at_all (ompi_file_t *fh,
819+
OMPI_MPI_OFFSET_TYPE offset,
820+
void *buf,
821+
int count,
822+
struct ompi_datatype_t *datatype,
823+
ompi_request_t **request);
801824
int mca_io_ompio_file_iread (struct ompi_file_t *fh,
802825
void *buf,
803826
int count,

‎ompi/mca/io/ompio/io_ompio_file_open.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ ompio_io_ompio_file_open (ompi_communicator_t *comm,
122122
ompi_io_ompio_set_file_defaults (ompio_fh);
123123
ompio_fh->f_filename = filename;
124124

125-
ompio_fh->f_split_coll_req = NULL;
126-
ompio_fh->f_split_in_use = false;
125+
ompio_fh->f_split_coll_req = NULL;
126+
ompio_fh->f_split_coll_in_use = false;
127127

128128
/*Initialize the print_queues queues here!*/
129129
coll_write_time = (print_queue *) malloc (sizeof(print_queue));

‎ompi/mca/io/ompio/io_ompio_file_read.c‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -459,12 +459,12 @@ int mca_io_ompio_file_iread_at_all (ompi_file_t *fh,
459459
mca_io_ompio_data_t *data;
460460
mca_io_ompio_file_t *fp=NULL;
461461
OMPI_MPI_OFFSET_TYPE prev_offset;
462-
ompio_io_ompio_file_get_position (fh, &prev_offset );
462+
data = (mca_io_ompio_data_t *) fh->f_io_selected_data;
463+
fp = &data->ompio_fh;
463464

464-
ompi_io_ompio_set_explicit_offset (fh, offset);
465+
ompio_io_ompio_file_get_position (fp, &prev_offset );
466+
ompi_io_ompio_set_explicit_offset (fp, offset);
465467

466-
data = (mca_io_ompio_data_t *) fh->f_io_selected_data;
467-
fp = &data->fh_ompio;
468468
if ( NULL != fp->f_fcoll->fcoll_file_iread_all ) {
469469
ret = fp->f_fcoll->fcoll_file_iread_all (&data->ompio_fh,
470470
buf,
@@ -480,7 +480,7 @@ int mca_io_ompio_file_iread_at_all (ompi_file_t *fh,
480480
}
481481

482482

483-
ompi_io_ompio_set_explicit_offset (fh, prev_offset);
483+
ompi_io_ompio_set_explicit_offset (fp, prev_offset);
484484
return ret;
485485
}
486486

@@ -619,8 +619,10 @@ int mca_io_ompio_file_read_all_begin (ompi_file_t *fh,
619619
{
620620
int ret = OMPI_SUCCESS;
621621
mca_io_ompio_file_t *fp;
622+
mca_io_ompio_data_t *data;
622623

623-
fp = (mca_io_ompio_file_t *) &fh->f_io_selected_data->fh_ompio;
624+
data = (mca_io_ompio_data_t *) fh->f_io_selected_data;
625+
fp = &data->ompio_fh;
624626
if ( true == fp->f_split_coll_in_use ) {
625627
printf("Only one split collective I/O operation allowed per file handle at any given point in time!\n");
626628
return MPI_ERR_OTHER;
@@ -637,9 +639,11 @@ int mca_io_ompio_file_read_all_end (ompi_file_t *fh,
637639
{
638640
int ret = OMPI_SUCCESS;
639641
mca_io_ompio_file_t *fp;
642+
mca_io_ompio_data_t *data;
640643

641-
fp = (mca_io_ompio_file_t *) &fh->f_io_selected_data->fh_ompio;
642-
ret = ompi_mpi_wait ( &fp->f_split_coll_req, status );
644+
data = (mca_io_ompio_data_t *) fh->f_io_selected_data;
645+
fp = &data->ompio_fh;
646+
ret = ompi_request_wait ( &fp->f_split_coll_req, status );
643647

644648
/* remove the flag again */
645649
fp->f_split_coll_in_use = false;
@@ -656,7 +660,7 @@ int mca_io_ompio_file_read_at_all_begin (ompi_file_t *fh,
656660
mca_io_ompio_data_t *data;
657661

658662
data = (mca_io_ompio_data_t *) fh->f_io_selected_data;
659-
ret = ompio_io_ompio_file_read_at_all_begin ( &data->fh_ompio, offset, buf, count, datatype );
663+
ret = ompio_io_ompio_file_read_at_all_begin ( &data->ompio_fh, offset, buf, count, datatype );
660664
return ret;
661665
}
662666

@@ -672,7 +676,7 @@ int ompio_io_ompio_file_read_at_all_begin (mca_io_ompio_file_t *fh,
672676
printf("Only one split collective I/O operation allowed per file handle at any given point in time!\n");
673677
return MPI_ERR_REQUEST;
674678
}
675-
ret = mca_io_ompio_file_iread_at_all ( fh, offset, buf, count, datatype, &fh->f_split_coll_req );
679+
ret = mca_io_ompio_file_iread_at_all ( fh->f_fh, offset, buf, count, datatype, &fh->f_split_coll_req );
676680
fh->f_split_coll_in_use = true;
677681
return ret;
678682
}
@@ -685,7 +689,7 @@ int mca_io_ompio_file_read_at_all_end (ompi_file_t *fh,
685689
mca_io_ompio_data_t *data;
686690

687691
data = (mca_io_ompio_data_t *) fh->f_io_selected_data;
688-
ret = ompio_io_ompio_file_read_at_all_end ( &data->fh_ompio, but, status );
692+
ret = ompio_io_ompio_file_read_at_all_end ( &data->ompio_fh, buf, status );
689693
return ret;
690694
}
691695

@@ -694,9 +698,9 @@ int ompio_io_ompio_file_read_at_all_end (mca_io_ompio_file_t *ompio_fh,
694698
ompi_status_public_t * status)
695699
{
696700
int ret = OMPI_SUCCESS;
697-
ret = ompi_mpi_wait ( &ompio_fh->f_split_coll_req, status );
701+
ret = ompi_request_wait ( &ompio_fh->f_split_coll_req, status );
698702

699703
/* remove the flag again */
700-
fp->f_split_coll_in_use = false;
704+
ompio_fh->f_split_coll_in_use = false;
701705
return ret;
702706
}

‎ompi/mca/io/ompio/io_ompio_file_write.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -570,12 +570,13 @@ int mca_io_ompio_file_iwrite_at_all (ompi_file_t *fh,
570570
mca_io_ompio_data_t *data;
571571
mca_io_ompio_file_t *fp=NULL;
572572
OMPI_MPI_OFFSET_TYPE prev_offset;
573-
ompio_io_ompio_file_get_position (fh, &prev_offset );
574-
575-
ompi_io_ompio_set_explicit_offset (fh, offset);
576573

577574
data = (mca_io_ompio_data_t *) fh->f_io_selected_data;
578-
fp = &data->fh_ompio;
575+
fp = &data->ompio_fh;
576+
ompio_io_ompio_file_get_position (fp, &prev_offset );
577+
578+
ompi_io_ompio_set_explicit_offset (fp, offset);
579+
579580
if ( NULL != fp->f_fcoll->fcoll_file_iwrite_all ) {
580581
ret = fp->f_fcoll->fcoll_file_iwrite_all (&data->ompio_fh,
581582
buf,
@@ -591,7 +592,7 @@ int mca_io_ompio_file_iwrite_at_all (ompi_file_t *fh,
591592
}
592593

593594

594-
ompi_io_ompio_set_explicit_offset (fh, prev_offset);
595+
ompi_io_ompio_set_explicit_offset (fp, prev_offset);
595596
return ret;
596597
}
597598

0 commit comments

Comments
 (0)