cosmetics

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

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index a59737b..5169617 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -428,8 +428,8 @@ CpuTiModel::~CpuTiModel()
 }
 
 Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host,
-                              xbt_dynar_t speedPeak,
-                              int pstate,
+                         xbt_dynar_t speedPeak,
+                         int pstate,
                            double speedScale,
                            tmgr_trace_t speedTrace,
                            int core,
@@ -440,11 +440,11 @@ Cpu *CpuTiModel::createCpu(simgrid::s4u::Host *host,
   xbt_assert(xbt_dynar_getfirst_as(speedPeak, double) > 0.0,
       "Speed has to be >0.0. Did you forget to specify the mandatory speed attribute?");
   CpuTi *cpu = new CpuTi(this, host, speedPeak, pstate, speedScale, speedTrace,
-                          core, initiallyOn, stateTrace);
+               core, initiallyOn, stateTrace);
   return cpu;
 }
 
-double CpuTiModel::shareResources(double now)
+double CpuTiModel::next_occuring_event(double now)
 {
   double min_action_duration = -1;
 
@@ -526,7 +526,7 @@ CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
     p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this);
 
   if (speedTrace && xbt_dynar_length(speedTrace->event_list) > 1) {
-       s_tmgr_event_t val;
+  s_tmgr_event_t val;
     // add a fake trace event if periodicity == 0
     xbt_dynar_get_cpy(speedTrace->event_list,
                       xbt_dynar_length(speedTrace->event_list) - 1, &val);
@@ -561,8 +561,7 @@ void CpuTi::set_speed_trace(tmgr_trace_t trace)
   }
 }
 
-void CpuTi::updateState(tmgr_trace_iterator_t event_type,
-                        double value, double date)
+void CpuTi::apply_event(tmgr_trace_iterator_t event_type, double value)
 {
   CpuTiAction *action;
 
@@ -571,10 +570,9 @@ void CpuTi::updateState(tmgr_trace_iterator_t event_type,
     CpuTiTgmr *trace;
     s_tmgr_event_t val;
 
-    XBT_DEBUG("Finish trace date: %f value %f date %f", surf_get_clock(),
-           value, date);
+    XBT_DEBUG("Finish trace date: value %f", value);
     /* update remaining of actions and put in modified cpu swag */
-    updateRemainingAmount(date);
+    updateRemainingAmount(surf_get_clock());
 
     modified(true);
 
@@ -599,11 +597,12 @@ void CpuTi::updateState(tmgr_trace_iterator_t event_type,
       turnOn();
     } else {
       turnOff();
+      double date = surf_get_clock();
 
       /* put all action running on cpu to failed */
       for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
           ; it != itend ; ++it) {
-             action = &*it;
+        action = &*it;
         if (action->getState() == SURF_ACTION_RUNNING
          || action->getState() == SURF_ACTION_READY
          || action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
@@ -787,7 +786,7 @@ CpuAction *CpuTi::sleep(double duration)
   if (duration == NO_MAX_DURATION) {
    /* Move to the *end* of the corresponding action set. This convention
       is used to speed up update_resource_state  */
-       action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
+  action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
     action->p_stateSet = static_cast<CpuTiModel*>(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked;
     action->getStateSet()->push_back(*action);
   }
@@ -816,7 +815,7 @@ void CpuTi::modified(bool modified){
  **********/
 
 CpuTiAction::CpuTiAction(CpuTiModel *model_, double cost, bool failed,
-                                CpuTi *cpu)
+                     CpuTi *cpu)
  : CpuAction(model_, cost, failed)
 {
   p_cpu = cpu;
@@ -839,8 +838,8 @@ int CpuTiAction::unref()
 {
   m_refcount--;
   if (!m_refcount) {
-       if (action_hook.is_linked())
-         getStateSet()->erase(getStateSet()->iterator_to(*this));
+    if (action_hook.is_linked())
+      getStateSet()->erase(getStateSet()->iterator_to(*this));
     /* remove from action_set */
     if (action_ti_hook.is_linked())
       p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));