Changes to the Surf LMM:

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

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 503bf1b..e8171bf 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -374,6 +374,7 @@ Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst,
         break;
       }
     }
+    lmm_variable_concurrency_share_set(action->getVariable(),2);
   }
 
   action = new NetworkCm02Action(this, size, failed);
@@ -479,7 +480,7 @@ void NetworkCm02Model::addTraces(){
                "Cannot connect trace %s to link %s: trace undefined",
                trace_name, elm);
 
-    link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 
   xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
@@ -492,7 +493,7 @@ void NetworkCm02Model::addTraces(){
                "Cannot connect trace %s to link %s: trace undefined",
                trace_name, elm);
 
-    link->p_speed.event = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_speed.event = future_evt_set->add_trace(trace, 0.0, link);
   }
 
   xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
@@ -505,7 +506,7 @@ void NetworkCm02Model::addTraces(){
                "Cannot connect trace %s to link %s: trace undefined",
                trace_name, elm);
 
-    link->p_latEvent = future_evt_set->add_trace(trace, 0.0, 0, link);
+    link->p_latEvent = future_evt_set->add_trace(trace, 0.0, link);
   }
 }
 
@@ -533,13 +534,13 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_
   p_speed.scale = 1.0;
   p_speed.peak = metric_peak;
   if (metric_trace)
-    p_speed.event = fes->add_trace(metric_trace, 0.0, 0, this);
+    p_speed.event = fes->add_trace(metric_trace, 0.0, this);
   else
     p_speed.event = NULL;
 
   m_latCurrent = lat_initial;
   if (lat_trace)
-       p_latEvent = fes->add_trace(lat_trace, 0.0, 0, this);
+       p_latEvent = fes->add_trace(lat_trace, 0.0, this);
 
   if (policy == SURF_LINK_FATPIPE)
        lmm_constraint_shared(getConstraint());
@@ -554,22 +555,19 @@ void NetworkCm02Link::updateState(tmgr_trace_iterator_t triggered,
   /* Find out which of my iterators was triggered, and react accordingly */
   if (triggered == p_speed.event) {
     updateBandwidth(value, date);
-    if (tmgr_trace_event_free(triggered))
-      p_speed.event = NULL;
+    tmgr_trace_event_unref(&p_speed.event);
   } else if (triggered == p_latEvent) {
     updateLatency(value, date);
-    if (tmgr_trace_event_free(triggered))
-      p_latEvent = NULL;
+    tmgr_trace_event_unref(&p_latEvent);
   } else if (triggered == p_stateEvent) {
     if (value > 0)
       turnOn();
     else {
-      lmm_constraint_t cnst = getConstraint();
       lmm_variable_t var = NULL;
       lmm_element_t elem = NULL;
 
       turnOff();
-      while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), cnst, &elem))) {
+      while ((var = lmm_get_var_from_cnst(getModel()->getMaxminSystem(), getConstraint(), &elem))) {
         Action *action = static_cast<Action*>( lmm_variable_id(var) );
 
         if (action->getState() == SURF_ACTION_RUNNING ||
@@ -579,17 +577,14 @@ void NetworkCm02Link::updateState(tmgr_trace_iterator_t triggered,
         }
       }
     }
-    if (tmgr_trace_event_free(triggered))
-      p_stateEvent = NULL;
+    tmgr_trace_event_unref(&p_stateEvent);
   } else {
-    XBT_CRITICAL("Unknown event ! \n");
-    xbt_abort();
+    xbt_die("Unknown event!\n");
   }
 
   XBT_DEBUG
-      ("There were a resource state event, need to update actions related to the constraint (%p)",
+      ("There was a resource state event, need to update actions related to the constraint (%p)",
        getConstraint());
-  return;
 }
 
 void NetworkCm02Link::updateBandwidth(double value, double date){