rename the datacontainers allowing the trace:connect tag

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 0cc2122..35d3219 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -976,11 +976,10 @@ XBT_PUBLIC(void) parse_platform_file(const char *file);
 /* For the trace and trace:connect tag (store their content till the end of the parsing) */
 XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_speed;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
-
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_bw;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_lat;
 
 XBT_PUBLIC(double) get_cpu_speed(const char *power);
 

diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index ff78c5c..8db9a03 100644 (file)
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -126,7 +126,7 @@ void CpuCas01Model::addTraces()
     host->p_stateEvent = future_evt_set->add_trace(trace, 0.0, host);
   }
 
-  xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
+  xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
     CpuCas01 *host = static_cast<CpuCas01*>(sg_host_by_name(elm)->pimpl_cpu);
 

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index c50f2f8..3bcecbf 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -508,7 +508,7 @@ void CpuTiModel::addTraces()
     cpu->p_stateEvent = future_evt_set->add_trace(trace, 0.0, cpu);
   }
 
-  xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
+  xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
     CpuTi *cpu = static_cast<CpuTi*>(sg_host_by_name(elm)->pimpl_cpu);
 

diff --git a/src/surf/host_ptask_L07.cpp b/src/surf/host_ptask_L07.cpp
index 5f77143..4e11d53 100644 (file)
--- a/src/surf/host_ptask_L07.cpp
+++ b/src/surf/host_ptask_L07.cpp
@@ -354,7 +354,7 @@ void HostL07Model::addTraces()
     host->p_stateEvent = future_evt_set->add_trace(trace, 0.0, host);
   }
 
-  xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
+  xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
     CpuL07 *host = static_cast<CpuL07*>(sg_host_by_name(elm)->pimpl_cpu);
 
@@ -375,7 +375,7 @@ void HostL07Model::addTraces()
     link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 
-  xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
+  xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
     LinkL07 *link = static_cast<LinkL07*>(Link::byName(elm));
 
@@ -385,7 +385,7 @@ void HostL07Model::addTraces()
     link->p_bwEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 
-  xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
+  xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
     LinkL07 *link = static_cast<LinkL07*>(Link::byName(elm));
 

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 514c883..28e3616 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -482,7 +482,7 @@ void NetworkCm02Model::addTraces(){
     link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 
-  xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
+  xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
     NetworkCm02Link *link = static_cast<NetworkCm02Link*>( Link::byName(elm) );
 
@@ -495,7 +495,7 @@ void NetworkCm02Model::addTraces(){
     link->p_speed.event = future_evt_set->add_trace(trace, 0.0, link);
   }
 
-  xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
+  xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) {
     tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
     NetworkCm02Link *link = static_cast<NetworkCm02Link*>(Link::byName(elm));;
 

diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index 3ca6f61..85fc8e0 100644 (file)
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -74,10 +74,10 @@ enum heap_action_type{
 /* For the trace and trace:connect tag (store their content till the end of the parsing) */
 XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_speed;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth;
-XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_bw;
+XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_lat;
 
 /**********
  * Action *

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 8ff7606..7ce56b2 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -227,7 +227,7 @@ void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
         xbt_strdup(trace_connect->element), NULL);
     break;
   case SURF_TRACE_CONNECT_KIND_POWER:
-    xbt_dict_set(trace_connect_list_power, trace_connect->trace,
+    xbt_dict_set(trace_connect_list_host_speed, trace_connect->trace,
         xbt_strdup(trace_connect->element), NULL);
     break;
   case SURF_TRACE_CONNECT_KIND_LINK_AVAIL:
@@ -236,12 +236,12 @@ void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
         xbt_strdup(trace_connect->element), NULL);
     break;
   case SURF_TRACE_CONNECT_KIND_BANDWIDTH:
-    xbt_dict_set(trace_connect_list_bandwidth,
+    xbt_dict_set(trace_connect_list_link_bw,
         trace_connect->trace,
         xbt_strdup(trace_connect->element), NULL);
     break;
   case SURF_TRACE_CONNECT_KIND_LATENCY:
-    xbt_dict_set(trace_connect_list_latency, trace_connect->trace,
+    xbt_dict_set(trace_connect_list_link_lat, trace_connect->trace,
         xbt_strdup(trace_connect->element), NULL);
     break;
   default:

diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c
index 1bfcdf4..98031c6 100644 (file)
--- a/src/surf/surfxml_parseplatf.c
+++ b/src/surf/surfxml_parseplatf.c
@@ -62,10 +62,10 @@ void surfxml_bufferstack_pop(int new)
 
 xbt_dict_t traces_set_list = NULL;
 xbt_dict_t trace_connect_list_host_avail = NULL;
-xbt_dict_t trace_connect_list_power = NULL;
+xbt_dict_t trace_connect_list_host_speed = NULL;
 xbt_dict_t trace_connect_list_link_avail = NULL;
-xbt_dict_t trace_connect_list_bandwidth = NULL;
-xbt_dict_t trace_connect_list_latency = NULL;
+xbt_dict_t trace_connect_list_link_bw = NULL;
+xbt_dict_t trace_connect_list_link_lat = NULL;
 
 /* ***************************************** */
 
@@ -123,10 +123,10 @@ void parse_platform_file(const char *file)
 
     traces_set_list = xbt_dict_new_homogeneous(NULL);
     trace_connect_list_host_avail = xbt_dict_new_homogeneous(free);
-    trace_connect_list_power = xbt_dict_new_homogeneous(free);
+    trace_connect_list_host_speed = xbt_dict_new_homogeneous(free);
     trace_connect_list_link_avail = xbt_dict_new_homogeneous(free);
-    trace_connect_list_bandwidth = xbt_dict_new_homogeneous(free);
-    trace_connect_list_latency = xbt_dict_new_homogeneous(free);
+    trace_connect_list_link_bw = xbt_dict_new_homogeneous(free);
+    trace_connect_list_link_lat = xbt_dict_new_homogeneous(free);
 
     /* Init my data */
     if (!surfxml_bufferstack_stack)
@@ -137,10 +137,10 @@ void parse_platform_file(const char *file)
 
     /* Free my data */
     xbt_dict_free(&trace_connect_list_host_avail);
-    xbt_dict_free(&trace_connect_list_power);
+    xbt_dict_free(&trace_connect_list_host_speed);
     xbt_dict_free(&trace_connect_list_link_avail);
-    xbt_dict_free(&trace_connect_list_bandwidth);
-    xbt_dict_free(&trace_connect_list_latency);
+    xbt_dict_free(&trace_connect_list_link_bw);
+    xbt_dict_free(&trace_connect_list_link_lat);
     xbt_dict_free(&traces_set_list);
     xbt_dict_free(&random_data_list);
     xbt_dynar_free(&surfxml_bufferstack_stack);