Merge pull request #1929 from edgargabriel/pr/ompio-code-reorg

io/ompio: next step in code-reorganization

Author: edgargabriel

ompi/mca/common/ompio/Makefile.am

@@ -18,13 +18,16 @@
 # $HEADER$
 #
 
+if OMPI_PROVIDE_MPI_FILE_INTERFACE
+
 headers = \
 	common_ompio_print_queue.h \
 	common_ompio.h
 
 sources = \
 	common_ompio_print_queue.c \
 	common_ompio_file_open.c   \
+	common_ompio_file_view.c   \
 	common_ompio_file_read.c   \
 	common_ompio_file_write.c
 
@@ -84,3 +87,14 @@ clean-local:
 	if test -z "$(lib_LTLIBRARIES)"; then \
 	  rm -f "$(comp_inst)"; \
 	fi
+
+else
+
+# Need to have empty targets because AM can't handle having an
+# AM_CONDITIONAL was targets in the "if" statement but not in the
+# "else".  :-(
+
+all-local:
+clean-local:
+
+endif

ompi/mca/common/ompio/common_ompio.h

@@ -82,7 +82,10 @@ OMPI_DECLSPEC int mca_common_ompio_file_close (mca_io_ompio_file_t *ompio_fh);
 OMPI_DECLSPEC int mca_common_ompio_file_get_size (mca_io_ompio_file_t *ompio_fh, OMPI_MPI_OFFSET_TYPE *size);
 OMPI_DECLSPEC int mca_common_ompio_file_get_position (mca_io_ompio_file_t *fh,OMPI_MPI_OFFSET_TYPE *offset);
 OMPI_DECLSPEC int mca_common_ompio_set_explicit_offset (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset);
-
+OMPI_DECLSPEC int mca_common_ompio_set_file_defaults (mca_io_ompio_file_t *fh);
+OMPI_DECLSPEC int mca_common_ompio_set_view (mca_io_ompio_file_t *fh,  OMPI_MPI_OFFSET_TYPE disp,
+                                             ompi_datatype_t *etype,  ompi_datatype_t *filetype, const char *datarep,
+                                             ompi_info_t *info);
 
 
 #endif /* MCA_COMMON_OMPIO_H */

ompi/mca/common/ompio/common_ompio_file_open.c

@@ -91,7 +91,7 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
     ompio_fh->f_info   = info;
     ompio_fh->f_atomicity = 0;
 
-    ompi_io_ompio_set_file_defaults (ompio_fh);
+    mca_common_ompio_set_file_defaults (ompio_fh);
     ompio_fh->f_filename = filename;
 
     ompio_fh->f_split_coll_req    = NULL;
@@ -105,9 +105,6 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
     ompio_fh->f_decode_datatype=ompi_io_ompio_decode_datatype;
     ompio_fh->f_generate_current_file_view=ompi_io_ompio_generate_current_file_view;
 
-    ompio_fh->f_sort=ompi_io_ompio_sort;
-    ompio_fh->f_sort_iovec=ompi_io_ompio_sort_iovec;
-
     ompio_fh->f_get_num_aggregators=mca_io_ompio_get_num_aggregators;
     ompio_fh->f_get_bytes_per_agg=mca_io_ompio_get_bytes_per_agg;
     ompio_fh->f_set_aggregator_props=mca_io_ompio_set_aggregator_props;
@@ -377,4 +374,78 @@ int mca_common_ompio_file_get_position (mca_io_ompio_file_t *fh,
     return OMPI_SUCCESS;
 }
 
+int mca_common_ompio_set_file_defaults (mca_io_ompio_file_t *fh)
+{
+
+   if (NULL != fh) {
+        ompi_datatype_t *types[2];
+        int blocklen[2] = {1, 1};
+        OPAL_PTRDIFF_TYPE d[2], base;
+        int i;
+
+        fh->f_io_array = NULL;
+        fh->f_perm = OMPIO_PERM_NULL;
+        fh->f_flags = 0;
+        fh->f_bytes_per_agg = mca_io_ompio_bytes_per_agg;
+        fh->f_datarep = strdup ("native");
+
+        fh->f_offset = 0;
+        fh->f_disp = 0;
+        fh->f_position_in_file_view = 0;
+        fh->f_index_in_file_view = 0;
+        fh->f_total_bytes = 0;
+
+        fh->f_init_procs_per_group = -1;
+        fh->f_init_procs_in_group = NULL;
+
+	fh->f_procs_per_group = -1;
+        fh->f_procs_in_group = NULL;
+
+        fh->f_init_num_aggrs = -1;
+        fh->f_init_aggr_list = NULL;
+
+
+        /* Default file View */
+        fh->f_iov_type = MPI_DATATYPE_NULL;
+        fh->f_stripe_size = mca_io_ompio_bytes_per_agg;
+	/*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);
+
+
+	/*Create a derived datatype for the created iovec */
+	types[0] = &ompi_mpi_long.dt;
+        types[1] = &ompi_mpi_long.dt;
+
+        d[0] = (OPAL_PTRDIFF_TYPE) fh->f_decoded_iov;
+        d[1] = (OPAL_PTRDIFF_TYPE) &fh->f_decoded_iov[0].iov_len;
+
+        base = d[0];
+        for (i=0 ; i<2 ; i++) {
+            d[i] -= base;
+        }
+
+        ompi_datatype_create_struct (2,
+                                     blocklen,
+                                     d,
+                                     types,
+                                     &fh->f_iov_type);
+        ompi_datatype_commit (&fh->f_iov_type);
+
+        return OMPI_SUCCESS;
+    }
+    else {
+        return OMPI_ERROR;
+    }
+}
+