Remove useless length modifier 'l' in %l[efg] for printf.

[simgrid.git] / src / surf / workstation_ptask_L07.cpp

diff --git a/src/surf/workstation_ptask_L07.cpp b/src/surf/workstation_ptask_L07.cpp
index 1e26a52..f44c1a1 100644 (file)
--- a/src/surf/workstation_ptask_L07.cpp
+++ b/src/surf/workstation_ptask_L07.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010, 2013. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2013-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -436,9 +436,12 @@ CpuL07::CpuL07(CpuL07ModelPtr model, const char* name, xbt_dict_t props,
 
   m_powerCurrent = power_initial;
   if (power_trace)
-       p_power.event = tmgr_history_add_trace(history, power_trace, 0.0, 0, static_cast<ResourcePtr>(this));
+    p_power.event = tmgr_history_add_trace(history, power_trace, 0.0, 0,
+                                           static_cast<ResourcePtr>(this));
+  else
+    p_power.event = NULL;
 
-  m_stateCurrent = state_initial;
+  setState(state_initial);
   if (state_trace)
        p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, static_cast<ResourcePtr>(this));
 }
@@ -457,7 +460,7 @@ LinkL07::LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props,
   if (bw_trace)
     p_bwEvent = tmgr_history_add_trace(history, bw_trace, 0.0, 0, static_cast<ResourcePtr>(this));
 
-  m_stateCurrent = state_initial;
+  setState(state_initial);
   m_latCurrent = lat_initial;
 
   if (lat_trace)
@@ -484,9 +487,9 @@ void CpuL07::updateState(tmgr_trace_event_t event_type, double value, double /*d
       p_power.event = NULL;
   } else if (event_type == p_stateEvent) {
     if (value > 0)
-      m_stateCurrent = SURF_RESOURCE_ON;
+      setState(SURF_RESOURCE_ON);
     else
-      m_stateCurrent = SURF_RESOURCE_OFF;
+      setState(SURF_RESOURCE_OFF);
     if (tmgr_trace_event_free(event_type))
       p_stateEvent = NULL;
   } else {
@@ -517,9 +520,9 @@ void LinkL07::updateState(tmgr_trace_event_t event_type, double value, double da
       p_latEvent = NULL;
   } else if (event_type == p_stateEvent) {
     if (value > 0)
-      m_stateCurrent = SURF_RESOURCE_ON;
+      setState(SURF_RESOURCE_ON);
     else
-      m_stateCurrent = SURF_RESOURCE_OFF;
+      setState(SURF_RESOURCE_OFF);
     if (tmgr_trace_event_free(event_type))
       p_stateEvent = NULL;
   } else {
@@ -534,11 +537,6 @@ e_surf_resource_state_t WorkstationL07::getState()
   return p_cpu->getState();
 }
 
-e_surf_resource_state_t CpuL07::getState()
-{
-  return m_stateCurrent;
-}
-
 double CpuL07::getSpeed(double load)
 {
   return load * p_power.scale;