Merge pull request #1923 from edgargabriel/pr/aggregator-cleanup

io/ompio: move aggregator selection code to a separate file
open-mpi · Aug 1, 2016 · cb00866 · cb00866
2 parents 21e7f31 + c0bd872
commit cb00866
Show file tree

Hide file tree

Showing 8 changed files with 1,411 additions and 1,236 deletions.
diff --git a/ompi/mca/common/ompio/common_ompio_file_open.c b/ompi/mca/common/ompio/common_ompio_file_open.c
@@ -110,7 +110,7 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
 
     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=ompi_io_ompio_set_aggregator_props;
+    ompio_fh->f_set_aggregator_props=mca_io_ompio_set_aggregator_props;
 
     /* This fix is needed for data seiving to work with
        two-phase collective I/O */

diff --git a/ompi/mca/io/ompio/Makefile.am b/ompi/mca/io/ompio/Makefile.am
@@ -31,21 +31,25 @@ endif
 
 mcacomponentdir = $(ompilibdir)
 mcacomponent_LTLIBRARIES = $(component_install)
-mca_io_ompio_la_SOURCES = $(sources)
+mca_io_ompio_la_SOURCES = $(headers) $(sources)
 mca_io_ompio_la_LDFLAGS = -module -avoid-version
 mca_io_ompio_la_LIBADD = $(io_ompio_LIBS) \
     $(OMPI_TOP_BUILDDIR)/ompi/mca/common/ompio/lib@OPAL_LIB_PREFIX@mca_common_ompio.la
 
 noinst_LTLIBRARIES = $(component_noinst)
-libmca_io_ompio_la_SOURCES = $(sources)
+libmca_io_ompio_la_SOURCES = $(headers) $(sources)
 libmca_io_ompio_la_LDFLAGS = -module -avoid-version
 
 # Source files
 
+headers = \
+	io_ompio.h \
+	io_ompio_request.h \
+	io_ompio_aggregators.h
+
 sources = \
-        io_ompio.h \
-        io_ompio_request.h \
         io_ompio.c \
+        io_ompio_aggregators.c \
         io_ompio_component.c \
         io_ompio_module.c \
         io_ompio_file_set_view.c \