Some more code factorisation (registering the new socket into the set of known socket...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@171 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/gras/Transport/rl_transport.c b/src/gras/Transport/rl_transport.c
index ce85e46..858ba73 100644 (file)
--- a/src/gras/Transport/rl_transport.c
+++ b/src/gras/Transport/rl_transport.c
@@ -131,7 +131,6 @@ gras_trp_select(double timeout,
 
         TRY(sock_iter->plugin->socket_accept(sock_iter,&accepted));
         accepted->raw = sock_iter->raw;
-        TRY(gras_dynar_push(sockets,&accepted));
        } else {
 #if 0 
        FIXME: this fails of files. quite logical

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index 46629df..0e66dc1 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -123,7 +123,8 @@ gras_error_t gras_trp_socket_new(int incoming,
   sock->raw = 0;
 
   *dst = sock;
-  return no_error;
+
+  return gras_dynar_push(gras_socketset_get(),dst);
 }
 
 
@@ -165,13 +166,6 @@ gras_socket_server(unsigned short port,
   }
 
   *dst = sock;
-  /* Register this socket */
-  errcode = gras_dynar_push(gras_socketset_get(),dst);
-  if (errcode != no_error) {
-    free(sock);
-    *dst = NULL;
-    return errcode;
-  }
 
   return no_error;
 }
@@ -216,14 +210,7 @@ gras_socket_client(const char *host,
     return errcode;
   }
 
-  /* register socket */
   *dst = sock;
-  errcode = gras_dynar_push(gras_socketset_get(),dst);
-  if (errcode != no_error) {
-    free(sock);
-    *dst = NULL;
-    return errcode;
-  }
 
   return no_error;
 }