Better fix to the comparison between signed and unsigned int around dynar size: chang...

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

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index e2b6ff8..1df5295 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -153,7 +153,7 @@ void gras_trp_socket_new(int incoming,
   sock->outgoing  = incoming ? 0:1;
   sock->accepting = incoming ? 1:0;
   sock->meas = 0;
-  sock->recv_ok = 1;
+  sock->recvd = 0;
   sock->valid = 1;
   sock->moredata = 0;
 
@@ -168,8 +168,6 @@ void gras_trp_socket_new(int incoming,
   
   *dst = sock;
 
-  xbt_dynar_push(((gras_trp_procdata_t) 
-                 gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst);
   XBT_OUT;
 }
  
@@ -212,20 +210,15 @@ gras_socket_server_ext(unsigned short port,
           sock->outgoing?'y':'n',
           sock->accepting?'y':'n');
   } CATCH(e) {
-    int cursor;
-    gras_socket_t sock_iter;
-    xbt_dynar_t socks = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
-    xbt_dynar_foreach(socks, cursor, sock_iter) {
-       if (sock_iter==sock) {
-                                xbt_dynar_cursor_rm(socks,&cursor);
-                        }
-    }     
+
     free(sock);
     RETHROW;
   }
 
   if (!measurement)
      ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport = port;
+  xbt_dynar_push(((gras_trp_procdata_t) 
+                 gras_libdata_by_id(gras_trp_libdata_id))->sockets,&sock);
   return sock;
 }
 /**
@@ -299,13 +292,11 @@ gras_socket_client_ext(const char *host,
           sock->outgoing?'y':'n',
           sock->accepting?'y':'n');
   } CATCH(e) {
-     xbt_dynar_pop(((gras_trp_procdata_t)
-                   gras_libdata_by_id(gras_trp_libdata_id))->sockets,NULL);
      free(sock);
-                xbt_backtrace_display(&e);
-    RETHROW;
+     RETHROW;
   }
-
+  xbt_dynar_push(((gras_trp_procdata_t) 
+                 gras_libdata_by_id(gras_trp_libdata_id))->sockets,&sock);
   return sock;
 }
 
@@ -340,7 +331,7 @@ gras_socket_client_from_string(const char *host) {
 void gras_socket_close(gras_socket_t sock) {
   xbt_dynar_t sockets = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets;
   gras_socket_t sock_iter = NULL;
-  int cursor;
+  unsigned int cursor;
 
   XBT_IN;
   VERB1("Close %p",sock);
@@ -567,7 +558,7 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){
 /*
  * Creating procdata for this module
  */
-static void *gras_trp_procdata_new() {
+static void *gras_trp_procdata_new(void) {
    gras_trp_procdata_t res = xbt_new(s_gras_trp_procdata_t,1);
    
    res->name = xbt_strdup("gras_trp");
@@ -593,7 +584,7 @@ void gras_trp_socketset_dump(const char *name) {
   gras_trp_procdata_t procdata = 
     (gras_trp_procdata_t)gras_libdata_by_id(gras_trp_libdata_id);
 
-  int it;
+  unsigned int it;
   gras_socket_t s;
 
   INFO1("** Dump the socket set %s",name);