From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Mon, 1 Feb 2016 06:40:53 +0000 (+0100)
Subject: Merge pull request #57 from fabienchaix/oldstyle_element_set
X-Git-Tag: v3_13~1015
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7d57ca811234dbffc0e041914391e0fe47c2d3ae?hp=-c

Merge pull request #57 from fabienchaix/oldstyle_element_set

Adding concurrency to SURF LMM, with oldstyle element set
---

7d57ca811234dbffc0e041914391e0fe47c2d3ae
diff --combined src/surf/network_cm02.cpp
index 28e36169e3,0bd306f868..3f7a944f20
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@@ -450,6 -450,7 +450,7 @@@ Action *NetworkCm02Model::communicate(N
        link = static_cast<NetworkCm02Link*>(_link);
        lmm_expand(p_maxminSystem, link->getConstraint(), action->getVariable(), .05);
      }
+     lmm_variable_concurrency_share_set(action->getVariable(),2);
    }
  
    xbt_dynar_free(&route);
@@@ -482,7 -483,7 +483,7 @@@ void NetworkCm02Model::addTraces()
      link->p_stateEvent = future_evt_set->add_trace(trace, 0.0, link);
    }
  
 -  xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
 +  xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) {
      tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
      NetworkCm02Link *link = static_cast<NetworkCm02Link*>( Link::byName(elm) );
  
@@@ -495,7 -496,7 +496,7 @@@
      link->p_speed.event = future_evt_set->add_trace(trace, 0.0, link);
    }
  
 -  xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
 +  xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) {
      tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
      NetworkCm02Link *link = static_cast<NetworkCm02Link*>(Link::byName(elm));;