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

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index 12e6392d45..3295dd1876 100644
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -12,8 +12,7 @@
 #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:
@@ -29,7 +28,8 @@ XBT_LOG_DEFAULT_CATEGORY(transport);
 gras_socket_t gras_trp_select(double timeout) {
   
   gras_socket_t res;
-  gras_trp_procdata_t pd=(gras_trp_procdata_t)gras_libdata_get("gras_trp");
+  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;
 
@@ -58,11 +58,11 @@ gras_socket_t 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) {
       return sock_iter;
     }
@@ -71,7 +71,7 @@ gras_socket_t gras_trp_select(double timeout) {
   /* Socket to expeditor not created yet */
   DEBUG0("Create a socket to the expeditor");
   
-  trp = gras_trp_plugin_get_by_name("buf");
+  trp = gras_trp_plugin_get_by_name("sg");
   
   gras_trp_socket_new(1,&res);
   res->plugin   = trp;
@@ -136,11 +136,9 @@ gras_socket_t gras_trp_select(double timeout) {
   
 /* dummy implementations of the functions used in RL mode */
 
-void gras_trp_tcp_setup(gras_trp_plugin_t plug) {
-}
-void gras_trp_file_setup(gras_trp_plugin_t plug) {
-  THROW0(mismatch_error,0,"No file within SG realm");
-}
-
+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;}