X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4d071afeab4b3ff0a50eefbf48a391d4e8978aa..578dd56a4a07709db1922ff5edd98f0c8f3090f9:/src/surf/surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 8226352fbd..4b948c1e0b 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"
@@ -16,6 +16,7 @@
 #include "mc/mc.h"
 #include "virtual_machine.hpp"
 #include "src/instr/instr_private.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "simgrid/s4u/engine.hpp"
 
 XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)");
@@ -348,6 +349,7 @@ void surf_exit(void)
 
   tmgr_finalize();
   sg_platf_exit();
+  simgrid::s4u::Engine::shutdown();
 
   NOW = 0;                      /* Just in case the user plans to restart the simulation afterward */
 }
@@ -558,62 +560,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*/)
+  : name_(xbt_strdup(name))
+  , model_(model)
+  , constraint_(constraint)
 {}
-  
-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)
-{}
-
 
 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_;
 }
 
 }
@@ -643,17 +634,17 @@ namespace surf {
 void Action::initialize(simgrid::surf::Model *model, double cost, bool failed,
                         lmm_variable_t var)
 {
-  m_remains = cost;
-  m_start = surf_get_clock();
-  m_cost = cost;
-  p_model = model;
-  p_variable = var;
+  remains_ = cost;
+  start_ = surf_get_clock();
+  cost_ = cost;
+  model_ = model;
+  variable_ = var;
   if (failed)
-    p_stateSet = getModel()->getFailedActionSet();
+    stateSet_ = getModel()->getFailedActionSet();
   else
-    p_stateSet = getModel()->getRunningActionSet();
+    stateSet_ = getModel()->getRunningActionSet();
 
-  p_stateSet->push_back(*this);
+  stateSet_->push_back(*this);
 }
 
 Action::Action(simgrid::surf::Model *model, double cost, bool failed)
@@ -667,57 +658,60 @@ Action::Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variab
 }
 
 Action::~Action() {
-  xbt_free(p_category);
+  xbt_free(category_);
 }
 
 void Action::finish() {
-    m_finish = surf_get_clock();
-}
-
-e_surf_action_state_t Action::getState()
-{
-  if (p_stateSet ==  getModel()->getReadyActionSet())
-    return SURF_ACTION_READY;
-  if (p_stateSet ==  getModel()->getRunningActionSet())
-    return SURF_ACTION_RUNNING;
-  if (p_stateSet ==  getModel()->getFailedActionSet())
-    return SURF_ACTION_FAILED;
-  if (p_stateSet ==  getModel()->getDoneActionSet())
-    return SURF_ACTION_DONE;
-  return SURF_ACTION_NOT_IN_THE_SYSTEM;
-}
-
-void Action::setState(e_surf_action_state_t 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)
-    p_stateSet = getModel()->getReadyActionSet();
-  else if (state == SURF_ACTION_RUNNING)
-    p_stateSet = getModel()->getRunningActionSet();
-  else if (state == SURF_ACTION_FAILED)
-    p_stateSet = getModel()->getFailedActionSet();
-  else if (state == SURF_ACTION_DONE)
-    p_stateSet = getModel()->getDoneActionSet();
-  else
-    p_stateSet = NULL;
-
-  if (p_stateSet)
-    p_stateSet->push_back(*this);
-  XBT_OUT();
+    finishTime_ = surf_get_clock();
+}
+
+Action::State Action::getState()
+{
+  if (stateSet_ ==  getModel()->getReadyActionSet())
+    return Action::State::ready;
+  if (stateSet_ ==  getModel()->getRunningActionSet())
+    return Action::State::running;
+  if (stateSet_ ==  getModel()->getFailedActionSet())
+    return Action::State::failed;
+  if (stateSet_ ==  getModel()->getDoneActionSet())
+    return Action::State::done;
+  return Action::State::not_in_the_system;
+}
+
+void Action::setState(Action::State state)
+{
+  stateSet_->erase(stateSet_->iterator_to(*this));
+  switch (state) {
+  case Action::State::ready:
+    stateSet_ = getModel()->getReadyActionSet();
+    break;
+  case Action::State::running:
+    stateSet_ = getModel()->getRunningActionSet();
+    break;
+  case Action::State::failed:
+    stateSet_ = getModel()->getFailedActionSet();
+    break;
+  case Action::State::done:
+    stateSet_ = getModel()->getDoneActionSet();
+    break;
+  default:
+    stateSet_ = NULL;
+    break;
+  }
+  if (stateSet_)
+    stateSet_->push_back(*this);
 }
 
 double Action::getBound()
 {
-  return (p_variable) ? lmm_variable_getbound(p_variable) : 0;
+  return (variable_) ? lmm_variable_getbound(variable_) : 0;
 }
 
 void Action::setBound(double bound)
 {
   XBT_IN("(%p,%g)", this, bound);
-  if (p_variable)
-    lmm_update_variable_bound(getModel()->getMaxminSystem(), p_variable, bound);
+  if (variable_)
+    lmm_update_variable_bound(getModel()->getMaxminSystem(), variable_, bound);
 
   if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock())
     heapRemove(getModel()->getActionHeap());
@@ -726,35 +720,35 @@ void Action::setBound(double bound)
 
 double Action::getStartTime()
 {
-  return m_start;
+  return start_;
 }
 
 double Action::getFinishTime()
 {
   /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */
-  return m_remains == 0 ? m_finish : -1;
+  return remains_ == 0 ? finishTime_ : -1;
 }
 
 void Action::setData(void* data)
 {
-  p_data = data;
+  data_ = data;
 }
 
 void Action::setCategory(const char *category)
 {
   XBT_IN("(%p,%s)", this, category);
-  p_category = xbt_strdup(category);
+  category_ = xbt_strdup(category);
   XBT_OUT();
 }
 
 void Action::ref(){
-  m_refcount++;
+  refcount_++;
 }
 
 void Action::setMaxDuration(double duration)
 {
   XBT_IN("(%p,%g)", this, duration);
-  m_maxDuration = duration;
+  maxDuration_ = duration;
   if (getModel()->getUpdateMechanism() == UM_LAZY)      // remove action from the heap
     heapRemove(getModel()->getActionHeap());
   XBT_OUT();
@@ -765,7 +759,7 @@ void Action::gapRemove() {}
 void Action::setPriority(double priority)
 {
   XBT_IN("(%p,%g)", this, priority);
-  m_priority = priority;
+  priority_ = priority;
   lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority);
 
   if (getModel()->getUpdateMechanism() == UM_LAZY)
@@ -774,7 +768,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));
@@ -783,10 +777,10 @@ void Action::cancel(){
 }
 
 int Action::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());
     if (getModel()->getUpdateMechanism() == UM_LAZY) {
@@ -804,9 +798,9 @@ int Action::unref(){
 void Action::suspend()
 {
   XBT_IN("(%p)", this);
-  if (m_suspended != 2) {
+  if (suspended_ != 2) {
     lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), 0.0);
-    m_suspended = 1;
+    suspended_ = 1;
     if (getModel()->getUpdateMechanism() == UM_LAZY)
       heapRemove(getModel()->getActionHeap());
   }
@@ -816,9 +810,9 @@ void Action::suspend()
 void Action::resume()
 {
   XBT_IN("(%p)", this);
-  if (m_suspended != 2) {
-    lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), m_priority);
-    m_suspended = 0;
+  if (suspended_ != 2) {
+    lmm_update_variable_weight(getModel()->getMaxminSystem(), getVariable(), priority_);
+    suspended_ = 0;
     if (getModel()->getUpdateMechanism() == UM_LAZY)
       heapRemove(getModel()->getActionHeap());
   }
@@ -827,7 +821,7 @@ void Action::resume()
 
 bool Action::isSuspended()
 {
-  return m_suspended == 1;
+  return suspended_ == 1;
 }
 /* insert action on heap using a given key and a hat (heap_action_type)
  * a hat can be of three types for communications:
@@ -838,30 +832,30 @@ bool Action::isSuspended()
  */
 void Action::heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat)
 {
-  m_hat = hat;
+  hat_ = hat;
   xbt_heap_push(heap, this, key);
 }
 
 void Action::heapRemove(xbt_heap_t heap)
 {
-  m_hat = NOTSET;
-  if (m_indexHeap >= 0) {
-    xbt_heap_remove(heap, m_indexHeap);
+  hat_ = NOTSET;
+  if (indexHeap_ >= 0) {
+    xbt_heap_remove(heap, indexHeap_);
   }
 }
 
 void Action::heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat)
 {
-  m_hat = hat;
-  if (m_indexHeap >= 0) {
-    xbt_heap_update(heap, m_indexHeap, key);
+  hat_ = hat;
+  if (indexHeap_ >= 0) {
+    xbt_heap_update(heap, indexHeap_, key);
   }else{
     xbt_heap_push(heap, this, key);
   }
 }
 
 void Action::updateIndexHeap(int i) {
-  m_indexHeap = i;
+  indexHeap_ = i;
 }
 
 double Action::getRemains()
@@ -871,12 +865,12 @@ double Action::getRemains()
   if (getModel()->getUpdateMechanism() == UM_LAZY)      /* update remains before return it */
     updateRemainingLazy(surf_get_clock());
   XBT_OUT();
-  return m_remains;
+  return remains_;
 }
 
 double Action::getRemainsNoUpdate()
 {
-  return m_remains;
+  return remains_;
 }
 
 //FIXME split code in the right places
@@ -886,54 +880,50 @@ void Action::updateRemainingLazy(double now)
 
   if(getModel() == surf_network_model)
   {
-    if (m_suspended != 0)
+    if (suspended_ != 0)
       return;
   }
   else
   {
-    xbt_assert(p_stateSet == getModel()->getRunningActionSet(),
-        "You're updating an action that is not running.");
-
-      /* bogus priority, skip it */
-    xbt_assert(m_priority > 0,
-        "You're updating an action that seems suspended.");
+    xbt_assert(stateSet_ == getModel()->getRunningActionSet(), "You're updating an action that is not running.");
+    xbt_assert(priority_ > 0, "You're updating an action that seems suspended.");
   }
 
-  delta = now - m_lastUpdate;
+  delta = now - lastUpdate_;
 
-  if (m_remains > 0) {
-    XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, m_remains, m_lastUpdate);
-    double_update(&m_remains, m_lastValue * delta, sg_surf_precision*sg_maxmin_precision);
+  if (remains_ > 0) {
+    XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", this, remains_, lastUpdate_);
+    double_update(&remains_, lastValue_ * delta, sg_surf_precision*sg_maxmin_precision);
 
     if (getModel() == surf_cpu_model_pm && TRACE_is_enabled()) {
       simgrid::surf::Resource *cpu = static_cast<simgrid::surf::Resource*>(
         lmm_constraint_id(lmm_get_cnst_from_var(getModel()->getMaxminSystem(), getVariable(), 0)));
-      TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), m_lastValue, m_lastUpdate, now - m_lastUpdate);
+      TRACE_surf_host_set_utilization(cpu->getName(), getCategory(), lastValue_, lastUpdate_, now - lastUpdate_);
     }
-    XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains);
+    XBT_DEBUG("Updating action(%p): remains is now %f", this, remains_);
   }
 
   if(getModel() == surf_network_model)
   {
-    if (m_maxDuration != NO_MAX_DURATION)
-      double_update(&m_maxDuration, delta, sg_surf_precision);
+    if (maxDuration_ != NO_MAX_DURATION)
+      double_update(&maxDuration_, delta, sg_surf_precision);
 
     //FIXME: duplicated code
-    if ((m_remains <= 0) &&
+    if ((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))) {
+    } else if (((maxDuration_ != NO_MAX_DURATION)
+        && (maxDuration_ <= 0))) {
       finish();
-      setState(SURF_ACTION_DONE);
+      setState(Action::State::done);
       heapRemove(getModel()->getActionHeap());
     }
   }
 
-  m_lastUpdate = now;
-  m_lastValue = lmm_variable_getvalue(getVariable());
+  lastUpdate_ = now;
+  lastValue_ = lmm_variable_getvalue(getVariable());
 }
 
 }