X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfc676704bebcd57e5ea98bb43154245a150948f..5d618cbecf8b08ed4b0b4fc2373980b8ce4b4344:/src/surf/surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 2f785d08d7..b5c3a805fe 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/portable.h"
+#include "src/internal_config.h"
 #include "surf_private.h"
 #include "surf_interface.hpp"
 #include "network_interface.hpp"
@@ -62,7 +62,7 @@ s_surf_model_description_t surf_network_model_description[] = {
    surf_network_model_init_IB},
   {"CM02", "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).",
    surf_network_model_init_CM02},
-#ifdef HAVE_NS3
+#if HAVE_NS3
   {"NS3", "Network pseudo-model using the NS3 tcp model instead of an analytic model", surf_network_model_init_NS3},
 #endif
   {"Reno",  "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).",
@@ -103,7 +103,7 @@ s_surf_model_description_t surf_storage_model_description[] = {
   {NULL, NULL,  NULL}      /* this array must be NULL terminated */
 };
 
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
 static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
 #endif
 
@@ -342,7 +342,7 @@ void surf_exit(void)
     future_evt_set = nullptr;
   }
 
-#ifdef HAVE_THREAD_CONTEXTS
+#if HAVE_THREAD_CONTEXTS
   xbt_parmap_destroy(surf_parmap);
 #endif
 
@@ -360,32 +360,32 @@ namespace simgrid {
 namespace surf {
 
 Model::Model()
-  : p_maxminSystem(NULL)
+  : maxminSystem_(NULL)
 {
-  p_readyActionSet = new ActionList();
-  p_runningActionSet = new ActionList();
-  p_failedActionSet = new ActionList();
-  p_doneActionSet = new ActionList();
+  readyActionSet_ = new ActionList();
+  runningActionSet_ = new ActionList();
+  failedActionSet_ = new ActionList();
+  doneActionSet_ = new ActionList();
 
-  p_modifiedSet = NULL;
-  p_actionHeap = NULL;
-  p_updateMechanism = UM_UNDEFINED;
-  m_selectiveUpdate = 0;
+  modifiedSet_ = NULL;
+  actionHeap_ = NULL;
+  updateMechanism_ = UM_UNDEFINED;
+  selectiveUpdate_ = 0;
 }
 
 Model::~Model(){
-  delete p_readyActionSet;
-  delete p_runningActionSet;
-  delete p_failedActionSet;
-  delete p_doneActionSet;
+  delete readyActionSet_;
+  delete runningActionSet_;
+  delete failedActionSet_;
+  delete doneActionSet_;
 }
 
 double Model::next_occuring_event(double now)
 {
   //FIXME: set the good function once and for all
-  if (p_updateMechanism == UM_LAZY)
+  if (updateMechanism_ == UM_LAZY)
     return next_occuring_event_lazy(now);
-  else if (p_updateMechanism == UM_FULL)
+  else if (updateMechanism_ == UM_FULL)
     return next_occuring_event_full(now);
   else
     xbt_die("Invalid cpu update mechanism!");
@@ -399,20 +399,20 @@ double Model::next_occuring_event_lazy(double now)
 
   XBT_DEBUG
       ("Before share resources, the size of modified actions set is %zd",
-       p_modifiedSet->size());
+       modifiedSet_->size());
 
-  lmm_solve(p_maxminSystem);
+  lmm_solve(maxminSystem_);
 
   XBT_DEBUG
       ("After share resources, The size of modified actions set is %zd",
-       p_modifiedSet->size());
+       modifiedSet_->size());
 
-  while(!p_modifiedSet->empty()) {
-    action = &(p_modifiedSet->front());
-    p_modifiedSet->pop_front();
+  while(!modifiedSet_->empty()) {
+    action = &(modifiedSet_->front());
+    modifiedSet_->pop_front();
     int max_dur_flag = 0;
 
-    if (action->getStateSet() != p_runningActionSet)
+    if (action->getStateSet() != runningActionSet_)
       continue;
 
     /* bogus priority, skip it */
@@ -451,15 +451,15 @@ double Model::next_occuring_event_lazy(double now)
         action->getMaxDuration());
 
     if (min != -1) {
-      action->heapUpdate(p_actionHeap, min, max_dur_flag ? MAX_DURATION : NORMAL);
+      action->heapUpdate(actionHeap_, min, max_dur_flag ? MAX_DURATION : NORMAL);
       XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min,
                 now);
     } else DIE_IMPOSSIBLE;
   }
 
   //hereafter must have already the min value for this resource model
-  if (xbt_heap_size(p_actionHeap) > 0)
-    min = xbt_heap_maxkey(p_actionHeap) - now;
+  if (xbt_heap_size(actionHeap_) > 0)
+    min = xbt_heap_maxkey(actionHeap_) - now;
   else
     min = -1;
 
@@ -529,9 +529,9 @@ double Model::shareResourcesMaxMin(ActionList *running_actions,
 
 void Model::updateActionsState(double now, double delta)
 {
-  if (p_updateMechanism == UM_FULL)
+  if (updateMechanism_ == UM_FULL)
   updateActionsStateFull(now, delta);
-  else if (p_updateMechanism == UM_LAZY)
+  else if (updateMechanism_ == UM_LAZY)
   updateActionsStateLazy(now, delta);
   else
   xbt_die("Invalid cpu update mechanism!");
@@ -558,62 +558,51 @@ namespace simgrid {
 namespace surf {
 
 Resource::Resource(Model *model, const char *name)
-  : Resource(model, name, 1/*ON*/)
+  : name_(xbt_strdup(name))
+  , model_(model)
 {}
 
 Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint)
-  : Resource(model, name, constraint, 1/*ON*/)
-{}
-  
-Resource::Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn)
-  : p_name(xbt_strdup(name))
-  , p_model(model)
-  , m_isOn(initiallyOn)
-  , p_constraint(constraint)
-{}
-
-Resource::Resource(Model *model, const char *name, int initiallyOn)
-  : p_name(xbt_strdup(name))
-  , p_model(model)
-  , m_isOn(initiallyOn)
+  : name_(xbt_strdup(name))
+  , model_(model)
+  , constraint_(constraint)
 {}
 
-
 Resource::~Resource() {
-  xbt_free((void*)p_name);
+  xbt_free((void*)name_);
 }
 
-bool Resource::isOn() {
-  return m_isOn;
+bool Resource::isOn() const {
+  return isOn_;
 }
-bool Resource::isOff() {
-  return ! m_isOn;
+bool Resource::isOff() const {
+  return ! isOn_;
 }
 
 void Resource::turnOn()
 {
-  if (!m_isOn) {
-    m_isOn = true;
-  }
+  isOn_ = true;
 }
 
 void Resource::turnOff()
 {
-  if (m_isOn) {
-    m_isOn = false;
-  }
+  isOn_ = false;
 }
 
-Model *Resource::getModel() {
-  return p_model;
+Model *Resource::getModel() const {
+  return model_;
 }
 
-const char *Resource::getName() {
-  return p_name;
+const char *Resource::getName() const {
+  return name_;
 }
 
-lmm_constraint_t Resource::getConstraint() {
-  return p_constraint;
+bool Resource::operator==(const Resource &other) const {
+  return strcmp(name_, other.name_);
+}
+
+lmm_constraint_t Resource::getConstraint() const {
+  return constraint_;
 }
 
 }
@@ -674,38 +663,41 @@ void Action::finish() {
     m_finish = surf_get_clock();
 }
 
-e_surf_action_state_t Action::getState()
+Action::State Action::getState()
 {
   if (p_stateSet ==  getModel()->getReadyActionSet())
-    return SURF_ACTION_READY;
+    return Action::State::ready;
   if (p_stateSet ==  getModel()->getRunningActionSet())
-    return SURF_ACTION_RUNNING;
+    return Action::State::running;
   if (p_stateSet ==  getModel()->getFailedActionSet())
-    return SURF_ACTION_FAILED;
+    return Action::State::failed;
   if (p_stateSet ==  getModel()->getDoneActionSet())
-    return SURF_ACTION_DONE;
-  return SURF_ACTION_NOT_IN_THE_SYSTEM;
+    return Action::State::done;
+  return Action::State::not_in_the_system;
 }
 
-void Action::setState(e_surf_action_state_t state)
+void Action::setState(Action::State state)
 {
-  //surf_action_state_t action_state = &(action->model_type->states);
-  XBT_IN("(%p,%s)", this, surf_action_state_names[state]);
   p_stateSet->erase(p_stateSet->iterator_to(*this));
-  if (state == SURF_ACTION_READY)
+  switch (state) {
+  case Action::State::ready:
     p_stateSet = getModel()->getReadyActionSet();
-  else if (state == SURF_ACTION_RUNNING)
+    break;
+  case Action::State::running:
     p_stateSet = getModel()->getRunningActionSet();
-  else if (state == SURF_ACTION_FAILED)
+    break;
+  case Action::State::failed:
     p_stateSet = getModel()->getFailedActionSet();
-  else if (state == SURF_ACTION_DONE)
+    break;
+  case Action::State::done:
     p_stateSet = getModel()->getDoneActionSet();
-  else
+    break;
+  default:
     p_stateSet = NULL;
-
+    break;
+  }
   if (p_stateSet)
     p_stateSet->push_back(*this);
-  XBT_OUT();
 }
 
 double Action::getBound()
@@ -774,7 +766,7 @@ void Action::setPriority(double priority)
 }
 
 void Action::cancel(){
-  setState(SURF_ACTION_FAILED);
+  setState(Action::State::failed);
   if (getModel()->getUpdateMechanism() == UM_LAZY) {
     if (action_lmm_hook.is_linked())
       getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this));
@@ -922,12 +914,12 @@ void Action::updateRemainingLazy(double now)
     if ((m_remains <= 0) &&
         (lmm_get_variable_weight(getVariable()) > 0)) {
       finish();
-      setState(SURF_ACTION_DONE);
+      setState(Action::State::done);
       heapRemove(getModel()->getActionHeap());
     } else if (((m_maxDuration != NO_MAX_DURATION)
         && (m_maxDuration <= 0))) {
       finish();
-      setState(SURF_ACTION_DONE);
+      setState(Action::State::done);
       heapRemove(getModel()->getActionHeap());
     }
   }