renaming more tracing functions

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7615 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/instr/private.h b/src/instr/private.h
index 8c3d72e..6c75cf3 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -109,15 +109,15 @@ void __TRACE_surf_set_resource_variable (double date, const char *variable, cons
 void TRACE_surf_host_declaration (char *name, double power);
 void TRACE_surf_host_set_power (double date, char *resource, double power);
 void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
+void TRACE_surf_host_define_id (const char *name, int host_id);
+void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h);
 void TRACE_surf_link_declaration (char *name, double bw, double lat);
 void TRACE_surf_link_set_bandwidth (double date, char *resource, double bandwidth);
 void TRACE_surf_link_set_latency (double date, char *resource, double latency);
 void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
-void TRACE_surf_routing_full_parse_end (char *link_name, int src, int dst);
-void TRACE_surf_missing_link (void);
-void TRACE_surf_define_host_id (const char *name, int host_id);
+void TRACE_surf_link_save_endpoints (char *link_name, int src, int dst);
+void TRACE_surf_link_missing (void);
 void TRACE_msg_clean (void);
-void TRACE_surf_vivaldi_parse_host (char *host, double x, double y, double h);
 
 //for tracing gtnets
 void TRACE_surf_gtnets_communicate (void *action, int src, int dst);

diff --git a/src/instr/surf_instr.c b/src/instr/surf_instr.c
index 966f44e..dab2f8c 100644 (file)
--- a/src/instr/surf_instr.c
+++ b/src/instr/surf_instr.c
@@ -246,7 +246,7 @@ void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action,
   if (value == 0) return;
 
   if (!xbt_dict_get_or_null (created_links, name)){
-    TRACE_surf_missing_link ();
+    TRACE_surf_link_missing ();
     return;
   }
 
@@ -294,7 +294,7 @@ void TRACE_surf_host_declaration (char *name, double power)
   __TRACE_surf_set_resource_variable (SIMIX_get_clock(), "power", name, power);
 }
 
-void TRACE_surf_routing_full_parse_end (char *link_name, int src, int dst)
+void TRACE_surf_link_save_endpoints (char *link_name, int src, int dst)
 {
   if (!IS_TRACING) return;
   char srcidstr[100], dstidstr[100];
@@ -338,7 +338,7 @@ void TRACE_surf_link_set_latency (double date, char *resource, double latency)
   __TRACE_surf_set_resource_variable (date, "latency", resource, latency);
 }
 
-void TRACE_surf_define_host_id (const char *name, int host_id)
+void TRACE_surf_host_define_id (const char *name, int host_id)
 {
   if (!IS_TRACING) return;
   char strid[100];
@@ -397,7 +397,7 @@ void TRACE_surf_gtnets_destroy (void *action)
   xbt_dict_remove (gtnets_dst, key);
 }
 
-void TRACE_surf_missing_link (void)
+void TRACE_surf_link_missing (void)
 {
   CRITICAL0("The trace cannot be done because "
                 "the platform you are using contains "
@@ -418,7 +418,7 @@ void TRACE_msg_clean (void)
   }
 }
 
-void TRACE_surf_vivaldi_parse_host (char *host, double x, double y, double h)
+void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h)
 {
   if (!IS_TRACING || !IS_TRACING_PLATFORM) return;
 

diff --git a/src/surf/network_vivaldi.c b/src/surf/network_vivaldi.c
index a3b5294..2d820c9 100644 (file)
--- a/src/surf/network_vivaldi.c
+++ b/src/surf/network_vivaldi.c
@@ -217,7 +217,7 @@ static void netviva_parse_host(void) {
   coord->h = atof(xbt_dynar_get_as(ctn, 2, char*));
 
 #ifdef HAVE_TRACING
-  TRACE_surf_vivaldi_parse_host (A_surfxml_host_id, coord->x, coord->y, coord->h);
+  TRACE_surf_host_vivaldi_parse (A_surfxml_host_id, coord->x, coord->y, coord->h);
 #endif
 
   xbt_dynar_free(&ctn);

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index cfb7bb4..a06925c 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -88,7 +88,7 @@ static void routing_full_parse_Shost(void) {
   *val = used_routing->host_count++;
   xbt_dict_set(used_routing->host_id,A_surfxml_host_id,val,xbt_free);
 #ifdef HAVE_TRACING
-  TRACE_surf_define_host_id (A_surfxml_host_id, *val);
+  TRACE_surf_host_define_id (A_surfxml_host_id, *val);
 #endif
 }
 
@@ -99,7 +99,7 @@ static void routing_full_parse_Srouter(void) {
   *val = HOST2ROUTER(used_routing->router_count++);
   xbt_dict_set(used_routing->host_id,A_surfxml_router_id,val,xbt_free);
 #ifdef HAVE_TRACING
-  TRACE_surf_define_host_id (A_surfxml_host_id, *val);
+  TRACE_surf_host_define_id (A_surfxml_host_id, *val);
   TRACE_surf_host_declaration (A_surfxml_host_id, 0);
 #endif
 }
@@ -318,7 +318,7 @@ static void routing_full_parse_end(void) {
       DEBUG3("Adding onelink route from (#%d) to (#%d), link_name %s",src_id, dst_id, link_name);
       xbt_dict_set(onelink_routes, link_name, (void *)new_link, onelink_route_elem_free);
 #ifdef HAVE_TRACING
-      TRACE_surf_routing_full_parse_end (link_name, src_id, dst_id);
+      TRACE_surf_link_save_endpoints (link_name, src_id, dst_id);
 #endif
     }