X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a59892e02855ae21ccf6abd4925d962f81b384b2..38125269905f14713309a1fc3cb3dbeb6e664c0f:/src/surf/ptask_L07.cpp

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index 408873cd3f..1a8eaaaa35 100644
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -20,13 +20,6 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
 /**************************************/
 /*** Resource Creation & Destruction **/
 /**************************************/
-
-static void ptask_netlink_parse_init(sg_platf_link_cbarg_t link)
-{
-  netlink_parse_init(link);
-  current_property_set = NULL;
-}
-
 void surf_host_model_init_ptask_L07(void)
 {
   XBT_CINFO(xbt_cfg,"Switching to the L07 model to handle parallel tasks.");
@@ -34,7 +27,7 @@ void surf_host_model_init_ptask_L07(void)
   xbt_assert(!surf_network_model, "network model type already defined");
 
   // Define the callbacks to parse the XML
-  simgrid::surf::on_link.connect(ptask_netlink_parse_init);
+  simgrid::surf::on_link.connect(netlink_parse_init);
 
   surf_host_model = new simgrid::surf::HostL07Model();
   xbt_dynar_push(all_existing_models, &surf_host_model);
@@ -313,10 +306,10 @@ CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host,
   p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPeakList,0,double));
 
   if (speedTrace)
-    p_speed.event = future_evt_set->add_trace(speedTrace, 0.0, this);
+    speed_.event = future_evt_set->add_trace(speedTrace, 0.0, this);
 
   if (state_trace)
-    p_stateEvent = future_evt_set->add_trace(state_trace, 0.0, this);
+    stateEvent_ = future_evt_set->add_trace(state_trace, 0.0, this);
 }
 
 CpuL07::~CpuL07()
@@ -365,14 +358,14 @@ void CpuL07::onSpeedChange() {
   lmm_variable_t var = NULL;
   lmm_element_t elem = NULL;
 
-    lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), p_speed.peak * p_speed.scale);
+    lmm_update_constraint_bound(getModel()->getMaxminSystem(), getConstraint(), speed_.peak * speed_.scale);
     while ((var = lmm_get_var_from_cnst
             (getModel()->getMaxminSystem(), getConstraint(), &elem))) {
       Action *action = static_cast<Action*>(lmm_variable_id(var));
 
       lmm_update_variable_bound(getModel()->getMaxminSystem(),
                                 action->getVariable(),
-                                p_speed.scale * p_speed.peak);
+                                speed_.scale * speed_.peak);
     }
 
   Cpu::onSpeedChange();
@@ -385,17 +378,17 @@ bool LinkL07::isUsed(){
 
 void CpuL07::apply_event(tmgr_trace_iterator_t triggered, double value){
   XBT_DEBUG("Updating cpu %s (%p) with value %g", getName(), this, value);
-  if (triggered == p_speed.event) {
-    p_speed.scale = value;
+  if (triggered == speed_.event) {
+    speed_.scale = value;
     onSpeedChange();
-    tmgr_trace_event_unref(&p_speed.event);
+    tmgr_trace_event_unref(&speed_.event);
 
-  } else if (triggered == p_stateEvent) {
+  } else if (triggered == stateEvent_) {
     if (value > 0)
       turnOn();
     else
       turnOff();
-    tmgr_trace_event_unref(&p_stateEvent);
+    tmgr_trace_event_unref(&stateEvent_);
 
   } else {
     xbt_die("Unknown event!\n");