X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/56c9350ac13917d497fc89176233fcab023e22b1..dadfefc9f3cc6cf0fc28a9025307f9f08dc4ac96:/src/surf/surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 1829975b7e..66dad3794f 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -289,15 +289,10 @@ void sg_version(int *ver_major,int *ver_minor,int *ver_patch) {
 
 void surf_init(int *argc, char **argv)
 {
-  if (host_list != nullptr) // Already initialized
+  if (USER_HOST_LEVEL != -1) // Already initialized
     return;
 
   XBT_DEBUG("Create all Libs");
-  host_list = xbt_dict_new_homogeneous([](void*p) {
-    simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(p);
-    simgrid::s4u::Host::onDestruction(*host);
-    delete host;
-  });
   USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(nullptr);
 
   as_router_lib = xbt_lib_new();
@@ -338,7 +333,7 @@ void surf_exit()
 
   xbt_dynar_free(&surf_path);
 
-  xbt_dict_free(&host_list);
+  sg_host_exit();
   xbt_lib_free(&as_router_lib);
   xbt_lib_free(&storage_lib);
   sg_link_exit();
@@ -398,35 +393,25 @@ Model::~Model(){
   delete doneActionSet_;
 }
 
-double Model::next_occuring_event(double now)
+double Model::nextOccuringEvent(double now)
 {
   //FIXME: set the good function once and for all
   if (updateMechanism_ == UM_LAZY)
-    return next_occuring_event_lazy(now);
+    return nextOccuringEventLazy(now);
   else if (updateMechanism_ == UM_FULL)
-    return next_occuring_event_full(now);
+    return nextOccuringEventFull(now);
   else
     xbt_die("Invalid cpu update mechanism!");
 }
 
-double Model::next_occuring_event_lazy(double now)
+double Model::nextOccuringEventLazy(double now)
 {
-  Action *action = nullptr;
-  double min = -1;
-  double share;
-
-  XBT_DEBUG
-      ("Before share resources, the size of modified actions set is %zd",
-       modifiedSet_->size());
-
+  XBT_DEBUG("Before share resources, the size of modified actions set is %zd", modifiedSet_->size());
   lmm_solve(maxminSystem_);
-
-  XBT_DEBUG
-      ("After share resources, The size of modified actions set is %zd",
-       modifiedSet_->size());
+  XBT_DEBUG("After share resources, The size of modified actions set is %zd", modifiedSet_->size());
 
   while(!modifiedSet_->empty()) {
-    action = &(modifiedSet_->front());
+    Action *action = &(modifiedSet_->front());
     modifiedSet_->pop_front();
     int max_dur_flag = 0;
 
@@ -439,8 +424,8 @@ double Model::next_occuring_event_lazy(double now)
 
     action->updateRemainingLazy(now);
 
-    min = -1;
-    share = lmm_variable_getvalue(action->getVariable());
+    double min = -1;
+    double share = lmm_variable_getvalue(action->getVariable());
 
     if (share > 0) {
       double time_to_completion;
@@ -476,67 +461,34 @@ double Model::next_occuring_event_lazy(double now)
   }
 
   //hereafter must have already the min value for this resource model
-  if (xbt_heap_size(actionHeap_) > 0)
-    min = xbt_heap_maxkey(actionHeap_) - now;
-  else
-    min = -1;
-
-  XBT_DEBUG("The minimum with the HEAP %f", min);
-
-  return min;
+  if (xbt_heap_size(actionHeap_) > 0) {
+    double min = xbt_heap_maxkey(actionHeap_) - now;
+    XBT_DEBUG("minimum with the HEAP %f", min);
+    return min;
+  } else {
+    XBT_DEBUG("The HEAP is empty, thus returning -1");
+    return -1;
+  }
 }
 
-double Model::next_occuring_event_full(double /*now*/) {
-  THROW_UNIMPLEMENTED;
-  return 0.0;
-}
+double Model::nextOccuringEventFull(double /*now*/) {
+  maxminSystem_->solve_fun(maxminSystem_);
 
-double Model::shareResourcesMaxMin(ActionList *running_actions,
-                          lmm_system_t sys,
-                          void (*solve) (lmm_system_t))
-{
-  Action *action = nullptr;
   double min = -1;
-  double value = -1;
-
-  solve(sys);
-
-  ActionList::iterator it(running_actions->begin()), itend(running_actions->end());
-  for(; it != itend ; ++it) {
-    action = &*it;
-    value = lmm_variable_getvalue(action->getVariable());
-    if ((value > 0) || (action->getMaxDuration() >= 0))
-      break;
-  }
-
-  if (!action)
-    return -1.0;
-
-  if (value > 0) {
-    if (action->getRemains() > 0)
-      min = action->getRemainsNoUpdate() / value;
-    else
-      min = 0.0;
-    if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min))
-      min = action->getMaxDuration();
-  } else
-    min = action->getMaxDuration();
-
-
-  for (++it; it != itend; ++it) {
-  action = &*it;
-    value = lmm_variable_getvalue(action->getVariable());
+  for (auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; ++it) {
+    Action *action = &*it;
+    double value = lmm_variable_getvalue(action->getVariable());
     if (value > 0) {
       if (action->getRemains() > 0)
         value = action->getRemainsNoUpdate() / value;
       else
         value = 0.0;
-      if (value < min) {
+      if (min < 0 || value < min) {
         min = value;
         XBT_DEBUG("Updating min (value) with %p: %f", action, min);
       }
     }
-    if ((action->getMaxDuration() >= 0) && (action->getMaxDuration() < min)) {
+    if ((action->getMaxDuration() >= 0) && (min<0 || action->getMaxDuration() < min)) {
       min = action->getMaxDuration();
       XBT_DEBUG("Updating min (duration) with %p: %f", action, min);
     }
@@ -549,11 +501,11 @@ double Model::shareResourcesMaxMin(ActionList *running_actions,
 void Model::updateActionsState(double now, double delta)
 {
   if (updateMechanism_ == UM_FULL)
-  updateActionsStateFull(now, delta);
+    updateActionsStateFull(now, delta);
   else if (updateMechanism_ == UM_LAZY)
-  updateActionsStateLazy(now, delta);
+    updateActionsStateLazy(now, delta);
   else
-  xbt_die("Invalid cpu update mechanism!");
+    xbt_die("Invalid cpu update mechanism!");
 }
 
 void Model::updateActionsStateLazy(double /*now*/, double /*delta*/)