X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d52d77d655507787a4de97cda2600879a4f644a..58a5fef8735699a10762fe2bb8f1f938fba4b651:/src/gras/Transport/sg_transport.c

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index c261a058d5..3295dd1876 100644
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -7,12 +7,12 @@
 /* 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 "xbt/ex.h"
 #include "gras/Transport/transport_private.h"
 #include "msg/msg.h"
 #include "gras/Virtu/virtu_sg.h"
 
-XBT_LOG_EXTERNAL_CATEGORY(transport);
-XBT_LOG_DEFAULT_CATEGORY(transport);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_trp);
 
 /**
  * gras_trp_select:
@@ -25,13 +25,11 @@ XBT_LOG_DEFAULT_CATEGORY(transport);
  *
  * if timeout>0 and no message there, wait at most that amount of time before giving up.
  */
-xbt_error_t 
-gras_trp_select(double timeout, 
-		gras_socket_t *dst) {
-
-  xbt_error_t errcode;
-  double startTime=gras_os_time();
-  gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp");
+gras_socket_t gras_trp_select(double timeout) {
+  
+  gras_socket_t res;
+  gras_trp_procdata_t pd = 
+    (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
   gras_trp_sg_sock_data_t *sockdata;
   gras_trp_plugin_t trp;
 
@@ -48,11 +46,11 @@ gras_trp_select(double timeout,
 	 MSG_host_get_name(MSG_host_self()),
 	 timeout);
 
-  r_pid = MSG_task_select_from((m_channel_t) pd->chan, timeout);
-
+  MSG_channel_select_from((m_channel_t) pd->chan, timeout, &r_pid);
+  
   if (r_pid < 0) {
     DEBUG0("TIMEOUT");
-    return timeout_error;
+    THROW0(timeout_error,0,"Timeout");
   }
 
   /* Ok, got something. Open a socket back to the expeditor */
@@ -60,51 +58,50 @@ gras_trp_select(double timeout,
   /* Try to reuse an already openned socket to that expeditor */
   xbt_dynar_foreach(pd->sockets,cursor,sock_iter) {
     DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter);
-    sockdata = sock_iter->data;
     
     if (sock_iter->meas || !sock_iter->outgoing)
       continue;
     
+    sockdata = sock_iter->data;
     if (sockdata->to_PID == r_pid) {
-      *dst=sock_iter;
-      return no_error;
+      return sock_iter;
     }
   }
   
   /* Socket to expeditor not created yet */
   DEBUG0("Create a socket to the expeditor");
   
-  TRY(gras_trp_plugin_get_by_name("buf",&trp));
+  trp = gras_trp_plugin_get_by_name("sg");
   
-  gras_trp_socket_new(1,dst);
-  (*dst)->plugin   = trp;
+  gras_trp_socket_new(1,&res);
+  res->plugin   = trp;
   
-  (*dst)->incoming  = 1;
-  (*dst)->outgoing  = 1;
-  (*dst)->accepting = 0;
-  (*dst)->sd        = -1;
+  res->incoming  = 1;
+  res->outgoing  = 1;
+  res->accepting = 0;
+  res->sd        = -1;
   
-  (*dst)->port      = -1;
+  res->port      = -1;
   
   sockdata = xbt_new(gras_trp_sg_sock_data_t,1);
   sockdata->from_PID = MSG_process_self_PID();
   sockdata->to_PID   = r_pid;
   sockdata->to_host  = MSG_process_get_host(MSG_process_from_PID(r_pid));
-  (*dst)->data = sockdata;
-  gras_trp_buf_init_sock(*dst);
+  res->data = sockdata;
+  gras_trp_buf_init_sock(res);
   
-  (*dst)->peer_name = strdup(MSG_host_get_name(sockdata->to_host));
+  res->peer_name = strdup(MSG_host_get_name(sockdata->to_host));
   
   remote_hd=(gras_hostdata_t *)MSG_host_get_data(sockdata->to_host);
   xbt_assert0(remote_hd,"Run gras_process_init!!");
   
   sockdata->to_chan = -1;
-  (*dst)->peer_port = -10;
+  res->peer_port = -10;
   for (cursor=0; cursor<XBT_MAX_CHANNEL; cursor++) {
     if (remote_hd->proc[cursor] == r_pid) {
       sockdata->to_chan = cursor;
       DEBUG2("Chan %d on %s is for my pal",
-	     cursor,(*dst)->peer_name);
+	     cursor,res->peer_name);
       
       xbt_dynar_foreach(remote_hd->ports, cpt, pr) {
 	if (sockdata->to_chan == pr.tochan) {
@@ -113,7 +110,7 @@ gras_trp_select(double timeout,
 	    continue;
 	  }
 	  
-	  (*dst)->peer_port = pr.port;
+	  res->peer_port = pr.port;
 	  DEBUG1("Cool, it points to port %d", pr.port);
 	  break;
 	} else {
@@ -121,7 +118,7 @@ gras_trp_select(double timeout,
 		 pr.tochan,sockdata->to_chan);
 	}
       }
-      if ((*dst)->peer_port == -10) {
+      if (res->peer_port == -10) {
 	/* was for measurement */
 	sockdata->to_chan = -1;
       } else {
@@ -133,18 +130,15 @@ gras_trp_select(double timeout,
   xbt_assert0(sockdata->to_chan != -1,
 	      "Got a message from a process without channel");
   
-  return no_error;
+  return res;
 }
 
   
 /* dummy implementations of the functions used in RL mode */
 
-xbt_error_t gras_trp_tcp_setup(gras_trp_plugin_t plug) {
-  return mismatch_error;
-}
-xbt_error_t gras_trp_file_setup(gras_trp_plugin_t plug) {
-  return mismatch_error;
-}
-
+void gras_trp_tcp_setup(gras_trp_plugin_t plug) {  THROW0(mismatch_error,0,NULL); }
+void gras_trp_file_setup(gras_trp_plugin_t plug){  THROW0(mismatch_error,0,NULL); }
+void gras_trp_iov_setup(gras_trp_plugin_t plug) {  THROW0(mismatch_error,0,NULL); }
 
+gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock) { return sock;}