netloc: int -> unsigned int for utarray functions

Signed-off-by: Cyril Bordage <[email protected]>

Author: cbordage

include/netloc/utarray.h

@@ -218,7 +218,7 @@ typedef struct {
 #define utarray_next(a,e) (((e)==NULL) ? utarray_front(a) : ((((a)->i) > (utarray_eltidx(a,e)+1)) ? _utarray_eltptr(a,utarray_eltidx(a,e)+1) : NULL))
 #define utarray_prev(a,e) (((e)==NULL) ? utarray_back(a) : ((utarray_eltidx(a,e) > 0) ? _utarray_eltptr(a,utarray_eltidx(a,e)-1) : NULL))
 #define utarray_back(a) (((a)->i) ? (_utarray_eltptr(a,(a)->i-1)) : NULL)
-#define utarray_eltidx(a,e) (((char*)(e) >= (char*)((a)->d)) ? (((char*)(e) - (char*)((a)->d))/(size_t)(a)->icd.sz) : -1)
+#define utarray_eltidx(a,e) (((char*)(e) >= (char*)((a)->d)) ? (((char*)(e) - (char*)((a)->d))/(size_t)(a)->icd.sz) : (unsigned int)-1)
 
 /* last we pre-define a few icd for common utarrays of ints and strings */
 static void utarray_str_cpy(void *dst, const void *src) {

netloc/architecture.c

@@ -49,7 +49,7 @@ void netloc_arch_tree_complete(netloc_arch_tree_t *tree, UT_array **down_degrees
         int *degrees = (int *)down_degrees_by_level[l]->d;
         int max_degree = max_degrees[l];
 
-        int down_level_idx = 0;
+        unsigned int down_level_idx = 0;
         UT_array *down_level_degrees = down_degrees_by_level[l+1];
         int down_level_max_degree = max_degrees[l+1];
         for (int d = 0; d < num_degrees; d++) {
@@ -566,7 +566,7 @@ int partition_topology_to_tleaf(netloc_topology_t *topology,
         UT_array *new_nodes;
         utarray_new(new_nodes, &ut_ptr_icd);
 
-        for (int n = 0; n < utarray_len(nodes); n++) {
+        for (unsigned int n = 0; n < utarray_len(nodes); n++) {
             netloc_node_t *node = *(void **)utarray_eltptr(nodes, n);
             netloc_analysis_data *node_data = (netloc_analysis_data *)node->userdata;
             /* There is a problem, this is not a tree */
@@ -804,8 +804,8 @@ int netloc_arch_build(netloc_arch_t *arch, int add_slots)
     if (!partition_name) {
         fprintf(stderr, "Error: you need to set NETLOC_PARTITION in your environment.\n");
         fprintf(stderr, "\tIt can be: ");
-        int num_partitions = utarray_len(topology->partitions);
-        for (int p = 0; p < num_partitions; p++) {
+        unsigned int num_partitions = utarray_len(topology->partitions);
+        for (unsigned int p = 0; p < num_partitions; p++) {
             char *partition = *(char **)utarray_eltptr(topology->partitions, p);
             fprintf(stderr, "%s%s", partition, p != num_partitions-1 ? ", ": "\n");
         }

netloc/edge.c

@@ -60,7 +60,7 @@ int netloc_edge_destruct(netloc_edge_t * edge)
     utarray_free(edge->physical_links);
     utarray_free(edge->partitions);
 
-    for (int e = 0; e < netloc_edge_get_num_subedges(edge); e++) {
+    for (unsigned int e = 0; e < netloc_edge_get_num_subedges(edge); e++) {
         netloc_edge_t *subedge;
         subedge = netloc_edge_get_subedge(edge, e);
         netloc_edge_destruct(subedge);
@@ -77,7 +77,7 @@ void netloc_edge_reset_uid(void)
 
 int netloc_edge_is_in_partition(netloc_edge_t *edge, int partition)
 {
-    for (int i = 0; i < netloc_get_num_partitions(edge); i++) {
+    for (unsigned int i = 0; i < netloc_get_num_partitions(edge); i++) {
         if (netloc_get_partition(edge, i) == partition)
             return 1;
     }

netloc/hwloc.c

@@ -101,7 +101,7 @@ int netloc_topology_read_hwloc(netloc_topology_t *topology, int num_nodes,
         }
 
         /* Add the hwloc topology */
-        int t = 0;
+        unsigned int t = 0;
         while (t < utarray_len(hwloc_topo_names) &&
                 strcmp(*(char **)utarray_eltptr(hwloc_topo_names, t), refname)) {
             t++;
@@ -164,7 +164,7 @@ int netloc_topology_read_hwloc(netloc_topology_t *topology, int num_nodes,
     topology->hwloc_topos = (hwloc_topology_t *)hwloc_topos->d;
 
     printf("%d hwloc topologies found:\n", utarray_len(topology->topos));
-    for (int p = 0; p < utarray_len(topology->topos); p++) {
+    for (unsigned int p = 0; p < utarray_len(topology->topos); p++) {
         printf("\t'%s'\n", *(char **)utarray_eltptr(topology->topos, p));
     }
 
@@ -228,7 +228,7 @@ int netloc_arch_node_get_hwloc_info(netloc_arch_node_t *arch_node)
     }
 
     /* List of PUs */
-    int max_os_index = 0;
+    unsigned int max_os_index = 0;
     UT_array *ordered_host_array;
     int *ordered_hosts;
     utarray_new(ordered_host_array, &ut_int_icd);

netloc/node.c

@@ -77,7 +77,7 @@ static int node_or_subnode_destruct(netloc_node_t * node, int is_node)
     }
 
     /* Subnodes */
-    for (int n = 0; n < utarray_len(node->subnodes); n++) {
+    for (unsigned int n = 0; n < utarray_len(node->subnodes); n++) {
         netloc_node_t *subnode = *(netloc_node_t **)
             utarray_eltptr(node->subnodes, n);
         node_or_subnode_destruct(subnode, 0);
@@ -119,7 +119,7 @@ char * netloc_node_pretty_print(netloc_node_t* node)
 
 int netloc_node_is_in_partition(netloc_node_t *node, int partition)
 {
-    for (int i = 0; i < netloc_get_num_partitions(node); i++) {
+    for (unsigned int i = 0; i < netloc_get_num_partitions(node); i++) {
         if (netloc_get_partition(node, i) == partition)
             return 1;
     }

netloc/topology.c

@@ -314,7 +314,7 @@ int netloc_topology_destruct(netloc_topology_t *topology)
     }
 
     /** Hwloc topology List */
-    for (int t = 0; t < utarray_len(topology->topos); t++) {
+    for (unsigned int t = 0; t < utarray_len(topology->topos); t++) {
         if (topology->hwloc_topos[t])
             hwloc_topology_destroy(topology->hwloc_topos[t]);
     }
@@ -334,7 +334,7 @@ int netloc_topology_find_partition_idx(netloc_topology_t *topology, char *partit
         return -1;
 
     /* Find the selected partition in the topology */
-    int p = 0;
+    unsigned int p = 0;
     int found = 0;
     while (p < utarray_len(topology->partitions)) {
         char *current_name = *(char **)utarray_eltptr(topology->partitions, p);

utils/netloc/draw/netloc_draw_to_json.c

@@ -296,7 +296,7 @@ static int handle_link(netloc_physical_link_t *link, json_t *json_links)
 
     json_t *json_partitions = json_array_new();
 
-    for (int p = 0; p < netloc_get_num_partitions(link); p++)
+    for (unsigned int p = 0; p < netloc_get_num_partitions(link); p++)
     {
         int partition = netloc_get_partition(link, p);
         json_array_add(json_partitions, json_int_new(partition));
@@ -324,7 +324,7 @@ static int handle_edge(netloc_edge_t *edge, json_t *json_edges)
 
     /* Links */
     json_t *json_links = json_array_new();
-    for (int l = 0; l < netloc_edge_get_num_links(edge); l++)
+    for (unsigned int l = 0; l < netloc_edge_get_num_links(edge); l++)
     {
         netloc_physical_link_t *link = netloc_edge_get_link(edge, l);
         json_array_add(json_links, json_int_new(link->id));
@@ -333,7 +333,7 @@ static int handle_edge(netloc_edge_t *edge, json_t *json_edges)
 
     /* Partition list */
     json_t *json_partitions = json_array_new();
-    for (int p = 0; p < netloc_get_num_partitions(edge); p++)
+    for (unsigned int p = 0; p < netloc_get_num_partitions(edge); p++)
     {
         int partition = netloc_get_partition(edge, p);
         json_array_add(json_partitions, json_int_new(partition));
@@ -342,7 +342,7 @@ static int handle_edge(netloc_edge_t *edge, json_t *json_edges)
 
     /* Subnode edges */
     json_t *json_subedges = json_array_new();
-    for (int s = 0; s < netloc_edge_get_num_subedges(edge); s++)
+    for (unsigned int s = 0; s < netloc_edge_get_num_subedges(edge); s++)
     {
         netloc_edge_t *subedge = netloc_edge_get_subedge(edge, s);
         json_array_add(json_subedges, json_int_new(subedge->id));
@@ -372,7 +372,7 @@ static int handle_node(netloc_node_t *node, json_t *json_nodes,
 
     /* Subnodes */
     json_t *json_subnodes = json_array_new();
-    for (int s = 0; s < netloc_node_get_num_subnodes(node); s++)
+    for (unsigned int s = 0; s < netloc_node_get_num_subnodes(node); s++)
     {
         netloc_node_t *subnode = netloc_node_get_subnode(node, s);
         handle_node(subnode, json_nodes, json_edges, 1);
@@ -391,7 +391,7 @@ static int handle_node(netloc_node_t *node, json_t *json_nodes,
 
     /* Partitions */
     json_t *json_partitions = json_array_new();
-    for (int p = 0; p < netloc_get_num_partitions(node); p++)
+    for (unsigned int p = 0; p < netloc_get_num_partitions(node); p++)
     {
         int partition = netloc_get_partition(node, p);
         json_array_add(json_partitions, json_int_new(partition));

utils/netloc/infiniband/netloc_ib_extract_dats.c

@@ -188,7 +188,7 @@ node_t *get_node(node_t **nodes, char *type, char *lid,
 static int find_other_physical_link(physical_link_t *link)
 {
     node_t *dest = link->dest;
-    int dest_port = link->ports[1];
+    unsigned int dest_port = link->ports[1];
 
     physical_link_t *other_link = (physical_link_t *)
         utarray_eltptr(dest->physical_links, dest_port-1);
@@ -288,7 +288,7 @@ int build_paths(void)
                     break;
                 }
 
-                int port = route_dest->port;
+                unsigned int port = route_dest->port;
                 link = (physical_link_t *)
                     utarray_eltptr(node_cur->physical_links, port-1);
                 utarray_push_back(found_links, &link);
@@ -431,7 +431,7 @@ int netloc_topology_set_partitions(void)
             if (node_dest->main_partition != partition)
                 continue;
 
-            for (int l = 0; l < utarray_len(path_dest->links); l++) {
+            for (unsigned int l = 0; l < utarray_len(path_dest->links); l++) {
                 physical_link_t *link = *(physical_link_t **)
                     utarray_eltptr(path_dest->links, l);
                 if (!link->partitions) {
@@ -605,7 +605,7 @@ int main(int argc, char **argv)
                 free(node->partitions);
 
                 /* Physical links */
-                for (int l = 0; l < utarray_len(node->physical_links); l++) {
+                for (unsigned int l = 0; l < utarray_len(node->physical_links); l++) {
                     physical_link_t *link = (physical_link_t *)
                         utarray_eltptr(node->physical_links, l);
                     free(link->width);
@@ -830,7 +830,7 @@ int read_discover(char *subnet, char *path, char *filename)
             link->parent_node = src_node;
             link->other_id = -1;
 
-            int port_idx = link->ports[0]-1;
+            unsigned int port_idx = link->ports[0]-1;
             /* NB: there is no function to set a specific index */
             if (port_idx+1 > utarray_len(src_node->physical_links)) {
                 utarray_insert(src_node->physical_links, link, port_idx);
@@ -878,8 +878,8 @@ int read_discover(char *subnet, char *path, char *filename)
     /* Find the link in the other way */
     node_t *node, *node_tmp;
     HASH_ITER(hh, nodes, node, node_tmp) {
-        int num_links = utarray_len(node->physical_links);
-        for (int i = 0; i <  num_links; i++) {
+        unsigned int num_links = utarray_len(node->physical_links);
+        for (unsigned int i = 0; i < num_links; i++) {
             physical_link_t *link = (physical_link_t *)
                 utarray_eltptr(node->physical_links, i);
             if (!link->dest)
@@ -902,7 +902,6 @@ char *partition_list_to_string(int *partition_list)
     char tmp[20];
     int max_length = num_partitions*(sprintf(tmp, "%d", num_partitions)+1)+1;
 
-    
     char *string = (char *)malloc(max_length*sizeof(char));
     string[0] = '\0';
     for (int p = 0; p < num_partitions; p++) {
@@ -953,15 +952,15 @@ int write_into_file(char *subnet, char *path, char *hwlocpath)
         edge_t *edge, *edge_tmp;
         fprintf(output, "%s", node->physical_id);
         HASH_ITER(hh, node->edges, edge, edge_tmp) {
-            int num_links = utarray_len(edge->physical_link_idx);
+            unsigned int num_links = utarray_len(edge->physical_link_idx);
             fprintf(output, ",%s,", edge->dest);
             fprintf(output, "%f,", edge->total_gbits);
             char *partition_str = partition_list_to_string(edge->partitions);
             fprintf(output, "%s,", partition_str);
             free(partition_str);
-            fprintf(output, "%d,", num_links);
-            for (int l = 0; l < num_links; l++) {
-                int link_idx = *(int *)utarray_eltptr(edge->physical_link_idx, l);
+            fprintf(output, "%u,", num_links);
+            for (unsigned int l = 0; l < num_links; l++) {
+                unsigned int link_idx = *(int *)utarray_eltptr(edge->physical_link_idx, l);
                 physical_link_t *link = (physical_link_t *)
                     utarray_eltptr(node->physical_links, link_idx);
                 fprintf(output, "%d,", link->int_id);
@@ -998,7 +997,7 @@ int write_into_file(char *subnet, char *path, char *hwlocpath)
             node_t *node_dest = path_dest->node;
             fprintf(output, "%s,%s",
                     node_src->physical_id, node_dest->physical_id);
-            for (int l = 0; l < utarray_len(path_dest->links); l++) {
+            for (unsigned int l = 0; l < utarray_len(path_dest->links); l++) {
                 physical_link_t *link = *(physical_link_t **)
                     utarray_eltptr(path_dest->links, l);
                 fprintf(output, ",%d", link->int_id);