Comment unused parameters.

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

diff --git a/src/surf/cpu_ti.cpp b/src/surf/cpu_ti.cpp
index 545f2ba..484d895 100644 (file)
--- a/src/surf/cpu_ti.cpp
+++ b/src/surf/cpu_ti.cpp
@@ -380,11 +380,11 @@ int CpuTiTrace::binarySearch(double *array, double a, int low, int high)
  *************/
 
 static void parse_cpu_ti_init(sg_platf_host_cbarg_t host){
-  ((CpuTiModelPtr)surf_cpu_model)->parseInit(host);
+  ((CpuTiModelPtr)surf_cpu_model_pm)->parseInit(host);
 }
 
 static void add_traces_cpu_ti(){
-  surf_cpu_model->addTraces();
+  surf_cpu_model_pm->addTraces();
 }
 
 static void cpu_ti_define_callbacks()
@@ -399,17 +399,17 @@ static void cpu_ti_define_callbacks()
 
 void surf_cpu_model_init_ti()
 {
-  xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
-  surf_cpu_model = new CpuTiModel();
+  xbt_assert(!surf_cpu_model_pm,"CPU model already initialized. This should not happen.");
+  surf_cpu_model_pm = new CpuTiModel();
   cpu_ti_define_callbacks();
-  ModelPtr model = static_cast<ModelPtr>(surf_cpu_model);
+  ModelPtr model = static_cast<ModelPtr>(surf_cpu_model_pm);
   xbt_dynar_push(model_list, &model);
 }
 
 CpuTiModel::CpuTiModel() : CpuModel("cpu_ti")
 {
-  xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
-  ActionPtr action;
+  xbt_assert(!surf_cpu_model_pm,"CPU model already initialized. This should not happen.");
+  ActionPtr action = NULL;
   CpuTi cpu;
 
   cpu_ti_running_action_set_that_does_not_need_being_checked =
@@ -438,7 +438,7 @@ CpuTiModel::~CpuTiModel()
     }
   }
 
-  surf_cpu_model = NULL;
+  surf_cpu_model_pm = NULL;
 
   xbt_swag_free
       (cpu_ti_running_action_set_that_does_not_need_being_checked);
@@ -483,7 +483,7 @@ CpuTiPtr CpuTiModel::createResource(const char *name,
   return (CpuTiPtr) xbt_lib_get_elm_or_null(host_lib, name);
 }
 
-CpuTiActionPtr CpuTiModel::createAction(double cost, bool failed)
+CpuTiActionPtr CpuTiModel::createAction(double /*cost*/, bool /*failed*/)
 {
   return NULL;//new CpuTiAction(this, cost, failed);
 }
@@ -506,7 +506,7 @@ double CpuTiModel::shareResources(double now)
   return min_action_duration;
 }
 
-void CpuTiModel::updateActionsState(double now, double delta)
+void CpuTiModel::updateActionsState(double now, double /*delta*/)
 {
   while ((xbt_heap_size(cpu_ti_action_heap) > 0)
          && (xbt_heap_maxkey(cpu_ti_action_heap) <= now)) {
@@ -595,7 +595,7 @@ CpuTi::CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak,
   XBT_DEBUG("power scale %lf", powerScale);
   p_availTrace = new CpuTiTgmr(powerTrace, powerScale);
 
-  CpuTiActionPtr action;
+  CpuTiActionPtr action = NULL;
   p_actionSet = xbt_swag_new(xbt_swag_offset(*action, p_cpuListHookup));
 
   xbt_dynar_get_cpy(powerPeak, 0, &m_powerPeak);
@@ -701,7 +701,7 @@ updateRemainingAmount(now);
     action = static_cast<CpuTiActionPtr>(_action);
     /* action not running, skip it */
     if (action->p_stateSet !=
-        surf_cpu_model->p_runningActionSet)
+        surf_cpu_model_pm->p_runningActionSet)
       continue;
 
     /* bogus priority, skip it */
@@ -721,7 +721,7 @@ updateRemainingAmount(now);
     min_finish = -1;
     /* action not running, skip it */
     if (action->p_stateSet !=
-        surf_cpu_model->p_runningActionSet)
+        surf_cpu_model_pm->p_runningActionSet)
       continue;
 
     /* verify if the action is really running on cpu */
@@ -998,9 +998,5 @@ double CpuTiAction::getRemains()
   return m_remains;
 }
 
-static void check() {
-  CpuTiActionPtr cupAction = new CpuTiAction(NULL, 0, true);
-}
-
 #endif /* SURF_MODEL_CPUTI_H_ */