Fix javadoc into simgrid_full.jar

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

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index 7cf6ef8..6a64cb3 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -93,10 +93,10 @@ xbt_dict_t watched_hosts_lib;
 surf_callback(void, void) surfExitCallbacks;
 
 s_surf_model_description_t surf_plugin_description[] = {
-                 {"Energy",
-                  "Cpu energy consumption.",
-                  sg_energy_plugin_init},
-                 {NULL, NULL,  NULL}      /* this array must be NULL terminated */
+    {"Energy",
+     "Cpu energy consumption.",
+     sg_energy_plugin_init},
+     {NULL, NULL,  NULL}      /* this array must be NULL terminated */
 };
 
 /* Don't forget to update the option description in smx_config when you change this */
@@ -157,7 +157,7 @@ s_surf_model_description_t surf_workstation_model_description[] = {
 s_surf_model_description_t surf_vm_workstation_model_description[] = {
   {"default",
    "Default vm workstation model.",
-   surf_vm_workstation_model_init_current_default},
+   surf_vm_workstation_model_init_HL13},
   {NULL, NULL, NULL}      /* this array must be NULL terminated */
 };
 
@@ -509,18 +509,18 @@ double Model::shareResources(double now)
 {
   //FIXME: set the good function once and for all
   if (p_updateMechanism == UM_LAZY)
-       return shareResourcesLazy(now);
+    return shareResourcesLazy(now);
   else if (p_updateMechanism == UM_FULL)
-       return shareResourcesFull(now);
+    return shareResourcesFull(now);
   else
-       xbt_die("Invalid cpu update mechanism!");
+    xbt_die("Invalid cpu update mechanism!");
 }
 
 double Model::shareResourcesLazy(double now)
 {
   ActionPtr action = NULL;
   double min = -1;
-  double share, time_to_completion;
+  double share;
 
   XBT_DEBUG
       ("Before share resources, the size of modified actions set is %zd",
@@ -547,10 +547,10 @@ double Model::shareResourcesLazy(double now)
     action->updateRemainingLazy(now);
 
     min = -1;
-    time_to_completion = -1;
     share = lmm_variable_getvalue(action->getVariable());
 
     if (share > 0) {
+      double time_to_completion;
       if (action->getRemains() > 0) {
         time_to_completion = action->getRemainsNoUpdate() / share;
       } else {
@@ -610,7 +610,7 @@ double Model::shareResourcesMaxMin(ActionListPtr running_actions,
 
   ActionList::iterator it(running_actions->begin()), itend(running_actions->end());
   for(; it != itend ; ++it) {
-         action = &*it;
+    action = &*it;
     value = lmm_variable_getvalue(action->getVariable());
     if ((value > 0) || (action->getMaxDuration() >= 0))
       break;
@@ -738,7 +738,7 @@ const char *Resource::getName() {
 
 xbt_dict_t Resource::getProperties() {
   if (p_properties==NULL)
-       p_properties = xbt_dict_new();
+    p_properties = xbt_dict_new();
   return p_properties;
 }
 
@@ -851,7 +851,7 @@ void Action::setState(e_surf_action_state_t state)
     p_stateSet = NULL;
 
   if (p_stateSet)
-       p_stateSet->push_back(*this);
+    p_stateSet->push_back(*this);
   XBT_OUT();
 }
 
@@ -867,7 +867,7 @@ void Action::setBound(double bound)
     lmm_update_variable_bound(getModel()->getMaxminSystem(), getVariable(), bound);
 
   if (getModel()->getUpdateMechanism() == UM_LAZY && getLastUpdate()!=surf_get_clock())
-         heapRemove(getModel()->getActionHeap());
+    heapRemove(getModel()->getActionHeap());
   XBT_OUT();
 }
 
@@ -925,8 +925,8 @@ void Action::setPriority(double priority)
 void Action::cancel(){
   setState(SURF_ACTION_FAILED);
   if (getModel()->getUpdateMechanism() == UM_LAZY) {
-       if (actionLmmHook::is_linked())
-         getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this));
+    if (actionLmmHook::is_linked())
+      getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this));
     heapRemove(getModel()->getActionHeap());
   }
 }
@@ -934,18 +934,18 @@ void Action::cancel(){
 int Action::unref(){
   m_refcount--;
   if (!m_refcount) {
-       if (actionHook::is_linked())
-         p_stateSet->erase(p_stateSet->iterator_to(*this));
-       if (getVariable())
-         lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
-       if (getModel()->getUpdateMechanism() == UM_LAZY) {
-         /* remove from heap */
-         heapRemove(getModel()->getActionHeap());
+    if (actionHook::is_linked())
+      p_stateSet->erase(p_stateSet->iterator_to(*this));
+    if (getVariable())
+      lmm_variable_free(getModel()->getMaxminSystem(), getVariable());
+    if (getModel()->getUpdateMechanism() == UM_LAZY) {
+      /* remove from heap */
+      heapRemove(getModel()->getActionHeap());
       if (actionLmmHook::is_linked())
-           getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this));
+        getModel()->getModifiedSet()->erase(getModel()->getModifiedSet()->iterator_to(*this));
     }
-       delete this;
-       return 1;
+    delete this;
+    return 1;
   }
   return 0;
 }
@@ -1028,7 +1028,7 @@ void Action::updateRemainingLazy(double now)
 {
   double delta = 0.0;
 
-  if(getModel() == static_cast<ModelPtr>(surf_network_model))
+  if(getModel() == surf_network_model)
   {
     if (m_suspended != 0)
       return;
@@ -1050,7 +1050,7 @@ void Action::updateRemainingLazy(double now)
     double_update(&m_remains, m_lastValue * delta, sg_surf_precision*sg_maxmin_precision);
 
 #ifdef HAVE_TRACING
-    if (getModel() == static_cast<ModelPtr>(surf_cpu_model_pm) && TRACE_is_enabled()) {
+    if (getModel() == surf_cpu_model_pm && TRACE_is_enabled()) {
       ResourcePtr cpu = static_cast<ResourcePtr>(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);
     }
@@ -1058,7 +1058,7 @@ void Action::updateRemainingLazy(double now)
     XBT_DEBUG("Updating action(%p): remains is now %f", this, m_remains);
   }
 
-  if(getModel() == static_cast<ModelPtr>(surf_network_model))
+  if(getModel() == surf_network_model)
   {
     if (m_maxDuration != NO_MAX_DURATION)
       double_update(&m_maxDuration, delta, sg_surf_precision);