renaming some tracing functions to make easy to remember what they do

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

diff --git a/src/instr/private.h b/src/instr/private.h
index b0a78f5..a364c59 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -109,9 +109,9 @@ void __TRACE_surf_set_resource_variable (double date, const char *variable, cons
 void TRACE_surf_update_action_state (void *surf_action, smx_action_t smx_action, double value, const char *stateValue, double now, double delta);
 void TRACE_surf_update_action_state_net_resource (const char *name, smx_action_t smx_action, double value, double now, double delta);
 void TRACE_surf_update_action_state_cpu_resource (const char *name, smx_action_t smx_action, double value, double now, double delta);
 void TRACE_surf_update_action_state (void *surf_action, smx_action_t smx_action, double value, const char *stateValue, double now, double delta);
 void TRACE_surf_update_action_state_net_resource (const char *name, smx_action_t smx_action, double value, double now, double delta);
 void TRACE_surf_update_action_state_cpu_resource (const char *name, smx_action_t smx_action, double value, double now, double delta);

-void TRACE_surf_net_link_new (char *name, double bw, double lat);
-void TRACE_surf_cpu_new (char *name, double power);
-void TRACE_surf_cpu_set_power (double date, char *resource, double power);
+void TRACE_surf_link_declaration (char *name, double bw, double lat);
+void TRACE_surf_host_declaration (char *name, double power);
+void TRACE_surf_host_set_power (double date, char *resource, double power);

 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_routing_full_parse_end (char *link_name, int src, int dst);
 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_routing_full_parse_end (char *link_name, int src, int dst);

diff --git a/src/instr/surf_instr.c b/src/instr/surf_instr.c
index e1b6990..f1afcef 100644 (file)
--- a/src/instr/surf_instr.c
+++ b/src/instr/surf_instr.c
@@ -275,7 +275,7 @@ void TRACE_surf_update_action_state_cpu_resource (const char *name, smx_action_t
   return;
 }
 
   return;
 }
 

-void TRACE_surf_net_link_new (char *name, double bw, double lat)
+void TRACE_surf_link_declaration (char *name, double bw, double lat)

 {
   if (!IS_TRACING) return;
   //if (IS_TRACING_PLATFORM) pajeCreateContainerWithBandwidthLatency (SIMIX_get_clock(), name, "LINK", "platform", name, bw, lat);
 {
   if (!IS_TRACING) return;
   //if (IS_TRACING_PLATFORM) pajeCreateContainerWithBandwidthLatency (SIMIX_get_clock(), name, "LINK", "platform", name, bw, lat);


@@ -289,7 +289,7 @@ void TRACE_surf_net_link_new (char *name, double bw, double lat)
   xbt_dict_set (link_latency, xbt_strdup(name), lat_ptr, xbt_free);
 }
 
   xbt_dict_set (link_latency, xbt_strdup(name), lat_ptr, xbt_free);
 }
 

-void TRACE_surf_cpu_new (char *name, double power)
+void TRACE_surf_host_declaration (char *name, double power)

 {
   if (!IS_TRACING) return;
   if (IS_TRACING_PLATFORM){
 {
   if (!IS_TRACING) return;
   if (IS_TRACING_PLATFORM){


@@ -328,7 +328,7 @@ void TRACE_surf_routing_full_parse_end (char *link_name, int src, int dst)
   }
 }
 
   }
 }
 

-void TRACE_surf_cpu_set_power (double date, char *resource, double power)
+void TRACE_surf_host_set_power (double date, char *resource, double power)

 {
   __TRACE_surf_set_resource_variable (date, "power", resource, power);
 }
 {
   __TRACE_surf_set_resource_variable (date, "power", resource, power);
 }

diff --git a/src/surf/cpu.c b/src/surf/cpu.c
index ce88542..443493d 100644 (file)
--- a/src/surf/cpu.c
+++ b/src/surf/cpu.c
@@ -63,7 +63,7 @@ static cpu_Cas01_t cpu_new(char *name, double power_peak,
   xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
                surf_resource_free);
 #ifdef HAVE_TRACING
   xbt_dict_set(surf_model_resource_set(surf_cpu_model), name, cpu,
                surf_resource_free);
 #ifdef HAVE_TRACING

-  TRACE_surf_cpu_new (name, cpu->power_scale * cpu->power_peak);
+  TRACE_surf_host_declaration (name, cpu->power_scale * cpu->power_peak);

 #endif
 
   return cpu;
 #endif
 
   return cpu;


@@ -230,7 +230,7 @@ static void cpu_update_resource_state(void *id,
     lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
                                 cpu->power_scale * cpu->power_peak);
 #ifdef HAVE_TRACING
     lmm_update_constraint_bound(cpu_maxmin_system, cpu->constraint,
                                 cpu->power_scale * cpu->power_peak);
 #ifdef HAVE_TRACING

-    TRACE_surf_cpu_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);
+    TRACE_surf_host_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);

 #endif
     if (tmgr_trace_event_free(event_type))
       cpu->power_event = NULL;
 #endif
     if (tmgr_trace_event_free(event_type))
       cpu->power_event = NULL;

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 92e8742..5c4c58a 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -54,7 +54,7 @@ static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak,
                               xbt_dict_t cpu_properties)
 {
 #ifdef HAVE_TRACING
                               xbt_dict_t cpu_properties)
 {
 #ifdef HAVE_TRACING

-  TRACE_surf_cpu_new (name, power_scale * power_peak);
+  TRACE_surf_host_declaration (name, power_scale * power_peak);

 #endif
 
   cpu_Cas01_im_t cpu = xbt_new0(s_cpu_Cas01_im_t, 1);
 #endif
 
   cpu_Cas01_im_t cpu = xbt_new0(s_cpu_Cas01_im_t, 1);


@@ -333,7 +333,7 @@ static void cpu_im_update_resource_state(void *id,
     lmm_update_constraint_bound(cpu_im_maxmin_system, cpu->constraint,
                                 cpu->power_scale * cpu->power_peak);
 #ifdef HAVE_TRACING
     lmm_update_constraint_bound(cpu_im_maxmin_system, cpu->constraint,
                                 cpu->power_scale * cpu->power_peak);
 #ifdef HAVE_TRACING

-    TRACE_surf_cpu_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);
+    TRACE_surf_host_set_power (date, cpu->generic_resource.name, cpu->power_scale * cpu->power_peak);

 #endif
     xbt_swag_insert(cpu, cpu_im_modified_cpu);
     if (tmgr_trace_event_free(event_type))
 #endif
     xbt_swag_insert(cpu, cpu_im_modified_cpu);
     if (tmgr_trace_event_free(event_type))

diff --git a/src/surf/network.c b/src/surf/network.c
index 34fa453..e867afd 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -57,7 +57,7 @@ static link_CM02_t net_link_new(char *name,
   xbt_dict_set(surf_network_model->resource_set, name, nw_link,
                surf_resource_free);
 #ifdef HAVE_TRACING
   xbt_dict_set(surf_network_model->resource_set, name, nw_link,
                surf_resource_free);
 #ifdef HAVE_TRACING

-  TRACE_surf_net_link_new (name, bw_initial, lat_initial);
+  TRACE_surf_link_declaration (name, bw_initial, lat_initial);

 #endif
 
   return nw_link;
 #endif
 
   return nw_link;

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 57355b7..b0f62c3 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -39,7 +39,7 @@ static void link_new(char *name, double bw, double lat, xbt_dict_t props)
   gtnets_link->lat_current = lat;
   gtnets_link->id = link_count;
 #ifdef HAVE_TRACING
   gtnets_link->lat_current = lat;
   gtnets_link->id = link_count;
 #ifdef HAVE_TRACING

-  TRACE_surf_net_link_new (name, bw, lat);
+  TRACE_surf_link_declaration (name, bw, lat);

 #endif
   xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
                surf_resource_free);
 #endif
   xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
                surf_resource_free);

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 0a1f16a..cfb7bb4 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -100,7 +100,7 @@ static void routing_full_parse_Srouter(void) {
   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);
   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_cpu_new (A_surfxml_host_id, 0);
+  TRACE_surf_host_declaration (A_surfxml_host_id, 0);

 #endif
 }
 
 #endif
 }