io/ompio: move io/ompio functionality to common/ompio

VERSION

@@ -98,6 +98,7 @@ liboshmem_so_version=0:0:0
 # components-don't-affect-the-build-system abstraction.
 
 # OMPI layer
+libmca_ompi_common_ompio_so_version=0:0:0
 
 # ORTE layer
 libmca_orte_common_alps_so_version=0:0:0

configure.ac

@@ -149,6 +149,7 @@ AC_SUBST(libmca_opal_common_sm_so_version)
 AC_SUBST(libmca_opal_common_ugni_so_version)
 AC_SUBST(libmca_opal_common_verbs_so_version)
 AC_SUBST(libmca_orte_common_alps_so_version)
+AC_SUBST(libmca_ompi_common_ompio_so_version)
 
 #
 # Get the versions of the autotools that were used to bootstrap us

ompi/mca/common/ompio/Makefile.am

@@ -0,0 +1,86 @@
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2007 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         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$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+headers = \
+	common_ompio_print_queue.h \
+	common_ompio.h
+
+sources = \
+	common_ompio_print_queue.c \
+	common_ompio_file_open.c   \
+	common_ompio_file_read.c   \
+	common_ompio_file_write.c
+
+
+# To simplify components that link to this library, we will *always*
+# have an output libtool library named libmca_<type>_<name>.la -- even
+# for case 2) described above (i.e., so there's no conditional logic
+# necessary in component Makefile.am's that link to this library).
+# Hence, if we're creating a noinst version of this library (i.e.,
+# case 2), we sym link it to the libmca_<type>_<name>.la name
+# (libtool will do the Right Things under the covers).  See the
+# all-local and clean-local rules, below, for how this is effected.
+
+lib_LTLIBRARIES =
+noinst_LTLIBRARIES =
+comp_inst = lib@OPAL_LIB_PREFIX@mca_common_ompio.la
+comp_noinst = lib@OPAL_LIB_PREFIX@mca_common_ompio_noinst.la
+
+if MCA_BUILD_ompi_common_ompio_DSO
+lib_LTLIBRARIES += $(comp_inst)
+else
+noinst_LTLIBRARIES += $(comp_noinst)
+endif
+
+lib@OPAL_LIB_PREFIX@mca_common_ompio_la_SOURCES = $(headers) $(sources)
+lib@OPAL_LIB_PREFIX@mca_common_ompio_la_CPPFLAGS = $(common_ompio_CPPFLAGS)
+lib@OPAL_LIB_PREFIX@mca_common_ompio_la_LDFLAGS =  \
+        -version-info $(libmca_ompi_common_ompio_so_version) \
+        $(common_ompio_LDFLAGS)
+lib@OPAL_LIB_PREFIX@mca_common_ompio_la_LIBADD = $(common_ompio_LIBS)
+lib@OPAL_LIB_PREFIX@mca_common_ompio_noinst_la_SOURCES = $(headers) $(sources)
+
+# Conditionally install the header files
+
+if WANT_INSTALL_HEADERS
+ompidir = $(ompiincludedir)/ompi/mca/common/ompio
+ompi_HEADERS = $(headers)
+else
+ompidir = $(includedir)
+endif
+
+# These two rules will sym link the "noinst" libtool library filename
+# to the installable libtool library filename in the case where we are
+# compiling this component statically (case 2), described above).
+V=0
+OMPI_V_LN_SCOMP = $(ompi__v_LN_SCOMP_$V)
+ompi__v_LN_SCOMP_ = $(ompi__v_LN_SCOMP_$AM_DEFAULT_VERBOSITY)
+ompi__v_LN_SCOMP_0 = @echo "  LN_S    " `basename $(comp_inst)`;
+
+all-local:
+	$(OMPI_V_LN_SCOMP) if test -z "$(lib_LTLIBRARIES)"; then \
+	  rm -f "$(comp_inst)"; \
+	  $(LN_S) "$(comp_noinst)" "$(comp_inst)"; \
+	fi
+
+clean-local:
+	if test -z "$(lib_LTLIBRARIES)"; then \
+	  rm -f "$(comp_inst)"; \
+	fi

ompi/mca/common/ompio/common_ompio.h

@@ -0,0 +1,88 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+ *                         University Research and Technology
+ *                         Corporation.  All rights reserved.
+ * Copyright (c) 2004-2007 The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+ *                         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$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#ifndef MCA_COMMON_OMPIO_H
+#define MCA_COMMON_OMPIO_H
+
+#include "ompi/mca/common/ompio/common_ompio_print_queue.h"
+#include "ompi/mca/io/ompio/io_ompio.h"
+
+OMPI_DECLSPEC int mca_common_ompio_file_write (mca_io_ompio_file_t *fh, const void *buf,  int count,
+                                               struct ompi_datatype_t *datatype, 
+                                               ompi_status_public_t *status);
+
+OMPI_DECLSPEC int mca_common_ompio_file_write_at (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,  const void *buf,
+                                                  int count,  struct ompi_datatype_t *datatype, 
+                                                  ompi_status_public_t *status);
+
+OMPI_DECLSPEC int mca_common_ompio_file_iwrite (mca_io_ompio_file_t *fh, const void *buf, int count,
+                                                struct ompi_datatype_t *datatype, ompi_request_t **request);
+
+OMPI_DECLSPEC int mca_common_ompio_file_iwrite_at (mca_io_ompio_file_t *fh,  OMPI_MPI_OFFSET_TYPE offset,
+                                                   const void *buf,  int count,  struct ompi_datatype_t *datatype,
+                                                   ompi_request_t **request);
+
+OMPI_DECLSPEC int mca_common_ompio_file_write_at_all (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset, const void *buf,
+                                                      int count, struct ompi_datatype_t *datatype, 
+                                                      ompi_status_public_t *status);
+
+
+OMPI_DECLSPEC int mca_common_ompio_file_iwrite_at_all (mca_io_ompio_file_t *fp, OMPI_MPI_OFFSET_TYPE offset, const void *buf,
+                                                       int count, struct ompi_datatype_t *datatype, ompi_request_t **request);
+
+OMPI_DECLSPEC int mca_common_ompio_build_io_array ( mca_io_ompio_file_t *fh, int index, int cycles,
+                                                    size_t bytes_per_cycle, int max_data, uint32_t iov_count,
+                                                    struct iovec *decoded_iov, int *ii, int *jj, size_t *tbw );
+
+
+OMPI_DECLSPEC int mca_common_ompio_file_read (mca_io_ompio_file_t *fh,  void *buf,  int count,
+                                              struct ompi_datatype_t *datatype, ompi_status_public_t *status);
+
+OMPI_DECLSPEC int mca_common_ompio_file_read_at (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,  void *buf,
+                                                 int count, struct ompi_datatype_t *datatype, 
+                                                 ompi_status_public_t * status);
+
+OMPI_DECLSPEC int mca_common_ompio_file_iread (mca_io_ompio_file_t *fh, void *buf, int count,
+                                               struct ompi_datatype_t *datatype, ompi_request_t **request);
+
+OMPI_DECLSPEC int mca_common_ompio_file_iread_at (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,
+                                                  void *buf, int count, struct ompi_datatype_t *datatype,
+                                                  ompi_request_t **request);
+
+OMPI_DECLSPEC int mca_common_ompio_file_read_at_all (mca_io_ompio_file_t *fh, OMPI_MPI_OFFSET_TYPE offset,
+                                                     void *buf, int count, struct ompi_datatype_t *datatype,
+                                                     ompi_status_public_t * status);
+
+OMPI_DECLSPEC int mca_common_ompio_file_iread_at_all (mca_io_ompio_file_t *fp, OMPI_MPI_OFFSET_TYPE offset,
+                                                      void *buf, int count, struct ompi_datatype_t *datatype,
+                                                      ompi_request_t **request);
+
+OMPI_DECLSPEC int mca_common_ompio_file_open (ompi_communicator_t *comm, const char *filename,
+                                              int amode, ompi_info_t *info,
+                                              mca_io_ompio_file_t *ompio_fh, bool use_sharedfp);
+
+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);
+
+
+
+#endif /* MCA_COMMON_OMPIO_H */