cleaning some old surf tracing code

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

diff --git a/src/instr/private.h b/src/instr/private.h
index 3e2dcdf..c754646 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -109,8 +109,6 @@ void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h);
 void TRACE_surf_link_declaration (void *link, char *name, double bw, double lat);
 void TRACE_surf_link_set_bandwidth (double date, void *link, double bandwidth);
 void TRACE_surf_link_set_latency (double date, void *link, double latency);
 void TRACE_surf_link_declaration (void *link, char *name, double bw, double lat);
 void TRACE_surf_link_set_bandwidth (double date, void *link, double bandwidth);
 void TRACE_surf_link_set_latency (double date, void *link, double latency);

-void TRACE_surf_link_missing (void);
-void TRACE_msg_clean (void);

 void TRACE_surf_save_onelink (void);
 int TRACE_surf_link_is_traced (void *link);
 
 void TRACE_surf_save_onelink (void);
 int TRACE_surf_link_is_traced (void *link);
 

diff --git a/src/instr/smpi_instr.c b/src/instr/smpi_instr.c
index c5dceca..e36927a 100644 (file)
--- a/src/instr/smpi_instr.c
+++ b/src/instr/smpi_instr.c
@@ -61,7 +61,7 @@ void TRACE_smpi_start (void)
 
 void TRACE_smpi_end (void)
 {
 
 void TRACE_smpi_end (void)
 {

-  TRACE_msg_clean ();
+  TRACE_surf_finalize ();

   if (IS_TRACING_SMPI){
     TRACE_end();
   }
   if (IS_TRACING_SMPI){
     TRACE_end();
   }

diff --git a/src/instr/surf_instr.c b/src/instr/surf_instr.c
index ed7eed4..ca0f92a 100644 (file)
--- a/src/instr/surf_instr.c
+++ b/src/instr/surf_instr.c
@@ -34,10 +34,20 @@ void TRACE_surf_init (void)
 
 void TRACE_surf_finalize (void)
 {
 
 void TRACE_surf_finalize (void)
 {

+  char *key, *value;
+  xbt_dict_cursor_t cursor = NULL;

   __TRACE_surf_resource_utilization_finalize();
   __TRACE_surf_resource_utilization_finalize();

+
+  /* get all host from host_containers */
+  xbt_dict_foreach(host_containers, cursor, key, value) {
+    pajeDestroyContainer (MSG_get_clock(), "HOST", key);
+  }
+  xbt_dict_foreach(created_links, cursor, key, value) {
+    pajeDestroyContainer (MSG_get_clock(), "LINK", key);
+  }

 }
 
 }
 

-static void __TRACE_surf_set_resource_variable (double date, const char *variable, const char *resource, double value)
+static void TRACE_surf_set_resource_variable (double date, const char *variable, const char *resource, double value)

 {
        char aux[100], key[100];
        char *last_value = NULL;
 {
        char aux[100], key[100];
        char *last_value = NULL;


@@ -98,7 +108,7 @@ 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_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);

 }
 
 void TRACE_surf_link_set_bandwidth (double date, void *link, double bandwidth)
 }
 
 void TRACE_surf_link_set_bandwidth (double date, void *link, double bandwidth)


@@ -107,7 +117,7 @@ void TRACE_surf_link_set_bandwidth (double date, void *link, double bandwidth)
 
   char resource[100];
   snprintf (resource, 100, "%p", link);
 
   char resource[100];
   snprintf (resource, 100, "%p", link);

-  __TRACE_surf_set_resource_variable (date, "bandwidth", resource, bandwidth);
+  TRACE_surf_set_resource_variable (date, "bandwidth", resource, bandwidth);

 }
 
 void TRACE_surf_link_set_latency (double date, void *link, double latency)
 }
 
 void TRACE_surf_link_set_latency (double date, void *link, double latency)


@@ -116,7 +126,7 @@ void TRACE_surf_link_set_latency (double date, void *link, double latency)
 
   char resource[100];
   snprintf (resource, 100, "%p", link);
 
   char resource[100];
   snprintf (resource, 100, "%p", link);

-  __TRACE_surf_set_resource_variable (date, "latency", resource, latency);
+  TRACE_surf_set_resource_variable (date, "latency", resource, latency);

 }
 
 /* to trace gtnets */
 }
 
 /* to trace gtnets */


@@ -171,29 +181,6 @@ void TRACE_surf_gtnets_destroy (void *action)
   xbt_dict_remove (gtnets_dst, key);
 }
 
   xbt_dict_remove (gtnets_dst, key);
 }
 

-void TRACE_surf_link_missing (void)
-{
-  CRITICAL0("The trace cannot be done because "
-                "the platform you are using contains "
-                "routes with more than one link.");
-  THROW0(tracing_error, TRACE_ERROR_COMPLEX_ROUTES, "Tracing failed");
-}
-
-void TRACE_msg_clean (void)
-{
-  char *key, *value;
-  xbt_dict_cursor_t cursor = NULL;
-  TRACE_surf_finalize();
-
-  /* get all host from host_containers */
-  xbt_dict_foreach(host_containers, cursor, key, value) {
-    pajeDestroyContainer (MSG_get_clock(), "HOST", key);
-  }
-  xbt_dict_foreach(created_links, cursor, key, value) {
-    pajeDestroyContainer (MSG_get_clock(), "LINK", key);
-  }
-}
-

 void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h)
 {
        char valuestr[100];
 void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h)
 {
        char valuestr[100];

diff --git a/src/msg/global.c b/src/msg/global.c
index 7933918..f874911 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -190,7 +190,7 @@ MSG_error_t MSG_clean(void)
   m_process_t p = NULL;
 
 #ifdef HAVE_TRACING
   m_process_t p = NULL;
 
 #ifdef HAVE_TRACING

-  TRACE_msg_clean ();
+  TRACE_surf_finalize();

 #endif
 
   while ((p = xbt_fifo_pop(msg_global->process_list))) {
 #endif
 
   while ((p = xbt_fifo_pop(msg_global->process_list))) {