Merge pull request #5286 from edgargabriel/topic/sharedfp-revamp

sharedfp/all components: revamp internal operations

Author: edgargabriel

ompi/mca/common/ompio/common_ompio_file_open.c

@@ -45,10 +45,10 @@ static mca_common_ompio_generate_current_file_view_fn_t generate_current_file_vi
 static mca_common_ompio_get_mca_parameter_value_fn_t get_mca_parameter_value_fn;
 
 int mca_common_ompio_file_open (ompi_communicator_t *comm,
-                              const char *filename,
-                              int amode,
-                              opal_info_t *info,
-                              ompio_file_t *ompio_fh, bool use_sharedfp)
+                                const char *filename,
+                                int amode,
+                                opal_info_t *info,
+                                ompio_file_t *ompio_fh, bool use_sharedfp)
 {
     int ret = OMPI_SUCCESS;
     int remote_arch;
@@ -92,8 +92,6 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
     ompio_fh->f_fstype = NONE;
     ompio_fh->f_amode  = amode;
     ompio_fh->f_info   = info;
-    ompio_fh->f_atomicity = 0;
-    ompio_fh->f_fs_block_size = 4096;
 
     /* set some function pointers required for fcoll, fbtls and sharedfp modules*/
     ompio_fh->f_generate_current_file_view=generate_current_file_view_fn;
@@ -164,20 +162,22 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
 #endif
         goto fn_fail;
     }
-    
-    if (OMPI_SUCCESS != (ret = mca_fcoll_base_file_select (ompio_fh,
-                                                           NULL))) {
-        opal_output(1, "mca_fcoll_base_file_select() failed\n");
-        goto fn_fail;
-    }
 
+    /* Set default file view */
+    mca_common_ompio_set_view(ompio_fh,
+                              0,
+                              &ompi_mpi_byte.dt,
+                              &ompi_mpi_byte.dt,
+                              "native",
+                              info);
+
+    
     if ( true == use_sharedfp ) {
 	/* open the file once more for the shared file pointer if required.           
         ** Can be disabled by the user if no shared file pointer operations
         ** are used by his application.	
         */
-	if ( NULL != ompio_fh->f_sharedfp &&
-	     !OMPIO_MCA_GET(ompio_fh, sharedfp_lazy_open) ) {
+	if ( NULL != ompio_fh->f_sharedfp ) {
 	    ret = ompio_fh->f_sharedfp->sharedfp_file_open(comm,
 							   filename,
 							   amode,
@@ -201,8 +201,7 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
                                           &current_size);
         mca_common_ompio_set_explicit_offset (ompio_fh, current_size);
         if ( true == use_sharedfp ) {
-            if ( NULL != ompio_fh->f_sharedfp &&
-                 !OMPIO_MCA_GET(ompio_fh, sharedfp_lazy_open) ) {                
+            if ( NULL != ompio_fh->f_sharedfp ) {
                 shared_fp_base_module = ompio_fh->f_sharedfp;
                 ret = shared_fp_base_module->sharedfp_seek(ompio_fh,current_size, MPI_SEEK_SET);
                 if ( MPI_SUCCESS != ret  ) {
@@ -346,6 +345,7 @@ int mca_common_ompio_file_close (ompio_file_t *ompio_fh)
 
     if (MPI_DATATYPE_NULL != ompio_fh->f_iov_type) {
         ompi_datatype_destroy (&ompio_fh->f_iov_type);
+        ompio_fh->f_iov_type=MPI_DATATYPE_NULL;
     }
 
     if ( MPI_DATATYPE_NULL != ompio_fh->f_etype ) {
@@ -409,7 +409,8 @@ int mca_common_ompio_set_file_defaults (ompio_file_t *fh)
         fh->f_perm = OMPIO_PERM_NULL;
         fh->f_flags = 0;
         fh->f_bytes_per_agg = OMPIO_MCA_GET(fh, bytes_per_agg);
-        fh->f_datarep = strdup ("native");
+        fh->f_atomicity = 0;
+        fh->f_fs_block_size = 4096;
 
         fh->f_offset = 0;
         fh->f_disp = 0;
@@ -434,17 +435,10 @@ int mca_common_ompio_set_file_defaults (ompio_file_t *fh)
         fh->f_stripe_size = 0;
 	/*Decoded iovec of the file-view*/
 	fh->f_decoded_iov = NULL;
-        fh->f_etype = NULL;
-        fh->f_filetype = NULL;
-        fh->f_orig_filetype = NULL;
-
-	mca_common_ompio_set_view(fh,
-                                  0,
-                                  &ompi_mpi_byte.dt,
-                                  &ompi_mpi_byte.dt,
-                                  "native",
-                                  fh->f_info);
-
+        fh->f_etype = MPI_DATATYPE_NULL;
+        fh->f_filetype = MPI_DATATYPE_NULL;
+        fh->f_orig_filetype = MPI_DATATYPE_NULL;
+        fh->f_datarep = NULL;
 
 	/*Create a derived datatype for the created iovec */
 	types[0] = &ompi_mpi_long.dt;

ompi/mca/common/ompio/common_ompio_file_view.c

@@ -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-2017 University of Houston. All rights reserved.
+ * Copyright (c) 2008-2018 University of Houston. All rights reserved.
  * Copyright (c) 2017-2018 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
@@ -281,6 +281,10 @@ int mca_common_ompio_set_view (ompio_file_t *fh,
         goto exit;
     }
 
+    if ( NULL != fh->f_sharedfp ) {
+        ret = fh->f_sharedfp->sharedfp_seek( fh, 0, MPI_SEEK_SET);
+    }
+
 exit:
     for( i = 0; i < fh->f_size; i++){
        free(contg_groups[i].procs_in_contg_group);

ompi/mca/fs/lustre/fs_lustre_file_open.c

@@ -115,12 +115,10 @@ mca_fs_lustre_file_open (struct ompi_communicator_t *comm,
     errno = 0;
     if (0 == fh->f_rank) {
        /* MODE_CREATE and MODE_EXCL can only be set by one process */
-        if ( !(fh->f_flags & OMPIO_SHAREDFP_IS_SET)) {
-            if ( access_mode & MPI_MODE_CREATE )
-                amode = amode | O_CREAT;
-            if (access_mode & MPI_MODE_EXCL)
-                amode = amode | O_EXCL;
-        }
+        if ( access_mode & MPI_MODE_CREATE )
+            amode = amode | O_CREAT;
+        if (access_mode & MPI_MODE_EXCL)
+            amode = amode | O_EXCL;
 
         if ( (fs_lustre_stripe_size>0 || fs_lustre_stripe_width>0) &&
              ( amode&O_CREAT)                                      && 

ompi/mca/fs/ufs/fs_ufs_file_open.c

@@ -76,12 +76,11 @@ mca_fs_ufs_file_open (struct ompi_communicator_t *comm,
     errno = 0;
     if ( 0 == rank ) {
 	/* MODE_CREATE and MODE_EXCL can only be set by one process */
-        if ( !(fh->f_flags & OMPIO_SHAREDFP_IS_SET)) {
-            if ( access_mode & MPI_MODE_CREATE )
-                amode = amode | O_CREAT;
-            if (access_mode & MPI_MODE_EXCL)
-                amode = amode | O_EXCL;
-        }
+        if ( access_mode & MPI_MODE_CREATE )
+            amode = amode | O_CREAT;
+        if (access_mode & MPI_MODE_EXCL)
+            amode = amode | O_EXCL;
+
 	fh->fd = open (filename, amode, perm);
 	if ( 0 > fh->fd ) {
             if ( EACCES == errno ) {

ompi/mca/io/ompio/io_ompio.c

@@ -10,7 +10,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008-2016 University of Houston. All rights reserved.
+ * Copyright (c) 2008-2018 University of Houston. All rights reserved.
  * Copyright (c) 2011-2015 Cisco Systems, Inc.  All rights reserved.
  * Copyright (c) 2012-2013 Inria.  All rights reserved.
  * Copyright (c) 2015-2018 Research Organization for Information Science
@@ -542,9 +542,6 @@ int mca_io_ompio_get_mca_parameter_value ( char *mca_parameter_name, int name_le
     else if ( !strncmp ( mca_parameter_name, "grouping_option", name_length )) {
         return mca_io_ompio_grouping_option;
     }
-    else if ( !strncmp ( mca_parameter_name, "sharedfp_lazy_open", name_length )) {
-        return mca_io_ompio_sharedfp_lazy_open;
-    }
     else if ( !strncmp ( mca_parameter_name, "coll_timing_info", name_length )) {
         return mca_io_ompio_coll_timing_info;
     }

ompi/mca/io/ompio/io_ompio.h

@@ -48,7 +48,6 @@ extern int mca_io_ompio_cycle_buffer_size;
 extern int mca_io_ompio_bytes_per_agg;
 extern int mca_io_ompio_num_aggregators;
 extern int mca_io_ompio_record_offset_info;
-extern int mca_io_ompio_sharedfp_lazy_open;
 extern int mca_io_ompio_grouping_option;
 extern int mca_io_ompio_max_aggregators_ratio;
 extern int mca_io_ompio_aggregators_cutoff_threshold;

ompi/mca/io/ompio/io_ompio_component.c

@@ -39,7 +39,6 @@ int mca_io_ompio_bytes_per_agg = OMPIO_PREALLOC_MAX_BUF_SIZE;
 int mca_io_ompio_num_aggregators = -1;
 int mca_io_ompio_record_offset_info = 0;
 int mca_io_ompio_coll_timing_info = 0;
-int mca_io_ompio_sharedfp_lazy_open = 0;
 int mca_io_ompio_max_aggregators_ratio=8;
 int mca_io_ompio_aggregators_cutoff_threshold=3;
 int mca_io_ompio_overwrite_amode = 1;
@@ -194,15 +193,6 @@ static int register_component(void)
                                            &mca_io_ompio_num_aggregators);
 
 
-    mca_io_ompio_sharedfp_lazy_open = 0;
-    (void) mca_base_component_var_register(&mca_io_ompio_component.io_version,
-                                           "sharedfp_lazy_open",
-                                           "lazy allocation of internal shared file pointer structures",
-                                           MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
-                                           OPAL_INFO_LVL_9,
-                                           MCA_BASE_VAR_SCOPE_READONLY,
-                                           &mca_io_ompio_sharedfp_lazy_open);
-
     mca_io_ompio_grouping_option = 5;
     (void) mca_base_component_var_register(&mca_io_ompio_component.io_version,
                                            "grouping_option",

ompi/mca/io/ompio/io_ompio_file_set_view.c

@@ -65,7 +65,6 @@ int mca_io_ompio_file_set_view (ompi_file_t *fp,
     int ret=OMPI_SUCCESS;
     mca_common_ompio_data_t *data;
     ompio_file_t *fh;
-    ompio_file_t *sh;
 
     data = (mca_common_ompio_data_t *) fp->f_io_selected_data;
 
@@ -76,12 +75,6 @@ int mca_io_ompio_file_set_view (ompi_file_t *fp,
 
     OPAL_THREAD_LOCK(&fp->f_lock);
     ret = mca_common_ompio_set_view(fh, disp, etype, filetype, datarep, info);
-
-    if ( NULL != fh->f_sharedfp_data) {
-        sh = ((struct mca_sharedfp_base_data_t *)fh->f_sharedfp_data)->sharedfh;
-        ret = mca_common_ompio_set_view(sh, disp, etype, filetype, datarep, info);
-    }
-
     OPAL_THREAD_UNLOCK(&fp->f_lock);
     return ret;
 }

ompi/mca/sharedfp/individual/sharedfp_individual.h

@@ -139,7 +139,7 @@ typedef struct mca_sharedfp_individual_header_record_s{
 
 mca_sharedfp_individual_header_record* mca_sharedfp_individual_insert_headnode(void);
 
-int mca_sharedfp_individual_collaborate_data(struct mca_sharedfp_base_data_t *sh);
+int mca_sharedfp_individual_collaborate_data(struct mca_sharedfp_base_data_t *sh, ompio_file_t *ompio_fh );
 int mca_sharedfp_individual_get_timestamps_and_reclengths(double **buff, long **rec_length, MPI_Offset **offbuff,struct mca_sharedfp_base_data_t *sh);
 int mca_sharedfp_individual_create_buff(double **ts,MPI_Offset **off,int totalnodes,int size);
 int mca_sharedfp_individual_sort_timestamps(double **ts,MPI_Offset **off, int **ranks, int totalnodes);