Java: be more verbose when cleaning the disk on exit fails

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

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index a4b3e23..512a452 100644 (file)
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -96,34 +96,11 @@ namespace simgrid {
     simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onStateChange;
 
     simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::Action::State, simgrid::surf::Action::State)> networkActionStateChangedCallbacks;
-    simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)> networkCommunicateCallbacks;
+    simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst)> Link::onCommunicate;
 
   }
 }
 
-void netlink_parse_init(sg_platf_link_cbarg_t link){
-  std::vector<char*> names;
-
-  if (link->policy == SURF_LINK_FULLDUPLEX) {
-    names.push_back(bprintf("%s_UP", link->id));
-    names.push_back(bprintf("%s_DOWN", link->id));
-  } else {
-    names.push_back(xbt_strdup(link->id));
-  }
-  for (auto link_name : names) {
-    Link *l = surf_network_model->createLink(link_name, 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_name);
-  }
-}
-
 /*********
  * Model *
  *********/
@@ -133,6 +110,13 @@ simgrid::surf::NetworkModel *surf_network_model = NULL;
 namespace simgrid {
   namespace surf {
 
+    NetworkModel::~NetworkModel()
+    {
+      lmm_system_free(maxminSystem_);
+      xbt_heap_free(actionHeap_);
+      delete modifiedSet_;
+    }
+
     double NetworkModel::latencyFactor(double /*size*/) {
       return sg_latency_factor;
     }