From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 10 Sep 2015 23:28:35 +0000 (+0200)
Subject: plug some memleaks
X-Git-Tag: v3_12~256
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/74a27c3b0fb3a2dc5f6bb22a7a80d7a9d6d9c9ba?ds=sidebyside

plug some memleaks
---

diff --git a/src/surf/network_interface.cpp b/src/surf/network_interface.cpp
index 9fd4ccc489..c9de3c520d 100644
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@ -79,6 +79,7 @@ Link **Link::linksList() {
 void Link::linksExit() {
 	for (auto kv : *links)
 		delete (kv.second);
+	delete links;
 }
 /*************
  * Callbacks *
diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 1d2999854f..41c3421120 100644
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -4,12 +4,12 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "surf_interface.hpp"
-#include <float.h>
-
 #ifndef NETWORK_ROUTING_HPP_
 #define NETWORK_ROUTING_HPP_
 
+#include "surf_interface.hpp"
+#include <float.h>
+
 XBT_PUBLIC(void) routing_model_create( void *loopback);
 
 /* ************************************************************************** */
@@ -26,6 +26,21 @@ class RoutingModelDescription;
 class Onelink;
 class RoutingPlatf;
 
+/** @ingroup SURF_routing_interface
+ * @brief A routing edge
+ * @details [long description]
+ */
+struct RoutingEdge {
+public:
+  virtual ~RoutingEdge(){};
+  virtual int getId()=0;
+  virtual int *getIdPtr()=0;
+  virtual void setId(int id)=0;
+  virtual char *getName()=0;
+  virtual As *getRcComponent()=0;
+  virtual e_surf_network_element_type_t getRcType()=0;
+};
+
 /** @ingroup SURF_routing_interface
  * @brief The Autonomous System (AS) routing interface
  * @details [TODO]
@@ -52,6 +67,8 @@ public:
    */
   virtual ~As(){
 	xbt_free(p_name);
+	if (p_netElem)
+		delete p_netElem;
   };
 
   /**
@@ -79,21 +96,6 @@ public:
   virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
 };
 
-/** @ingroup SURF_routing_interface
- * @brief A routing edge
- * @details [long description]
- */
-struct RoutingEdge {
-public:
-  virtual ~RoutingEdge(){};
-  virtual int getId()=0;
-  virtual int *getIdPtr()=0;
-  virtual void setId(int id)=0;
-  virtual char *getName()=0;
-  virtual As *getRcComponent()=0;
-  virtual e_surf_network_element_type_t getRcType()=0;
-};
-
 struct RoutingEdgeImpl : public RoutingEdge {
 public:
   RoutingEdgeImpl(char *name, int id, e_surf_network_element_type_t rcType, As *rcComponent)
diff --git a/teshsuite/msg/host_on_off/host_on_off_recv.c b/teshsuite/msg/host_on_off/host_on_off_recv.c
index cc286af30a..bd6a7bd082 100644
--- a/teshsuite/msg/host_on_off/host_on_off_recv.c
+++ b/teshsuite/msg/host_on_off/host_on_off_recv.c
@@ -45,6 +45,7 @@ int master(int argc, char *argv[])
 
     if (comm) {
       MSG_comm_wait(comm, -1);
+      MSG_comm_destroy(comm);
     }
     XBT_INFO("Master has finished");
   }
diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
index b2eb287377..7fd2ced036 100644
--- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.c
@@ -254,6 +254,7 @@ int main(int argc, char *argv[])
      sscanf(xbt_dynar_get_as(s_tests, iter, char *), "%d", &tmp_test);
      xbt_dynar_set_as(tests, iter, int, tmp_test);
   }
+  xbt_dynar_free(&s_tests);
 
   platform_file = argv[1];
   application_file = argv[2];