* hack up rml_cnos to work with last round of orte changes

* updates to the red storm configure setup
* fix missing header if no timer components are found

This commit was SVN r7402.

contrib/platform/redstorm

@@ -6,6 +6,7 @@ with_threads=no
 enable_pretty_print_stacktrace=no
 enable_dlopen=no
 with_portals_config=redstorm
-enable_mca_no_build=gpr-proxy,gpr-replica,pml-teg,pml-uniq,rml-oob,btl-sm,mpool-sm,btl-self,ptl-sm,ptl-self,ns-proxy,rds-resfile,sds-env,sds-seed,sds-singleton
+with_memory_manager=none
+enable_mca_no_build=maffinity-first_use,maffinity-libnuma,paffinity-linux,timer-linux,gpr-proxy,gpr-replica,pml-teg,pml-uniq,rml-oob,btl-sm,mpool-sm,btl-self,ptl-sm,ptl-self,ns-proxy,rds-resfile,sds-env,sds-seed,sds-singleton,ras-slurm,pls-slurm,pls-rsh
 with_memory_manager=no
 enable_heterogeneous=no

opal/mca/timer/base/timer_base_null.h

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         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$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ */
+
+#ifndef OPAL_MCA_TIMER_BASE_TIMER_BASE_NULL_H
+#define OPAL_MCA_TIMER_BASE_TIMER_BASE_NULL_H
+
+typedef int opal_timer_t;
+
+static inline opal_timer_t
+opal_timer_base_get_cycles(void)
+{
+    return 0;
+}
+
+
+static inline opal_timer_t
+opal_timer_base_get_usec(void)
+{
+    return 0;
+}    
+
+
+static inline opal_timer_t
+opal_timer_base_get_freq(void)
+{
+    return 0;
+}
+
+
+#define OPAL_TIMER_CYCLE_NATIVE 0
+#define OPAL_TIMER_CYCLE_SUPPORTED 0
+#define OPAL_TIMER_USEC_NATIVE 0
+#define OPAL_TIMER_USEC_SUPPORTED 0
+
+#endif

opal/mca/timer/configure.m4

@@ -26,7 +26,7 @@ AC_DEFUN([MCA_timer_CONFIG],[
 
         # someone should have set this...
         if test "$timer_base_include" = "" ; then
-            timer_base_include="base/base_null.h"
+            timer_base_include="base/timer_base_null.h"
         fi
 
         AC_CONFIG_LINKS([opal/mca/timer/base/base_impl.h:opal/mca/timer/$timer_base_include])

orte/mca/rml/cnos/rml_cnos.c

@@ -16,10 +16,11 @@
 
 #include "orte_config.h"
 
-#include "include/orte_constants.h"
+#include "orte/include/orte_constants.h"
 #include "opal/util/output.h"
-#include "mca/rml/base/base.h"
+#include "orte/mca/rml/base/base.h"
 #include "rml_cnos.h"
+#include "orte/mca/errmgr/errmgr.h"
 
 #if OMPI_RML_CNOS_HAVE_BARRIER
 #include <catamount/cnos_mpi_os.h>
@@ -221,15 +222,26 @@ orte_rml_cnos_barrier(void)
 
 int
 orte_rml_cnos_xcast(orte_process_name_t * root,
-		      orte_process_name_t * peers,
+                    orte_process_name_t * peers,
-		      size_t num_peers,
+                    size_t num_peers,
-		      orte_buffer_t * buffer,
+                    orte_buffer_t * buffer,
-		      orte_rml_buffer_callback_fn_t cbfunc)
+                    orte_gpr_trigger_cb_fn_t cbfunc,
+                    void *user_tag)
 {
     if (NULL != root || NULL != peers || 0 != num_peers || 
-        NULL != buffer || NULL != cbfunc) {
+        NULL != buffer || NULL != user_tag) {
         return ORTE_ERR_NOT_SUPPORTED;
     }
 
-    return orte_rml_cnos_barrier();
+    orte_rml_cnos_barrier();
+    if (NULL != cbfunc) {
+        orte_gpr_notify_message_t *msg;
+        msg = OBJ_NEW(orte_gpr_notify_message_t);
+        if (NULL == msg) {
+            ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
+            return ORTE_ERR_OUT_OF_RESOURCE;
+        }
+        cbfunc(msg);
+        OBJ_RELEASE(msg);
+    }
 }

orte/mca/rml/cnos/rml_cnos.h

@@ -91,10 +91,11 @@ extern "C"
   int orte_rml_cnos_barrier(void);
 
   int orte_rml_cnos_xcast(orte_process_name_t * root,
-			    orte_process_name_t * peers,
+                          orte_process_name_t * peers,
-			    size_t num_peers,
+                          size_t num_peers,
-			    orte_buffer_t * buffer,
+                          orte_buffer_t * buffer,
-			    orte_rml_buffer_callback_fn_t cbfunc);
+                          orte_gpr_trigger_cb_fn_t cbfunc,
+                          void *user_tag);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }