Change all size_t into long int; Fix miscasted arguments of logging functions

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

diff --git a/src/gras/Transport/transport_plugin_tcp.c b/src/gras/Transport/transport_plugin_tcp.c
index 2f6f368..b4a0512 100644 (file)
--- a/src/gras/Transport/transport_plugin_tcp.c
+++ b/src/gras/Transport/transport_plugin_tcp.c
@@ -43,13 +43,13 @@ void         gras_trp_tcp_socket_close(gras_socket_t *sd);
   
 gras_error_t gras_trp_tcp_chunk_send(gras_socket_t *sd,
                                     char *data,
-                                    size_t size);
+                                    long int size);
 
 gras_error_t gras_trp_tcp_chunk_recv(gras_socket_t *sd,
                                     char *data,
-                                    size_t size);
+                                    long int size);
 
-void         gras_trp_tcp_free_specific(void *s);
+void gras_trp_tcp_exit(gras_trp_plugin_t *plug);
 
 
 static int TcpProtoNumber(void);
@@ -77,12 +77,12 @@ typedef struct {
 gras_error_t
 gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
 
-  gras_trp_tcp_plug_data_t *tcp = malloc(sizeof(gras_trp_tcp_plug_data_t));
-  if (!tcp)
+  gras_trp_tcp_plug_data_t *data = malloc(sizeof(gras_trp_tcp_plug_data_t));
+  if (!data)
     RAISE_MALLOC;
 
-  FD_ZERO(&(tcp->msg_socks));
-  FD_ZERO(&(tcp->raw_socks));
+  FD_ZERO(&(data->msg_socks));
+  FD_ZERO(&(data->raw_socks));
 
   plug->socket_client = gras_trp_tcp_socket_client;
   plug->socket_server = gras_trp_tcp_socket_server;
@@ -92,11 +92,17 @@ gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
   plug->chunk_send    = gras_trp_tcp_chunk_send;
   plug->chunk_recv    = gras_trp_tcp_chunk_recv;
 
-  plug->data      = (void*)tcp;
+  plug->data = (void*)data;
+  plug->exit = gras_trp_tcp_exit;
 
   return no_error;
 }
 
+void gras_trp_tcp_exit(gras_trp_plugin_t *plug) {
+  DEBUG1("Exit plugin TCP (free %p)", plug->data);
+  free(plug->data);
+}
+
 gras_error_t gras_trp_tcp_socket_client(gras_trp_plugin_t *self,
                                        const char *host,
                                        unsigned short port,
@@ -193,22 +199,21 @@ gras_error_t
 gras_trp_tcp_socket_accept(gras_socket_t  *sock,
                           gras_socket_t **dst) {
   gras_socket_t *res;
+  gras_error_t errcode;
   
   struct sockaddr_in peer_in;
   socklen_t peer_in_len = sizeof(peer_in);
 
   int sd;
   int tmp_errno;
-                               
-  res=malloc(sizeof(gras_socket_t));
-  if (!res)
-    RAISE_MALLOC;
+                       
+  TRY(gras_trp_socket_new(1,&res));
 
   sd = accept(sock->sd, (struct sockaddr *)&peer_in, &peer_in_len);
   tmp_errno = errno;
 
   if(sd == -1) {
-    gras_socket_close(&sock);
+    gras_socket_close(sock);
     RAISE1(system_error,
           "Accept failed (%s). Droping server socket.", strerror(tmp_errno));
   } else {
@@ -220,13 +225,13 @@ gras_trp_tcp_socket_accept(gras_socket_t  *sock,
       WARN0("setsockopt failed, cannot condition the accepted socket");
     }
  
-     /* FIXME: bufSize removed until we can have optionsets 
-    i = ((gras_trp_tcp_sock_specific_t*)sock->specific)->buffsize;
-    if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (char *)&i, s)
-       || setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (char *)&i, s)) {
-      WARNING0("setsockopt failed, cannot set buffsize");      
-    }
-      */
+    /* FIXME: bufSize removed until we can have optionsets 
+       i = ((gras_trp_tcp_sock_specific_t*)sock->specific)->buffsize;
+       if (setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (char *)&i, s)
+       || setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (char *)&i, s)) {
+       WARNING0("setsockopt failed, cannot set buffsize");     
+       }
+    */
      
     res->plugin    = sock->plugin;
     res->incoming  = sock->incoming;
@@ -267,7 +272,7 @@ void gras_trp_tcp_socket_close(gras_socket_t *sock){
   if (!sock) return; /* close only once */
   tcp=sock->plugin->data;
 
-  DEBUG1("close tcp connection %d\n", sock->sd);
+  DEBUG1("close tcp connection %d", sock->sd);
 
   /* FIXME: no pipe in GRAS so far  
   if(!FD_ISSET(sd, &connectedPipes)) {
@@ -303,8 +308,8 @@ void gras_trp_tcp_socket_close(gras_socket_t *sock){
  */
 gras_error_t 
 gras_trp_tcp_chunk_send(gras_socket_t *sock,
-                   char *data,
-                   size_t size) {
+                       char *data,
+                       long int size) {
   
   /* TCP sockets are in duplex mode, don't check direction */
   gras_assert0(size >= 0, "Cannot send a negative amount of data");
@@ -313,11 +318,11 @@ gras_trp_tcp_chunk_send(gras_socket_t *sock,
     int status = 0;
     
     status = write(sock->sd, data, (size_t)size);
-    DEBUG3("write(%d, %p, %ld);\n", sock->sd, data, size);
+    DEBUG3("write(%d, %p, %ld);", sock->sd, data, size);
     
     if (status == -1) {
-      RAISE4(system_error,"write(%d,%p,%d) failed: %s",
-            sock->sd, data, (int)size,
+      RAISE4(system_error,"write(%d,%p,%ld) failed: %s",
+            sock->sd, data, size,
             strerror(errno));
     }
     
@@ -339,7 +344,7 @@ gras_trp_tcp_chunk_send(gras_socket_t *sock,
 gras_error_t 
 gras_trp_tcp_chunk_recv(gras_socket_t *sock,
                        char *data,
-                       size_t size) {
+                       long int size) {
 
   /* TCP sockets are in duplex mode, don't check direction */
   gras_assert0(sock, "Cannot recv on an NULL socket");
@@ -349,7 +354,7 @@ gras_trp_tcp_chunk_recv(gras_socket_t *sock,
     int status = 0;
     
     status = read(sock->sd, data, (size_t)size);
-    DEBUG3("read(%d, %p, %ld);\n", sock->sd, data, size);
+    DEBUG3("read(%d, %p, %ld);", sock->sd, data, size);
     
     if (status == -1) {
       RAISE4(system_error,"read(%d,%p,%d) failed: %s",