Simply say fun_ptr(...) instead of (*fun_ptr)(...).

[simgrid.git] / src / surf / surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 0db7e19..cb3c7e3 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -100,7 +100,7 @@ static void parse_S_host(sg_platf_host_cbarg_t host)
   xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL),
              "Reading a host, processing unit \"%s\" already exists", host->id);
 
-  (*(current_routing->parse_PU)) (current_routing, host->id);
+  current_routing->parse_PU(current_routing, host->id);
   info = xbt_new0(s_network_element_info_t, 1);
   info->rc_component = current_routing;
   info->rc_type = SURF_NETWORK_ELEMENT_HOST;
@@ -127,7 +127,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router)
              "Reading a router, processing unit \"%s\" already exists",
              router->id);
 
-  (*(current_routing->parse_PU)) (current_routing, router->id);
+  current_routing->parse_PU(current_routing, router->id);
   info = xbt_new0(s_network_element_info_t, 1);
   info->rc_component = current_routing;
   info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
@@ -231,7 +231,7 @@ static void routing_parse_E_route(void)
   xbt_assert(current_routing->parse_route,
              "no defined method \"set_route\" in \"%s\"",
              current_routing->name);
-  (*(current_routing->parse_route)) (current_routing, src, dst, route);
+  current_routing->parse_route(current_routing, src, dst, route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -249,7 +249,7 @@ static void routing_parse_E_ASroute(void)
   xbt_assert(current_routing->parse_ASroute,
              "no defined method \"set_ASroute\" in \"%s\"",
              current_routing->name);
-  (*(current_routing->parse_ASroute)) (current_routing, src, dst, e_route);
+  current_routing->parse_ASroute(current_routing, src, dst, e_route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -269,7 +269,7 @@ static void routing_parse_E_bypassRoute(void)
   xbt_assert(current_routing->parse_bypassroute,
              "Bypassing mechanism not implemented by routing '%s'",
              current_routing->name);
-  (*(current_routing->parse_bypassroute)) (current_routing, src, dst, e_route);
+  current_routing->parse_bypassroute(current_routing, src, dst, e_route);
   link_list = NULL;
   src = NULL;
   dst = NULL;
@@ -311,7 +311,7 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
   }
 
   /* make a new routing component */
-  new_as = (AS_t) (*(model->create)) ();
+  new_as = (AS_t) model->create();
   new_as->model_desc = model;
   new_as->hierarchy = SURF_ROUTING_NULL;
   new_as->name = xbt_strdup(AS_id);
@@ -336,7 +336,7 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
     xbt_dict_set(current_routing->routing_sons, AS_id,
                  (void *) new_as, NULL);
     /* add to the father element list */
-    (*(current_routing->parse_AS)) (current_routing, AS_id);
+    current_routing->parse_AS(current_routing, AS_id);
   } else {
     THROWF(arg_error, 0, "All defined components must be belong to a AS");
   }
@@ -372,7 +372,7 @@ void routing_AS_end()
                 (void *) info);
 
     if (current_routing->model_desc->end)
-      (*(current_routing->model_desc->end)) (current_routing);
+      current_routing->model_desc->end(current_routing);
     current_routing = current_routing->routing_father;
   }
 }
@@ -761,6 +761,11 @@ static void routing_parse_cluster(void)
   s_sg_platf_host_cbarg_t host;
   s_sg_platf_link_cbarg_t link;
 
+  unsigned int iter;
+  int start, end, i;
+  xbt_dynar_t radical_elements;
+  xbt_dynar_t radical_ends;
+
   if (strcmp(struct_cluster->availability_trace, "")
       || strcmp(struct_cluster->state_trace, "")) {
     patterns = xbt_dict_new();
@@ -769,10 +774,6 @@ static void routing_parse_cluster(void)
     xbt_dict_set(patterns, "suffix", xbt_strdup(struct_cluster->suffix), free);
   }
 
-  unsigned int iter;
-  int start, end, i;
-  xbt_dynar_t radical_elements;
-  xbt_dynar_t radical_ends;
 
   XBT_DEBUG("<AS id=\"%s\"\trouting=\"Cluster\">", struct_cluster->id);
   sg_platf_new_AS_begin(struct_cluster->id, "Cluster");
@@ -780,7 +781,6 @@ static void routing_parse_cluster(void)
   //Make all hosts
   radical_elements = xbt_str_split(struct_cluster->radical, ",");
   xbt_dynar_foreach(radical_elements, iter, groups) {
-    memset(&host, 0, sizeof(host));
 
     radical_ends = xbt_str_split(groups, "-");
     start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
@@ -801,25 +801,25 @@ static void routing_parse_cluster(void)
           bprintf("%s%d%s", struct_cluster->prefix, i, struct_cluster->suffix);
       link_id = bprintf("%s_link_%d", struct_cluster->id, i);
 
-      XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id,
-                struct_cluster->power);
+      XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, struct_cluster->power);
+
+      memset(&host, 0, sizeof(host));
       host.id = host_id;
       if (strcmp(struct_cluster->availability_trace, "")) {
         xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
-        char *tmp_availability_file =
-            xbt_str_varsubst(struct_cluster->availability_trace, patterns);
-        XBT_DEBUG("\tavailability_file=\"%s\"", tmp_availability_file);
-        host.power_trace = tmgr_trace_new(tmp_availability_file);
-        xbt_free(tmp_availability_file);
+        char *avail_file = xbt_str_varsubst(struct_cluster->availability_trace, patterns);
+        XBT_DEBUG("\tavailability_file=\"%s\"", avail_file);
+        host.power_trace = tmgr_trace_new(avail_file);
+        xbt_free(avail_file);
       } else {
         XBT_DEBUG("\tavailability_file=\"\"");
       }
+
       if (strcmp(struct_cluster->state_trace, "")) {
-        char *tmp_state_file =
-            xbt_str_varsubst(struct_cluster->state_trace, patterns);
-        XBT_DEBUG("\tstate_file=\"%s\"", tmp_state_file);
-        host.state_trace = tmgr_trace_new(tmp_state_file);
-        xbt_free(tmp_state_file);
+        char *avail_file = xbt_str_varsubst(struct_cluster->state_trace, patterns);
+        XBT_DEBUG("\tstate_file=\"%s\"", avail_file);
+        host.state_trace = tmgr_trace_new(avail_file);
+        xbt_free(avail_file);
       } else {
         XBT_DEBUG("\tstate_file=\"\"");
       }
@@ -884,11 +884,12 @@ static void routing_parse_cluster(void)
   }
   xbt_dynar_free(&radical_elements);
 
-  // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, and it's very useful to connect clusters together
+  // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written,
+  // and it's very useful to connect clusters together
   XBT_DEBUG(" ");
   XBT_DEBUG("<router id=\"%s\"/>", struct_cluster->router_id);
-  s_sg_platf_router_cbarg_t router;
   char *newid = NULL;
+  s_sg_platf_router_cbarg_t router;
   memset(&router, 0, sizeof(router));
   router.id = struct_cluster->router_id;
   router.coord = "";