[simix] Use std::string for s_smx_process_arg

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

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index a5f9339..9a7179f 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -26,9 +26,6 @@ void surf_host_model_init_ptask_L07(void)
   xbt_assert(!surf_cpu_model_pm, "CPU model type already defined");
   xbt_assert(!surf_network_model, "network model type already defined");
 
-  // Define the callbacks to parse the XML
-  simgrid::surf::on_link.connect(netlink_parse_init);
-
   surf_host_model = new simgrid::surf::HostL07Model();
   xbt_dynar_push(all_existing_models, &surf_host_model);
 }
@@ -143,11 +140,11 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) {
     if ((action->getRemains() <= 0) &&
         (lmm_get_variable_weight(action->getVariable()) > 0)) {
       action->finish();
-      action->setState(SURF_ACTION_DONE);
+      action->setState(Action::State::done);
     } else if ((action->getMaxDuration() != NO_MAX_DURATION) &&
                (action->getMaxDuration() <= 0)) {
       action->finish();
-      action->setState(SURF_ACTION_DONE);
+      action->setState(Action::State::done);
     } else {
       /* Need to check that none of the model has failed */
       lmm_constraint_t cnst = NULL;
@@ -155,11 +152,10 @@ void HostL07Model::updateActionsState(double /*now*/, double delta) {
 
       while ((cnst = lmm_get_cnst_from_var(maxminSystem_, action->getVariable(), i++))) {
         void *constraint_id = lmm_constraint_id(cnst);
-
-        if (static_cast<HostImpl*>(constraint_id)->isOff()) {
+        if (static_cast<simgrid::surf::Resource*>(constraint_id)->isOff()) {
           XBT_DEBUG("Action (%p) Failed!!", action);
           action->finish();
-          action->setState(SURF_ACTION_FAILED);
+          action->setState(Action::State::failed);
           break;
         }
       }
@@ -222,7 +218,7 @@ L07Action::L07Action(Model *model, int host_nb, sg_host_t*host_list,
   this->m_latency = latency;
   this->m_rate = rate;
 
-  this->p_variable = lmm_variable_new(model->getMaxminSystem(), this, 1.0,
+  this->variable_ = lmm_variable_new(model->getMaxminSystem(), this, 1.0,
       (rate > 0 ? rate : -1.0),
       host_nb + nb_link);
 
@@ -287,9 +283,9 @@ Link* NetworkL07Model::createLink(const char *name, double bandwidth, double lat
  ************/
 
 CpuL07::CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)
- : Cpu(model, host, speedPerPstate, core, xbt_dynar_get_as(speedPerPstate,0,double))
+ : Cpu(model, host, speedPerPstate, core)
 {
-  p_constraint = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPerPstate,0,double));
+  constraint_ = lmm_constraint_new(model->getMaxminSystem(), this, xbt_dynar_get_as(speedPerPstate,0,double));
 }
 
 CpuL07::~CpuL07()
@@ -324,8 +320,8 @@ Action *CpuL07::execution_start(double size)
 Action *CpuL07::sleep(double duration)
 {
   L07Action *action = static_cast<L07Action*>(execution_start(1.0));
-  action->m_maxDuration = duration;
-  action->m_suspended = 2;
+  action->maxDuration_ = duration;
+  action->suspended_ = 2;
   lmm_update_variable_weight(getModel()->getMaxminSystem(), action->getVariable(), 0.0);
 
   return action;
@@ -453,7 +449,7 @@ void L07Action::updateBound()
   }
   lat_bound = sg_tcp_gamma / (2.0 * lat_current);
   XBT_DEBUG("action (%p) : lat_bound = %g", this, lat_bound);
-  if ((m_latency == 0.0) && (m_suspended == 0)) {
+  if ((m_latency == 0.0) && (suspended_ == 0)) {
     if (m_rate < 0)
       lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), lat_bound);
     else
@@ -464,10 +460,10 @@ void L07Action::updateBound()
 
 int L07Action::unref()
 {
-  m_refcount--;
-  if (!m_refcount) {
+  refcount_--;
+  if (!refcount_) {
     if (action_hook.is_linked())
-      p_stateSet->erase(p_stateSet->iterator_to(*this));
+      stateSet_->erase(stateSet_->iterator_to(*this));
     if (getVariable())
       lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
     delete this;