Plug a memleak on sock_close (on peer_name)

[simgrid.git] / src / gras / Transport / transport.c

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index f799f4c..46629df 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -17,12 +17,8 @@ GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(transport,GRAS);
 static gras_dict_t  *_gras_trp_plugins;     /* All registered plugins */
 static void gras_trp_plugin_free(void *p); /* free one of the plugins */
 
-
-gras_dynar_t *_gras_trp_sockets; /* all existing sockets */
 static void gras_trp_socket_free(void *s); /* free one socket */
 
-static fd_set FDread;
-
 gras_error_t
 gras_trp_plugin_new(const char *name, gras_trp_setup_t setup);
 
@@ -44,9 +40,10 @@ gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
     RAISE_MALLOC;
 
   errcode = setup(plug);
-  switch (setup(plug)) {
+  switch (errcode) {
   case mismatch_error:
     /* SG plugin return mismatch when in RL mode (and vice versa) */
+    free(plug->name);
     free(plug);
     break;
 
@@ -66,12 +63,6 @@ gras_error_t
 gras_trp_init(void){
   gras_error_t errcode;
   
-  /* make room for all socket ownership descriptions */
-  TRY(gras_dynar_new(&_gras_trp_sockets, sizeof(gras_socket_t*), NULL));
-
-  /* We do not ear for any socket for now */
-  FD_ZERO(&FDread);
-  
   /* make room for all plugins */
   TRY(gras_dict_new(&_gras_trp_plugins));
 
@@ -86,7 +77,6 @@ gras_trp_init(void){
 void
 gras_trp_exit(void){
   gras_dict_free(&_gras_trp_plugins);
-  gras_dynar_free(_gras_trp_sockets);
 }
 
 
@@ -94,10 +84,12 @@ void gras_trp_plugin_free(void *p) {
   gras_trp_plugin_t *plug = p;
 
   if (plug) {
-    if (plug->exit)
+    if (plug->exit) {
       plug->exit(plug);
-    else if (plug->data) 
+    } else if (plug->data) {
+      DEBUG1("Plugin %s lacks exit(). Free data anyway.",plug->name);
       free(plug->data);
+    }
 
     free(plug->name);
     free(plug);
@@ -174,7 +166,7 @@ gras_socket_server(unsigned short port,
 
   *dst = sock;
   /* Register this socket */
-  errcode = gras_dynar_push(_gras_trp_sockets,dst);
+  errcode = gras_dynar_push(gras_socketset_get(),dst);
   if (errcode != no_error) {
     free(sock);
     *dst = NULL;
@@ -226,7 +218,7 @@ gras_socket_client(const char *host,
 
   /* register socket */
   *dst = sock;
-  errcode = gras_dynar_push(_gras_trp_sockets,dst);
+  errcode = gras_dynar_push(gras_socketset_get(),dst);
   if (errcode != no_error) {
     free(sock);
     *dst = NULL;
@@ -236,21 +228,23 @@ gras_socket_client(const char *host,
   return no_error;
 }
 
-void gras_socket_close(gras_socket_t **sock) {
+void gras_socket_close(gras_socket_t *sock) {
+  gras_dynar_t *sockets = gras_socketset_get();
   gras_socket_t *sock_iter;
   int cursor;
 
   /* FIXME: Issue an event when the socket is closed */
-  if (sock && *sock) {
-    gras_dynar_foreach(_gras_trp_sockets,cursor,sock_iter) {
-      if (*sock == sock_iter) {
-       gras_dynar_cursor_rm(_gras_trp_sockets,&cursor);
-       if ( (*sock)->plugin->socket_close) 
-         (* (*sock)->plugin->socket_close)(*sock);
+  if (sock) {
+    gras_dynar_foreach(sockets,cursor,sock_iter) {
+      if (sock == sock_iter) {
+       gras_dynar_cursor_rm(sockets,&cursor);
+       if ( sock->plugin->socket_close) 
+         (* sock->plugin->socket_close)(sock);
 
        /* free the memory */
-       free(*sock);
-       *sock=NULL;
+       if (sock->peer_name)
+         free(sock->peer_name);
+       free(sock);
        return;
       }
     }