Merge branch 'master' into fix/alpsinfov3

ompi/mca/pml/monitoring/pml_monitoring_component.c

@@ -4,6 +4,8 @@
  *                         reserved.
  * Copyright (c) 2013-2015 Inria.  All rights reserved.
  * Copyright (c) 2015      Bull SAS.  All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -21,8 +23,8 @@ static int mca_pml_monitoring_enabled = 0;
 static int mca_pml_monitoring_active = 0;
 static int mca_pml_monitoring_current_state = 0;
 static char* mca_pml_monitoring_current_filename = NULL;
-mca_pml_base_component_t pml_selected_component;
-mca_pml_base_module_t pml_selected_module;
+mca_pml_base_component_t pml_selected_component = {{0}};
+mca_pml_base_module_t pml_selected_module = {0};
 
 /* Return the current status of the monitoring system 0 if off, 1 if the
  * seperation between internal tags and external tags is enabled. Any other

opal/class/opal_free_list.c

@@ -121,6 +121,10 @@ int opal_free_list_init (opal_free_list_t *flist, size_t frag_size, size_t frag_
             return OPAL_ERROR;
     }
 
+    if (frag_class && frag_size < frag_class->cls_sizeof) {
+        frag_size = frag_class->cls_sizeof;
+    }
+
     if (frag_size > flist->fl_frag_size) {
         flist->fl_frag_size = frag_size;
     }
@@ -164,9 +168,7 @@ int opal_free_list_grow_st (opal_free_list_t* flist, size_t num_elements)
         return OPAL_ERR_TEMP_OUT_OF_RESOURCE;
     }
 
-    head_size = (NULL == flist->fl_mpool) ? flist->fl_frag_size:
-        flist->fl_frag_class->cls_sizeof;
-    head_size = OPAL_ALIGN(head_size, flist->fl_frag_alignment, size_t);
+    head_size = OPAL_ALIGN(flist->fl_frag_size, flist->fl_frag_alignment, size_t);
 
     /* calculate head allocation size */
     alloc_size = num_elements * head_size + sizeof(opal_free_list_memory_t) +

opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server_listener.c

@@ -145,10 +145,11 @@ pmix_status_t pmix_start_listening(struct sockaddr_un *address)
             return PMIX_ERR_OUT_OF_RESOURCE;
         }
         /* fork off the listener thread */
+        pmix_server_globals.listen_thread_active = true;
         if (0 > pthread_create(&engine, NULL, listen_thread, NULL)) {
+            pmix_server_globals.listen_thread_active = false;
             return PMIX_ERROR;
         }
-        pmix_server_globals.listen_thread_active = true;
     }
 
     return PMIX_SUCCESS;

opal/mca/pmix/pmix1xx/pmix/src/server/pmix_server_ops.h

@@ -138,14 +138,14 @@ typedef struct {
 PMIX_CLASS_DECLARATION(pmix_pending_connection_t);
 
 typedef struct {
-    pmix_pointer_array_t clients;  // array of pmix_peer_t local clients
-    pmix_list_t collectives;       // list of active pmix_server_trkr_t
-    pmix_list_t remote_pnd;        // list of pmix_dmdx_remote_t awaiting arrival of data fror servicing remote req's
-    pmix_list_t local_reqs;        // list of pmix_dmdx_local_t awaiting arrival of data from local neighbours
-    bool listen_thread_active;     // listen thread is running
-    int listen_socket;             // socket listener is watching
-    int stop_thread[2];            // pipe used to stop listener thread
-    pmix_buffer_t gdata;           // cache of data given to me for passing to all clients
+    pmix_pointer_array_t clients;           // array of pmix_peer_t local clients
+    pmix_list_t collectives;                // list of active pmix_server_trkr_t
+    pmix_list_t remote_pnd;                 // list of pmix_dmdx_remote_t awaiting arrival of data fror servicing remote req's
+    pmix_list_t local_reqs;                 // list of pmix_dmdx_local_t awaiting arrival of data from local neighbours
+    volatile bool listen_thread_active;     // listen thread is running
+    int listen_socket;                      // socket listener is watching
+    int stop_thread[2];                     // pipe used to stop listener thread
+    pmix_buffer_t gdata;                    // cache of data given to me for passing to all clients
 } pmix_server_globals_t;
 
 #define PMIX_PEER_CADDY(c, p, t)                \

test/monitoring/Makefile.am

@@ -3,6 +3,8 @@
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
 # Copyright (c) 2013-2015 Inria.  All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -14,13 +16,15 @@
 # of 'make check'
 if PROJECT_OMPI
     noinst_PROGRAMS = monitoring_test
-    lib_LTLIBRARIES = monitoring_prof.la
-
     monitoring_test_SOURCES = monitoring_test.c
     monitoring_test_LDFLAGS = $(WRAPPER_EXTRA_LDFLAGS)
     monitoring_test_LDADD = $(top_builddir)/ompi/libmpi.la $(top_builddir)/opal/libopen-pal.la
 
+if MCA_BUILD_ompi_pml_monitoring_DSO
+    lib_LTLIBRARIES = monitoring_prof.la
     monitoring_prof_la_SOURCES = monitoring_prof.c
     monitoring_prof_la_LDFLAGS=-module -avoid-version -shared $(WRAPPER_EXTRA_LDFLAGS)
     monitoring_prof_la_LIBADD = $(top_builddir)/ompi/libmpi.la $(top_builddir)/opal/libopen-pal.la
 endif
+
+endif