diff --git a/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c b/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c index d4415a99f0..c83983fa2c 100644 --- a/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c +++ b/orte/mca/grpcomm/cnos/grpcomm_cnos_module.c @@ -27,8 +27,12 @@ #endif /* HAVE_SYS_TIME_H */ #include "opal/dss/dss.h" +#include "opal/class/opal_list.h" +#include "opal/class/opal_value_array.h" + #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml_types.h" +#include "orte/mca/rmaps/rmaps_types.h" #include "grpcomm_cnos.h" @@ -44,13 +48,13 @@ static int xcast(orte_jobid_t job, opal_buffer_t *buffer, orte_rml_tag_t tag); -static int orte_grpcomm_cnos_barrier(orte_jobid_t jobid); +static int orte_grpcomm_cnos_barrier(void); -static int allgather(orte_jobid_t jobid, opal_buffer_t *sbuf, opal_buffer_t *rbuf); +static int allgather(opal_buffer_t *sbuf, opal_buffer_t *rbuf); static int allgather_list(opal_list_t *names, opal_buffer_t *sbuf, opal_buffer_t *rbuf); -static int next_recips(opal_list_t *names, orte_grpcomm_mode_t mode); +static opal_list_t* next_recips(orte_grpcomm_mode_t mode); static int set_proc_attr(const char *attr_name, const void *data, @@ -64,6 +68,15 @@ static int modex(opal_list_t *procs); static int purge_proc_attrs(void); +static int daemon_collective(orte_jobid_t jobid, + orte_std_cntr_t num_local_contributors, + orte_grpcomm_coll_t type, + opal_buffer_t *data, + orte_rmaps_dp_t flag, + opal_value_array_t *participants); + +static int update_trees(void); + orte_grpcomm_base_module_t orte_grpcomm_cnos_module = { init, finalize, @@ -71,6 +84,8 @@ orte_grpcomm_base_module_t orte_grpcomm_cnos_module = { allgather, allgather_list, orte_grpcomm_cnos_barrier, + daemon_collective, + update_trees, next_recips, set_proc_attr, get_proc_attr, @@ -110,7 +125,7 @@ static int xcast(orte_jobid_t job, } static int -orte_grpcomm_cnos_barrier(orte_jobid_t jobid) +orte_grpcomm_cnos_barrier(void) { #if OMPI_GRPCOMM_CNOS_HAVE_BARRIER cnos_barrier(); @@ -119,7 +134,7 @@ orte_grpcomm_cnos_barrier(orte_jobid_t jobid) return ORTE_SUCCESS; } -static int allgather(orte_jobid_t jobid, opal_buffer_t *sbuf, opal_buffer_t *rbuf) +static int allgather(opal_buffer_t *sbuf, opal_buffer_t *rbuf) { int rc; orte_std_cntr_t zero=0; @@ -145,10 +160,27 @@ static int allgather_list(opal_list_t *names, opal_buffer_t *sbuf, opal_buffer_t return rc; } -static int next_recips(opal_list_t *names, orte_grpcomm_mode_t mode) +static int purge_proc_attrs(void); + +static int daemon_collective(orte_jobid_t jobid, + orte_std_cntr_t num_local_contributors, + orte_grpcomm_coll_t type, + opal_buffer_t *data, + orte_rmaps_dp_t flag, + opal_value_array_t *participants) +{ + return ORTE_SUCCESS; +} + +static int update_trees(void) +{ + return ORTE_SUCCESS; +} + +static opal_list_t* next_recips(orte_grpcomm_mode_t mode) { /* nothing to do here */ - return ORTE_SUCCESS; + return NULL; } static int set_proc_attr(const char *attr_name,