rename a field for cosmetics

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index c33ed89..8851dd6 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -584,8 +584,8 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer)
   /* Change from the defaults */
   if (peer->state_trace)
     host->pimpl_cpu->setStateTrace(peer->state_trace);
-  if (peer->availability_trace)
-    host->pimpl_cpu->setSpeedTrace(peer->availability_trace);
+  if (peer->speed_trace)
+    host->pimpl_cpu->setSpeedTrace(peer->speed_trace);
 }
 
 void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index 4ec9581..61dfdd0 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -82,7 +82,7 @@ typedef struct s_sg_platf_peer_cbarg {
   double bw_out;
   double lat;
   const char* coord;
-  tmgr_trace_t availability_trace;
+  tmgr_trace_t speed_trace;
   tmgr_trace_t state_trace;
 } s_sg_platf_peer_cbarg_t;
 

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index c8c643a..eb2f63c 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -642,14 +642,14 @@ void STag_surfxml_peer(){
   parse_after_config();
   s_sg_platf_peer_cbarg_t peer;
   memset(&peer,0,sizeof(peer));
-  peer.id                 = A_surfxml_peer_id;
-  peer.speed              = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id);
-  peer.bw_in              = surf_parse_get_bandwidth(A_surfxml_peer_bw___in, "bw_in of peer", peer.id);
-  peer.bw_out             = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id);
-  peer.lat                = surf_parse_get_time(A_surfxml_peer_lat, "lat of peer", peer.id);
-  peer.coord              = A_surfxml_peer_coordinates;
-  peer.availability_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr;
-  peer.state_trace        = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr;
+  peer.id          = A_surfxml_peer_id;
+  peer.speed       = surf_parse_get_speed(A_surfxml_peer_speed, "speed of peer", peer.id);
+  peer.bw_in       = surf_parse_get_bandwidth(A_surfxml_peer_bw___in, "bw_in of peer", peer.id);
+  peer.bw_out      = surf_parse_get_bandwidth(A_surfxml_peer_bw___out, "bw_out of peer", peer.id);
+  peer.lat         = surf_parse_get_time(A_surfxml_peer_lat, "lat of peer", peer.id);
+  peer.coord       = A_surfxml_peer_coordinates;
+  peer.speed_trace = A_surfxml_peer_availability___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_availability___file) : nullptr;
+  peer.state_trace = A_surfxml_peer_state___file[0] ? tmgr_trace_new_from_file(A_surfxml_peer_state___file) : nullptr;
 
   sg_platf_new_peer(&peer);
 }