Merge branch 'coverity_scan' of github.com:mquinson/simgrid

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

diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp
index 0e2b4b7..6114f6f 100644 (file)
--- a/src/surf/network_constant.cpp
+++ b/src/surf/network_constant.cpp
@@ -31,17 +31,17 @@ void surf_network_model_init_Constant()
 namespace simgrid {
 namespace surf {
 
-double NetworkConstantModel::shareResources(double /*now*/)
+double NetworkConstantModel::next_occuring_event(double /*now*/)
 {
   NetworkConstantAction *action = NULL;
   double min = -1.0;
 
   ActionList *actionSet = getRunningActionSet();
   for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
-   ; it != itend ; ++it) {
-  action = static_cast<NetworkConstantAction*>(&*it);
-        if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
-            min = action->m_latency;
+      ; it != itend ; ++it) {
+    action = static_cast<NetworkConstantAction*>(&*it);
+    if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
+      min = action->m_latency;
   }
 
   return min;
@@ -52,9 +52,9 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
   NetworkConstantAction *action = NULL;
   ActionList *actionSet = getRunningActionSet();
   for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
-     ; it != itend ; it=itNext) {
+      ; it != itend ; it=itNext) {
     ++itNext;
-  action = static_cast<NetworkConstantAction*>(&*it);
+    action = static_cast<NetworkConstantAction*>(&*it);
     if (action->m_latency > 0) {
       if (action->m_latency > delta) {
         double_update(&(action->m_latency), delta, sg_surf_precision);
@@ -70,7 +70,7 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
       action->finish();
       action->setState(SURF_ACTION_DONE);
     } else if ((action->getMaxDuration() != NO_MAX_DURATION)
-               && (action->getMaxDuration() <= 0)) {
+        && (action->getMaxDuration() <= 0)) {
       action->finish();
       action->setState(SURF_ACTION_DONE);
     }
@@ -78,10 +78,10 @@ void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
 }
 
 Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
-                             double size, double rate)
+    double size, double rate)
 {
-  char *src_name = src->getName();
-  char *dst_name = dst->getName();
+  char *src_name = src->name();
+  char *dst_name = dst->name();
 
   XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
   NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
@@ -99,10 +99,10 @@ int NetworkConstantAction::unref()
 {
   m_refcount--;
   if (!m_refcount) {
-  if (action_hook.is_linked())
-    p_stateSet->erase(p_stateSet->iterator_to(*this));
+    if (action_hook.is_linked())
+      p_stateSet->erase(p_stateSet->iterator_to(*this));
     delete this;
-  return 1;
+    return 1;
   }
   return 0;
 }