X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3154c75960afc4f3fe7e53c835e35f2584ed97a..30d60b272963b1b130ea80840af783ee9c146b97:/src/surf/network_interface.cpp

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index d3ce07e193..b53f31255f 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -12,8 +12,7 @@
 #ifndef NETWORK_INTERFACE_CPP_
 #define NETWORK_INTERFACE_CPP_
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
-    "Logging specific to the SURF network module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf, "Logging specific to the SURF network module");
 
 /*********
  * C API *
@@ -64,12 +63,9 @@ namespace simgrid {
 
     boost::unordered_map<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
     Link *Link::byName(const char* name) {
-      Link * res = NULL;
-      try {
-        res = links->at(name);
-      } catch (std::out_of_range& e) {}
-
-      return res;
+      if (links->find(name) == links->end())
+        return NULL;
+      return  links->at(name);
     }
     /** @brief Returns the amount of links in the platform */
     int Link::linksCount() {
@@ -109,28 +105,35 @@ void netlink_parse_init(sg_platf_link_cbarg_t link){
   if (link->policy == SURF_LINK_FULLDUPLEX) {
     char *link_id;
     link_id = bprintf("%s_UP", link->id);
-    surf_network_model->createLink(link_id,
-        link->bandwidth,
-        link->bandwidth_trace,
-        link->latency,
-        link->latency_trace,
-        link->state_trace, link->policy, link->properties);
+    Link *l = surf_network_model->createLink(link_id, link->bandwidth, link->latency,
+        link->policy, link->properties);
+    if (link->latency_trace)
+      l->setLatencyTrace(link->latency_trace);
+    if (link->bandwidth_trace)
+      l->setBandwidthTrace(link->bandwidth_trace);
+    if (link->state_trace)
+      l->setStateTrace(link->state_trace);
+
     xbt_free(link_id);
     link_id = bprintf("%s_DOWN", link->id);
-    surf_network_model->createLink(link_id,
-        link->bandwidth,
-        link->bandwidth_trace,
-        link->latency,
-        link->latency_trace,
-        link->state_trace, link->policy, link->properties);
+    l = surf_network_model->createLink(link_id, link->bandwidth, link->latency,
+        link->policy, link->properties);
+    if (link->latency_trace)
+      l->setLatencyTrace(link->latency_trace);
+    if (link->bandwidth_trace)
+      l->setBandwidthTrace(link->bandwidth_trace);
+    if (link->state_trace)
+      l->setStateTrace(link->state_trace);
     xbt_free(link_id);
   } else {
-    surf_network_model->createLink(link->id,
-        link->bandwidth,
-        link->bandwidth_trace,
-        link->latency,
-        link->latency_trace,
-        link->state_trace, link->policy, link->properties);
+    Link *l=surf_network_model->createLink(link->id, link->bandwidth, link->latency,
+        link->policy, link->properties);
+    if (link->latency_trace)
+      l->setLatencyTrace(link->latency_trace);
+    if (link->bandwidth_trace)
+      l->setBandwidthTrace(link->bandwidth_trace);
+    if (link->state_trace)
+      l->setStateTrace(link->state_trace);
   }
 }
 
@@ -161,7 +164,7 @@ namespace simgrid {
       ActionList *runningActions = surf_network_model->getRunningActionSet();
       double minRes;
 
-      minRes = shareResourcesMaxMin(runningActions, surf_network_model->p_maxminSystem, surf_network_model->f_networkSolve);
+      minRes = shareResourcesMaxMin(runningActions, surf_network_model->maxminSystem_, surf_network_model->f_networkSolve);
 
       for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
           ; it != itend ; ++it) {
@@ -191,16 +194,12 @@ namespace simgrid {
       XBT_DEBUG("Create link '%s'",name);
     }
 
-    Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props,
-        lmm_constraint_t constraint,
-        tmgr_trace_t state_trace)
+    Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint)
     : Resource(model, name, constraint),
       PropertyHolder(props)
     {
       m_latency.scale = 1;
       m_bandwidth.scale = 1;
-      if (state_trace)
-        m_stateEvent = future_evt_set->add_trace(state_trace, 0.0, this);
 
       links->insert({name, this});
       XBT_DEBUG("Create link '%s'",name);
@@ -256,22 +255,18 @@ namespace simgrid {
         onStateChange(this);
       }
     }
-    void Link::set_state_trace(tmgr_trace_t trace)
-    {
+    void Link::setStateTrace(tmgr_trace_t trace) {
       xbt_assert(m_stateEvent==NULL,"Cannot set a second state trace to Link %s", getName());
-
       m_stateEvent = future_evt_set->add_trace(trace, 0.0, this);
     }
-    void Link::set_bandwidth_trace(tmgr_trace_t trace)
+    void Link::setBandwidthTrace(tmgr_trace_t trace)
     {
       xbt_assert(m_bandwidth.event==NULL,"Cannot set a second bandwidth trace to Link %s", getName());
-
       m_bandwidth.event = future_evt_set->add_trace(trace, 0.0, this);
     }
-    void Link::set_latency_trace(tmgr_trace_t trace)
+    void Link::setLatencyTrace(tmgr_trace_t trace)
     {
       xbt_assert(m_latency.event==NULL,"Cannot set a second latency trace to Link %s", getName());
-
       m_latency.event = future_evt_set->add_trace(trace, 0.0, this);
     }