- Reduce the number of system headers loaded, overload some more system

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

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index bfa5a93..5d440fc 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -8,11 +8,9 @@
 /* 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 <time.h>       /* time() */
+#include "gras/Transport/transport_private.h"
 
-#include "Transport/transport_private.h"
-
-GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(transport,GRAS);
+GRAS_LOG_NEW_DEFAULT_SUBCATEGORY(transport,gras,"Conveying bytes over the network");
 
 static gras_dict_t  *_gras_trp_plugins;     /* All registered plugins */
 static void gras_trp_plugin_free(void *p); /* free one of the plugins */
@@ -26,15 +24,13 @@ gras_error_t
 gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
   gras_error_t errcode;
 
-  gras_trp_plugin_t *plug = malloc(sizeof(gras_trp_plugin_t));
+  gras_trp_plugin_t *plug = gras_new0(gras_trp_plugin_t, 1);
   
   DEBUG1("Create plugin %s",name);
 
   if (!plug) 
     RAISE_MALLOC;
 
-  memset(plug,0,sizeof(gras_trp_plugin_t));
-
   plug->name=strdup(name);
   if (!plug->name)
     RAISE_MALLOC;
@@ -43,8 +39,8 @@ gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
   switch (errcode) {
   case mismatch_error:
     /* SG plugin return mismatch when in RL mode (and vice versa) */
-    free(plug->name);
-    free(plug);
+    gras_free(plug->name);
+    gras_free(plug);
     break;
 
   case no_error:
@@ -53,7 +49,7 @@ gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) {
     break;
 
   default:
-    free(plug);
+    gras_free(plug);
     return errcode;
   }
   return no_error;
@@ -71,6 +67,9 @@ gras_trp_init(void){
   TRY(gras_trp_plugin_new("file",gras_trp_file_setup));
   TRY(gras_trp_plugin_new("sg",gras_trp_sg_setup));
 
+  /* buf is composed, so it must come after the others */
+  TRY(gras_trp_plugin_new("buf", gras_trp_buf_setup));
+
   return no_error;
 }
 
@@ -88,11 +87,11 @@ void gras_trp_plugin_free(void *p) {
       plug->exit(plug);
     } else if (plug->data) {
       DEBUG1("Plugin %s lacks exit(). Free data anyway.",plug->name);
-      free(plug->data);
+      gras_free(plug->data);
     }
 
-    free(plug->name);
-    free(plug);
+    gras_free(plug->name);
+    gras_free(plug);
   }
 }
 
@@ -107,7 +106,7 @@ gras_error_t gras_trp_socket_new(int incoming,
 
   gras_socket_t *sock;
 
-  if (! (sock=malloc(sizeof(gras_socket_t))) )
+  if (! (sock=gras_new(gras_socket_t,1)) )
     RAISE_MALLOC;
   DEBUG1("Create a new socket (%p)", sock);
 
@@ -147,8 +146,7 @@ gras_socket_server(unsigned short port,
   *dst = NULL;
 
   DEBUG1("Create a server socket from plugin %s",gras_if_RL() ? "tcp" : "sg");
-  TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg",
-                                 &trp));
+  TRY(gras_trp_plugin_get_by_name("buf",&trp));
 
   /* defaults settings */
   TRY(gras_trp_socket_new(1,&sock));
@@ -163,7 +161,7 @@ gras_socket_server(unsigned short port,
         sock->accepting?'y':'n');
 
   if (errcode != no_error) {
-    free(sock);
+    gras_free(sock);
     return errcode;
   }
 
@@ -189,8 +187,7 @@ gras_socket_client(const char *host,
 
   *dst = NULL;
 
-  TRY(gras_trp_plugin_get_by_name(gras_if_RL() ? "tcp" : "sg",
-                                 &trp));
+  TRY(gras_trp_plugin_get_by_name("buf",&trp));
 
   DEBUG1("Create a client socket from plugin %s",gras_if_RL() ? "tcp" : "sg");
   /* defaults settings */
@@ -200,16 +197,16 @@ gras_socket_client(const char *host,
   sock->peer_name = strdup(host?host:"localhost");
 
   /* plugin-specific */
-  errcode= (* trp->socket_client)(trp, 
-                                 host ? host : "localhost", port,
-                                 sock);
+  errcode= (*trp->socket_client)(trp, 
+                                host ? host : "localhost", port,
+                                sock);
   DEBUG3("in=%c out=%c accept=%c",
         sock->incoming?'y':'n', 
         sock->outgoing?'y':'n',
         sock->accepting?'y':'n');
 
   if (errcode != no_error) {
-    free(sock);
+    gras_free(sock);
     return errcode;
   }
 
@@ -233,8 +230,8 @@ void gras_socket_close(gras_socket_t *sock) {
 
        /* free the memory */
        if (sock->peer_name)
-         free(sock->peer_name);
-       free(sock);
+         gras_free(sock->peer_name);
+       gras_free(sock);
        return;
       }
     }
@@ -250,7 +247,7 @@ void gras_socket_close(gras_socket_t *sock) {
 gras_error_t
 gras_trp_chunk_send(gras_socket_t *sd,
                    char *data,
-                   size_t size) {
+                   long int size) {
   gras_assert1(sd->outgoing,
               "Socket not suited for data send (outgoing=%c)",
               sd->outgoing?'y':'n');
@@ -267,7 +264,7 @@ gras_trp_chunk_send(gras_socket_t *sd,
 gras_error_t 
 gras_trp_chunk_recv(gras_socket_t *sd,
                    char *data,
-                   size_t size) {
+                   long int size) {
   gras_assert0(sd->incoming,
               "Socket not suited for data receive");
   gras_assert1(sd->plugin->chunk_recv,
@@ -276,6 +273,15 @@ gras_trp_chunk_recv(gras_socket_t *sd,
   return (sd->plugin->chunk_recv)(sd,data,size);
 }
 
+/**
+ * gras_trp_flush:
+ *
+ * Make sure all pending communications are done
+ */
+gras_error_t 
+gras_trp_flush(gras_socket_t *sd) {
+  return (sd->plugin->flush)(sd);
+}
 
 gras_error_t
 gras_trp_plugin_get_by_name(const char *name,