- Remove Makefile.in from version control

- Add back support for cnos (copy functionality lost by moving the interface
  from the RML).
- Fix some cut/paste errors.

This commit was SVN r15646.

orte/mca/grpcomm/cnos/grpcomm_cnos.h

@@ -17,8 +17,8 @@
  * $HEADER$
  *
  */
-#ifndef GRPCOMM_BASIC_H
+#ifndef GRPCOMM_CNOS_H
-#define GRPCOMM_BASIC_H
+#define GRPCOMM_CNOS_H
 
 #include "orte_config.h"
 #include "orte/orte_types.h"
@@ -32,13 +32,6 @@
 
 BEGIN_C_DECLS
 
-/*
- * globals
- */
-/*
- * globals needed within component
- */
- 
 /*
  * Module open / close
  */
@@ -57,10 +50,6 @@ int orte_grpcomm_cnos_finalize(void);
  * xcast interfaces
  */
 
-void orte_ns_replica_recv(int status, orte_process_name_t* sender,
-                          orte_buffer_t* buffer, orte_rml_tag_t tag, void* cbdata);
-
-
 ORTE_MODULE_DECLSPEC extern orte_grpcomm_base_component_t mca_grpcomm_cnos_component;
 extern orte_grpcomm_base_module_t orte_grpcomm_cnos_module;
 

orte/mca/grpcomm/cnos/grpcomm_cnos_component.c

@@ -78,9 +78,6 @@ orte_grpcomm_base_component_t mca_grpcomm_cnos_component = {
 /* Open the component */
 int orte_grpcomm_cnos_open(void)
 {
-    int value;
-    char *mode;
-
     return ORTE_SUCCESS;
 }
 

orte/mca/grpcomm/cnos/grpcomm_cnos_module.c

@@ -40,7 +40,11 @@
 #include "orte/mca/rml/rml.h"
 #include "orte/runtime/params.h"
 
-#include "grpcomm_basic.h"
+#include "grpcomm_cnos.h"
+
+#if OMPI_RML_CNOS_HAVE_BARRIER
+#include <catamount/cnos_mpi_os.h>
+#endif
 
 /* API functions */
 static int xcast_nb(orte_jobid_t job,
@@ -53,6 +57,8 @@ static int xcast(orte_jobid_t job,
 
 static int xcast_gate(orte_gpr_trigger_cb_fn_t cbfunc);
 
+static int orte_grpcomm_cnos_barrier(void);
+
 orte_grpcomm_base_module_t orte_grpcomm_cnos_module = {
     xcast,
     xcast_nb,
@@ -71,9 +77,7 @@ static int xcast_nb(orte_jobid_t job,
                     orte_buffer_t *buffer,
                     orte_rml_tag_t tag)
 {
-    int rc = ORTE_SUCCESS;
+    return ORTE_SUCCESS;
-    
-    return rc;
 }
 
 /* Blocking version */
@@ -81,13 +85,35 @@ static int xcast(orte_jobid_t job,
                  orte_buffer_t *buffer,
                  orte_rml_tag_t tag)
 {
-    int rc = ORTE_SUCCESS;
+    return ORTE_SUCCESS;
-    return rc;
 }
 
 static int xcast_gate(orte_gpr_trigger_cb_fn_t cbfunc)
 {
-    int rc;
+    int rc = ORTE_SUCCESS;
+
+    orte_grpcomm_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);
+    }
+
+    return rc;
+}
+
+static int
+orte_grpcomm_cnos_barrier(void)
+{
+#if OMPI_RML_CNOS_HAVE_BARRIER
+    cnos_barrier();
+#endif
 
     return ORTE_SUCCESS;
 }