Now that gpr is apparently ready for prime-time, remove the hacks that

made it [somewhat] compile and fully integrate it into the build
process:
- add configure.params to gpr/proxy and gpr/replica
- bring gpr/proxy/Makefile.am and gpr/replica/Makefile.am up-to-date
- uncomment gpr sections from ompi_info
- took the liberty of changing a member variable from "delete" to
  "delete_fn" in gpr.h ("delete" is a keyword in C++, and gpr.h is
  included in ompi_info, which is written in C++)

This commit was SVN r2159.

src/Makefile.am

@@ -96,6 +96,7 @@ libmpi_la_LIBADD = \
         mca/allocator/base/libmca_allocator_base.la $(MCA_allocator_STATIC_LTLIBS) \
         mca/coll/base/libmca_coll_base.la $(MCA_coll_STATIC_LTLIBS) \
         $(MCA_common_STATIC_LTLIBS) \
+        mca/gpr/base/libmca_gpr_base.la $(MCA_gpr_STATIC_LTLIBS) \
         mca/io/base/libmca_io_base.la $(MCA_coll_STATIC_LTLIBS) \
         mca/llm/base/libmca_llm_base.la $(MCA_llm_STATIC_LTLIBS) \
         mca/mpool/base/libmca_mpool_base.la $(MCA_mpool_STATIC_LTLIBS) \

src/mca/Makefile.am

@@ -9,6 +9,7 @@ SUBDIRS = \
         base \
         coll \
         common \
+        gpr \
         io \
 	llm \
         mpool \
@@ -19,9 +20,6 @@ SUBDIRS = \
         pml \
         ptl \
         topo
-# JMS Temporary hack to make "make dist" function properly; directories 
-# mentioned here will eventually be moved into SUBDIRS
-DIST_SUBDIRS = $(SUBDIRS) gpr
 
 # Source code files
 

src/mca/gpr/gpr.h

@@ -131,7 +131,7 @@ struct mca_gpr_base_module_1_0_0_t {
     mca_gpr_base_module_delete_segment_fn_t delete_segment;
     mca_gpr_base_module_subscribe_fn_t subscribe;
     mca_gpr_base_module_unsubscribe_fn_t unsubscribe;
-    mca_gpr_base_module_delete_fn_t delete;
+    mca_gpr_base_module_delete_fn_t delete_fn;
 };
 typedef struct mca_gpr_base_module_1_0_0_t mca_gpr_base_module_1_0_0_t;
 typedef mca_gpr_base_module_1_0_0_t mca_gpr_base_module_t;

src/mca/gpr/proxy/Makefile.am

@@ -6,12 +6,17 @@
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
+sources = \
+        gpr_proxy.c \
+        gpr_proxy.h \
+        gpr_proxy_component.c
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
 
 if OMPI_BUILD_gpr_proxy_DSO
-component_noinst = 
+component_noinst =
 component_install = mca_gpr_proxy.la
 else
 component_noinst = libmca_gpr_proxy.la
@@ -20,11 +25,9 @@ endif
 
 mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
-mca_gpr_proxy_la_SOURCES =
+mca_gpr_proxy_la_SOURCES = $(sources)
-mca_gpr_proxy_la_LIBADD = src/libmca_gpr_proxy.la
 mca_gpr_proxy_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(component_noinst)
-libmca_gpr_proxy_la_SOURCES =
+libmca_gpr_proxy_la_SOURCES =$(sources)
-libmca_gpr_proxy_la_LIBADD = src/libmca_gpr_proxy.la
 libmca_gpr_proxy_la_LDFLAGS = -module -avoid-version

src/mca/gpr/proxy/configure.params

@@ -0,0 +1,9 @@
+# -*- shell-script -*-
+#
+# $HEADER$
+#
+
+# Specific to this module
+
+PARAM_INIT_FILE=gpr_proxy.c
+PARAM_CONFIG_FILES="Makefile"

src/mca/gpr/replica/Makefile.am

@@ -6,12 +6,18 @@
 
 include $(top_ompi_srcdir)/config/Makefile.options
 
+sources = \
+        gpr_replica_component.c \
+        gpr_replica.h \
+        gpr_replica_internals.c \
+        gpr_replica_internals.h
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).
 
 if OMPI_BUILD_gpr_replica_DSO
-component_noinst = 
+component_noinst =
 component_install = mca_gpr_replica.la
 else
 component_noinst = libmca_gpr_replica.la
@@ -20,11 +26,9 @@ endif
 
 mcacomponentdir = $(libdir)/openmpi
 mcacomponent_LTLIBRARIES = $(component_install)
-mca_gpr_replica_la_SOURCES =
+mca_gpr_replica_la_SOURCES = $(sources)
-mca_gpr_replica_la_LIBADD = src/libmca_gpr_replica.la
 mca_gpr_replica_la_LDFLAGS = -module -avoid-version
 
 noinst_LTLIBRARIES = $(component_noinst)
-libmca_gpr_replica_la_SOURCES =
+libmca_gpr_replica_la_SOURCES =$(sources)
-libmca_gpr_replica_la_LIBADD = src/libmca_gpr_replica.la
 libmca_gpr_replica_la_LDFLAGS = -module -avoid-version

src/mca/gpr/replica/configure.params

@@ -0,0 +1,9 @@
+# -*- shell-script -*-
+#
+# $HEADER$
+#
+
+# Specific to this module
+
+PARAM_INIT_FILE=gpr_replica.h
+PARAM_CONFIG_FILES=Makefile

src/tools/ompi_info/components.cc

@@ -32,6 +32,8 @@
 #include "mca/ns/base/base.h"
 #include "mca/topo/topo.h"
 #include "mca/topo/base/base.h"
+#include "mca/gpr/gpr.h"
+#include "mca/gpr/base/base.h"
 #include "tools/ompi_info/ompi_info.h"
 
 using namespace std;
@@ -104,13 +106,8 @@ void ompi_info::open_components()
   component_map["common"] = NULL;
 #endif
 
-#if 0
-  // waiting for gpr to be implemented
   mca_gpr_base_open();
-  component_map["gpr"] = &mca_ns_base_components_available;
+  component_map["gpr"] = &mca_gpr_base_components_available;
-#else
-  component_map["gpr"] = NULL;
-#endif
 
   mca_llm_base_open();
   component_map["llm"] = &mca_llm_base_components_available;
@@ -172,6 +169,7 @@ void ompi_info::close_components()
     mca_pcm_base_close();
     mca_oob_base_close();
     mca_ns_base_close();
+    mca_gpr_base_close();
     mca_coll_base_close();
     mca_pml_base_close();
     mca_ptl_base_close();