topo/example: updates for const and API changes

Signed-off-by: Jeff Squyres <[email protected]>
(cherry picked from commit 4dea0fe)

Author: jsquyres

ompi/mca/topo/example/topo_example.h

@@ -66,14 +66,15 @@ OBJ_CLASS_DECLARATION(mca_topo_example_module_t);
 
 int mca_topo_example_cart_map(struct ompi_communicator_t *comm,
                               int ndims,
-                              int *dims,
-                              int *periods,
+                              const int *dims,
+                              const int *periods,
                               int *newrank);
 
+
 int mca_topo_example_graph_map(struct ompi_communicator_t *comm,
                                int nnodes,
-                               int *index,
-                               int *edges,
+                               const int *index,
+                               const int *edges,
                                int *newrank);
 /*
  * ******************************************************************

ompi/mca/topo/example/topo_example_cart_map.c

@@ -41,15 +41,15 @@
 
 int mca_topo_example_cart_map (ompi_communicator_t* comm,
                                int ndims,
-                               int *dims,
-                               int *periods,
+                               const int *dims,
+                               const int *periods,
                                int *newrank)
 {
     int nprocs;
     int rank;
     int size;
     int i;
-    int *p;
+    const int *p;
 
     /*
      * Compute the # of processes in the grid.

ompi/mca/topo/example/topo_example_component.c

@@ -34,8 +34,7 @@ const char *mca_topo_example_component_version_string =
  * Local functions
  */
 static int init_query(bool enable_progress_threads, bool enable_mpi_threads);
-static struct mca_topo_base_module_t *
-comm_query(const ompi_communicator_t *comm, int *priority, uint32_t type);
+static struct mca_topo_base_module_t *query(const ompi_communicator_t *comm, const ompi_group_t *group, int *priority, uint32_t type);
 
 /*
  * Public component structure
@@ -57,7 +56,7 @@ mca_topo_base_component_2_2_0_t mca_topo_example_component =
     },
 
     .topoc_init_query = init_query,
-    .topoc_comm_query = comm_query,
+    .topoc_query = query,
 };
 MCA_BASE_COMPONENT_INIT(ompi, topo, example)
 
@@ -71,7 +70,7 @@ static int init_query(bool enable_progress_threads, bool enable_mpi_threads)
 
 
 static struct mca_topo_base_module_t *
-comm_query(const ompi_communicator_t *comm, int *priority, uint32_t type)
+query(const ompi_communicator_t *comm, const ompi_group_t *group, int *priority, uint32_t type)
 {
     mca_topo_example_module_t *example = OBJ_NEW(mca_topo_example_module_t);
     if (NULL == example) {
@@ -88,5 +87,3 @@ comm_query(const ompi_communicator_t *comm, int *priority, uint32_t type)
     example->super.type = type;
     return &(example->super);
 }
-
-

ompi/mca/topo/example/topo_example_graph_map.c

@@ -40,8 +40,8 @@
 
 int mca_topo_example_graph_map (ompi_communicator_t* comm,
                               int nnodes,
-                              int *index,
-                              int *edges,
+                              const int *index,
+                              const int *edges,
                               int *newrank)
 {
     int myrank;