Skip to content

Topic/fcoll fixes #779

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 3 commits into from
Aug 7, 2015
Merged

Topic/fcoll fixes #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d1780f
sharedfp: set f_fh when opening a shared file
ggouaillardet Aug 5, 2015
02a4eb2
add the ompi_file_t pointer correctly on the ompio file handle for th…
edgargabriel Aug 5, 2015
16d4171
the individual component should call internal ompio functions directl…
edgargabriel Aug 5, 2015
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
5 changes: 2 additions & 3 deletions ompi/mca/fcoll/individual/fcoll_individual_file_read_all.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-2011 University of Houston. All rights reserved.
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -38,6 +38,5 @@ mca_fcoll_individual_file_read_all (mca_io_ompio_file_t *fh,
struct ompi_datatype_t *datatype,
ompi_status_public_t *status)
{
return fh->f_fh->f_io_selected_module.v2_0_0.
io_module_file_read( fh->f_fh, buf, count, datatype, status);
return ompio_io_ompio_file_read( fh, buf, count, datatype, status);
}
5 changes: 2 additions & 3 deletions ompi/mca/fcoll/individual/fcoll_individual_file_write_all.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-2011 University of Houston. All rights reserved.
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand All @@ -35,6 +35,5 @@ int mca_fcoll_individual_file_write_all (mca_io_ompio_file_t *fh,
struct ompi_datatype_t *datatype,
ompi_status_public_t *status)
{
return fh->f_fh->f_io_selected_module.v2_0_0.
io_module_file_write (fh->f_fh, buf, count, datatype, status);
return ompio_io_ompio_file_write (fh, buf, count, datatype, status);
}
1 change: 1 addition & 0 deletions ompi/mca/sharedfp/individual/sharedfp_individual_file_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ int mca_sharedfp_individual_file_open (struct ompi_communicator_t *comm,
opal_output(0, "mca_sharedfp_individual_file_open: Error during file open\n");
return err;
}
shfileHandle->f_fh = fh->f_fh;

sh = (struct mca_sharedfp_base_data_t*) malloc ( sizeof(struct mca_sharedfp_base_data_t));
if ( NULL == sh ){
Expand Down
3 changes: 3 additions & 0 deletions ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_file_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2013 University of Houston. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -53,6 +55,7 @@ int mca_sharedfp_lockedfile_file_open (struct ompi_communicator_t *comm,
opal_output(0, "mca_sharedfp_lockedfile_file_open: Error during file open\n");
return err;
}
shfileHandle->f_fh = fh->f_fh;

/*Memory is allocated here for the sh structure*/
sh = (struct mca_sharedfp_base_data_t*)malloc(sizeof(struct mca_sharedfp_base_data_t));
Expand Down
1 change: 1 addition & 0 deletions ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ int mca_sharedfp_sm_file_open (struct ompi_communicator_t *comm,
opal_output(0, "mca_sharedfp_sm_file_open: Error during file open\n");
return err;
}
shfileHandle->f_fh = fh->f_fh;

/*Memory is allocated here for the sh structure*/
if ( mca_sharedfp_sm_verbose ) {
Expand Down