Fix several glitches, add a 'proc' field to the sockets. I want to know the name...

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

diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c
index bd52f0c..4e76331 100644 (file)
--- a/src/gras/Transport/transport.c
+++ b/src/gras/Transport/transport.c
@@ -162,20 +162,24 @@ void gras_trp_socket_new(int incoming,
   sock->port      = -1;
   sock->peer_port = -1;
   sock->peer_name = NULL;
+  sock->peer_proc = NULL;
 
   sock->data   = NULL;
   sock->bufdata = NULL;
   
   *dst = sock;
 
-  xbt_dynar_push(((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst);
+  xbt_dynar_push(((gras_trp_procdata_t) 
+                    gras_libdata_by_id(gras_trp_libdata_id))->sockets,dst);
   XBT_OUT;
 }
 
 
 /**
  * @brief Opens a server socket and makes it ready to be listened to.
+ * @param port: port on which you want to listen
  * @param buf_size: size of the buffer (in byte) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change)
+ * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages)
  * 
  * In real life, you'll get a TCP socket. 
  */
@@ -219,7 +223,10 @@ gras_socket_server_ext(unsigned short port,
    
 /**
  * @brief Opens a client socket to a remote host.
+ * @param host: who you want to connect to
+ * @param port: where you want to connect to on this host
  * @param buf_size: size of the buffer (in bytes) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change)
+ * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages)
  * 
  * In real life, you'll get a TCP socket. 
  */
@@ -268,7 +275,7 @@ gras_socket_client_ext(const char *host,
  */
 gras_socket_t
 gras_socket_server(unsigned short port) {
-   return gras_socket_server_ext(port,32,0);
+   return gras_socket_server_ext(port,32*1024,0);
 }
 
 /**
@@ -280,7 +287,7 @@ gras_socket_server(unsigned short port) {
 gras_socket_t
 gras_socket_client(const char *host,
                   unsigned short port) {
-   return gras_socket_client_ext(host,port,32,0);
+   return gras_socket_client_ext(host,port,32*1024,0);
 }
 
 
@@ -358,6 +365,13 @@ int   gras_socket_peer_port(gras_socket_t sock) {
 char *gras_socket_peer_name(gras_socket_t sock) {
   return sock->peer_name;
 }
+char *gras_socket_peer_proc(gras_socket_t sock) {
+  return sock->peer_proc;
+}
+
+void gras_socket_peer_proc_set(gras_socket_t sock,char*peer_proc) {
+  sock->peer_proc = peer_proc;
+}
 
 /** \brief Check if the provided socket is a measurement one (or a regular one) */
 int gras_socket_is_meas(gras_socket_t sock) {
@@ -382,13 +396,16 @@ void gras_socket_meas_send(gras_socket_t peer,
                           unsigned int timeout,
                           unsigned long int exp_size, 
                           unsigned long int msg_size) {
-  char *chunk = xbt_malloc0(msg_size);
+  char *chunk=NULL;
   unsigned long int exp_sofar;
    
   XBT_IN;
 
+  if (gras_if_RL()) 
+    chunk=xbt_malloc0(msg_size);
+
   xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket");
-  xbt_assert0(peer->outgoing,"Socket not suited for data send");
+  xbt_assert0(peer->outgoing,"Socket not suited for data send (was created with gras_socket_server(), not gras_socket_client())");
 
   for (exp_sofar=0; exp_sofar < exp_size; exp_sofar += msg_size) {
      CDEBUG5(trp_meas,"Sent %lu of %lu (msg_size=%ld) to %s:%d",
@@ -400,7 +417,8 @@ void gras_socket_meas_send(gras_socket_t peer,
          exp_sofar,exp_size,msg_size,
          gras_socket_peer_name(peer), gras_socket_peer_port(peer));
             
-  free(chunk);
+  if (gras_if_RL()) 
+    free(chunk);
 
   XBT_OUT;
 }
@@ -415,11 +433,14 @@ void gras_socket_meas_recv(gras_socket_t peer,
                           unsigned long int exp_size, 
                           unsigned long int msg_size){
   
-  char *chunk = xbt_malloc(msg_size);
+  char *chunk=NULL;
   unsigned long int exp_sofar;
 
   XBT_IN;
 
+  if (gras_if_RL()) 
+    chunk = xbt_malloc(msg_size);
+
   xbt_assert0(peer->meas,
              "Asked to receive measurement data on a regular socket");
   xbt_assert0(peer->incoming,"Socket not suited for data receive");
@@ -434,7 +455,8 @@ void gras_socket_meas_recv(gras_socket_t peer,
          exp_sofar,exp_size,msg_size,
          gras_socket_peer_name(peer), gras_socket_peer_port(peer));
 
-  free(chunk);
+  if (gras_if_RL()) 
+    free(chunk);
   XBT_OUT;
 }
 
@@ -457,7 +479,8 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){
              "No need to accept on non-measurement sockets (it's automatic)");
 
   if (!peer->accepting) {
-    /* nothing to accept here */
+    /* nothing to accept here (must be in SG) */
+    /* BUG: FIXME: this is BAD! it makes tricky to free the accepted socket*/
     return peer;
   }