Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Don't read a comm after completion since it is auto-destroyed now.
[simgrid.git] / src / gras / Transport / transport_plugin_sg.c
index 70dd247..8debb38 100644 (file)
-/* $Id$ */
-
 /* file trp (transport) - send/receive a bunch of bytes in SG realm         */
 
 /* Note that this is only used to debug other parts of GRAS since message   */
 /*  exchange in SG realm is implemented directly without mimicing real life */
 /*  This would be terribly unefficient.                                     */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 Martin Quinson.                                       */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* 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. */
* under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <msg.h>
+#include "xbt/ex.h"
 
-#include "transport_private.h"
+#include "simix/simix.h"
+#include "gras/Msg/msg_private.h"
+#include "gras/Transport/transport_private.h"
 #include "gras/Virtu/virtu_sg.h"
 
-XBT_LOG_EXTERNAL_CATEGORY(transport);
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(trp_sg,transport,"SimGrid pseudo-transport");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg, gras_trp,
+                                "SimGrid pseudo-transport");
 
 /***
  *** Prototypes 
  ***/
-/* retrieve the port record associated to a numerical port on an host */
-static xbt_error_t find_port(gras_hostdata_t *hd, int port,
-                             gras_sg_portrec_t *hpd);
-
-
-xbt_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self,
-                                      /* OUT */ gras_socket_t sock);
-xbt_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self,
-                                      /* OUT */ gras_socket_t sock);
-void         gras_trp_sg_socket_close(gras_socket_t sd);
 
-xbt_error_t gras_trp_sg_chunk_send(gras_socket_t sd,
-                                   const char *data,
-                                   long int size);
-
-xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sd,
-                                   char *data,
-                                   long int size);
+/* retrieve the port record associated to a numerical port on an host */
+static gras_sg_portrec_t find_port(gras_hostdata_t * hd, int port);
+
+void gras_trp_sg_socket_client(gras_trp_plugin_t self,
+                               const char*host,
+                               int port,
+                               /* OUT */ gras_socket_t sock);
+void gras_trp_sg_socket_server(gras_trp_plugin_t self,
+                               int port,
+                               /* OUT */ gras_socket_t sock);
+void gras_trp_sg_socket_close(gras_socket_t sd);
+
+void gras_trp_sg_chunk_send_raw(gras_socket_t sd,
+                                const char *data, unsigned long int size);
+void gras_trp_sg_chunk_send(gras_socket_t sd,
+                            const char *data,
+                            unsigned long int size, int stable_ignored);
+
+int gras_trp_sg_chunk_recv(gras_socket_t sd,
+                           char *data, unsigned long int size);
 
 /***
  *** Specific plugin part
  ***/
 typedef struct {
-  int placeholder; /* nothing plugin specific so far */
+  int placeholder;              /* nothing plugin specific so far */
 } gras_trp_sg_plug_data_t;
 
 
 /***
  *** Code
  ***/
-static xbt_error_t find_port(gras_hostdata_t *hd, int port,
-                             gras_sg_portrec_t *hpd) {
-  int cpt;
+static gras_sg_portrec_t find_port(gras_hostdata_t * hd, int port)
+{
+  unsigned int cpt;
   gras_sg_portrec_t pr;
 
-  xbt_assert0(hd,"Please run gras_process_init on each process");
-  
+  xbt_assert0(hd, "Please run gras_process_init on each process");
+
   xbt_dynar_foreach(hd->ports, cpt, pr) {
-    if (pr.port == port) {
-      memcpy(hpd,&pr,sizeof(gras_sg_portrec_t));
-      return no_error;
-    }
+    if (pr->port == port)
+      return pr;
   }
-  return mismatch_error;
+  return NULL;
 }
 
+/***
+ *** Info about who's speaking
+ ***/
+static int gras_trp_sg_my_port(gras_socket_t s) {
+  gras_trp_sg_sock_data_t sockdata = s->data;
+  if (gras_socket_im_the_server(s))
+    return sockdata->server_port;
+  else
+    return sockdata->client_port;
+}
+static int gras_trp_sg_peer_port(gras_socket_t s) {
+  gras_trp_sg_sock_data_t sockdata = s->data;
+  if (gras_socket_im_the_server(s))
+    return sockdata->client_port;
+  else
+    return sockdata->server_port;
+}
 
-xbt_error_t
-gras_trp_sg_setup(gras_trp_plugin_t *plug) {
+static const char* gras_trp_sg_peer_name(gras_socket_t s) {
+  gras_trp_sg_sock_data_t sockdata = s->data;
+  if (gras_socket_im_the_server(s))
+    return SIMIX_host_get_name(SIMIX_req_process_get_host(sockdata->client));
+  else {
+    return SIMIX_host_get_name(SIMIX_req_process_get_host(sockdata->server));
+  }
+}
+static const char* gras_trp_sg_peer_proc(gras_socket_t s) {
+  THROW_UNIMPLEMENTED;
+}
+static void gras_trp_sg_peer_proc_set(gras_socket_t s,char *name) {
+  THROW_UNIMPLEMENTED;
+}
+
+void gras_trp_sg_setup(gras_trp_plugin_t plug)
+{
+
+  plug->my_port = gras_trp_sg_my_port;
+  plug->peer_port = gras_trp_sg_peer_port;
+  plug->peer_name = gras_trp_sg_peer_name;
+  plug->peer_proc = gras_trp_sg_peer_proc;
+  plug->peer_proc_set = gras_trp_sg_peer_proc_set;
 
-  gras_trp_sg_plug_data_t *data=xbt_new(gras_trp_sg_plug_data_t,1);
+  gras_trp_sg_plug_data_t *data = xbt_new(gras_trp_sg_plug_data_t, 1);
 
-  plug->data      = data; 
+  plug->data = data;
 
   plug->socket_client = gras_trp_sg_socket_client;
   plug->socket_server = gras_trp_sg_socket_server;
-  plug->socket_close  = gras_trp_sg_socket_close;
+  plug->socket_close = gras_trp_sg_socket_close;
 
-  plug->chunk_send    = gras_trp_sg_chunk_send;
-  plug->chunk_recv    = gras_trp_sg_chunk_recv;
+  plug->raw_send = gras_trp_sg_chunk_send_raw;
+  plug->send = gras_trp_sg_chunk_send;
+  plug->raw_recv = plug->recv = gras_trp_sg_chunk_recv;
 
-  plug->flush         = NULL; /* nothing cached */
-
-  return no_error;
+  plug->flush = NULL;           /* nothing cached */
 }
 
-xbt_error_t gras_trp_sg_socket_client(gras_trp_plugin_t *self,
-                                      /* OUT */ gras_socket_t sock){
-
-  xbt_error_t errcode;
+void gras_trp_sg_socket_client(gras_trp_plugin_t self,
+                               const char*host,
+                               int port,
+                               /* OUT */ gras_socket_t sock)
+{
 
-  m_host_t peer;
+  smx_host_t peer;
   gras_hostdata_t *hd;
-  gras_trp_sg_sock_data_t *data;
+  gras_trp_sg_sock_data_t data;
   gras_sg_portrec_t pr;
 
   /* make sure this socket will reach someone */
-  if (!(peer=MSG_get_host_by_name(sock->peer_name))) {
-      fprintf(stderr,"GRAS: can't connect to %s: no such host.\n",sock->peer_name);
-      return mismatch_error;
-  }
-  if (!(hd=(gras_hostdata_t *)MSG_host_get_data(peer))) {
-    RAISE1(mismatch_error,
-          "can't connect to %s: no process on this host",
-          sock->peer_name);
+  if (!(peer = SIMIX_req_host_get_by_name(host)))
+    THROW1(mismatch_error, 0,
+           "Can't connect to %s: no such host.\n", host);
+
+  if (!(hd = (gras_hostdata_t *) SIMIX_req_host_get_data(peer)))
+    THROW1(mismatch_error, 0,
+           "can't connect to %s: no process on this host",
+           host);
+
+  pr = find_port(hd, port);
+
+  if (pr == NULL) {
+    THROW2(mismatch_error, 0,
+           "can't connect to %s:%d, no process listen on this port",
+           host, port);
   }
-  errcode = find_port(hd,sock->peer_port,&pr);
-  if (errcode != no_error && errcode != mismatch_error) 
-    return errcode;
-
-  if (errcode == mismatch_error) {
-    RAISE2(mismatch_error,
-          "can't connect to %s:%d, no process listen on this port",
-          sock->peer_name,sock->peer_port);
-  } 
-
-  if (pr.raw && !sock->raw) {
-    RAISE2(mismatch_error,
-          "can't connect to %s:%d in regular mode, the process listen "
-          "in raw mode on this port",sock->peer_name,sock->peer_port);
+
+  /* Ensure that the listener is expecting the kind of stuff we want to send */
+  if (pr->meas && !sock->meas) {
+    THROW2(mismatch_error, 0,
+           "can't connect to %s:%d in regular mode, the process listen "
+           "in measurement mode on this port", host,
+           port);
   }
-  if (!pr.raw && sock->raw) {
-    RAISE2(mismatch_error,
-          "can't connect to %s:%d in raw mode, the process listen "
-          "in regular mode on this port",sock->peer_name,sock->peer_port);
+  if (!pr->meas && sock->meas) {
+    THROW2(mismatch_error, 0,
+           "can't connect to %s:%d in measurement mode, the process listen "
+           "in regular mode on this port", host,
+           port);
   }
 
-  /* create the socket */
-  data = xbt_new(gras_trp_sg_sock_data_t,1);
-  data->from_PID     = MSG_process_self_PID();
-  data->to_PID       = hd->proc[ pr.tochan ];
-  data->to_host      = peer;
-  data->to_chan      = pr.tochan;
-  
+  /* create simulation data of the socket */
+  data = xbt_new0(s_gras_trp_sg_sock_data_t, 1);
+  data->client = SIMIX_process_self();
+  data->server = pr->server;
+  data->server_port = port;
+  data->client_port = gras_os_myport();
+
+  /* initialize synchronization stuff on the socket */
+  data->rdv_server = pr->rdv;
+  data->rdv_client = SIMIX_req_rdv_create(NULL);
+  data->comm_recv = SIMIX_req_comm_irecv(data->rdv_client, &data->msg, NULL, NULL, NULL);
+
+  /* connect that simulation data to the socket */
   sock->data = data;
   sock->incoming = 1;
 
-  DEBUG6("%s (PID %d) connects in %s mode to %s:%d (to_PID=%d)",
-         MSG_process_get_name(MSG_process_self()), MSG_process_self_PID(),
-         sock->raw?"RAW":"regular",
-        sock->peer_name,sock->peer_port,data->to_PID);
-
-  return no_error;
+  DEBUG8("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)",
+         SIMIX_req_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+         sock->meas ? "meas" : "regular", host, port,
+         data->rdv_server,data->rdv_client,data->comm_recv);
 }
 
-xbt_error_t gras_trp_sg_socket_server(gras_trp_plugin_t *self,
-                                      gras_socket_t sock){
-
-  xbt_error_t errcode;
+void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t sock)
+{
 
-  gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
-  gras_procdata_t *pd=gras_procdata_get();
+  gras_hostdata_t *hd =
+      (gras_hostdata_t *) SIMIX_host_self_get_data();
   gras_sg_portrec_t pr;
-  gras_trp_sg_sock_data_t *data;
-  
-  const char *host=MSG_host_get_name(MSG_host_self());
-
-  xbt_assert0(hd,"Please run gras_process_init on each process");
-
-  sock->accepting = 0; /* no such nuisance in SG */
-
-  errcode = find_port(hd,sock->port,&pr);
-  switch (errcode) {
-  case no_error: /* Port already used... */
-    RAISE2(mismatch_error,
-          "can't listen on address %s:%d: port already in use\n.",
-          host,sock->port);
-    break;
-
-  case mismatch_error: /* Port not used so far. Do it */
-    pr.tochan = sock->raw ? pd->rawChan : pd->chan;
-    pr.port   = sock->port;
-    pr.raw    = sock->raw;
-    xbt_dynar_push(hd->ports,&pr);
-    break;
-    
-  default:
-    return errcode;
-  }
-  
+  gras_trp_sg_sock_data_t data;
+
+  xbt_assert0(hd, "Please run gras_process_init on each process");
+
+  sock->accepting = 1;
+
+  /* Check whether a server is already listening on that port or not */
+  pr = find_port(hd, port);
+
+  if (pr)
+    THROW2(mismatch_error, 0,
+           "can't listen on address %s:%d: port already in use.",
+           SIMIX_host_self_get_name(), port);
+
+  /* This port is free, let's take it */
+  pr = xbt_new(s_gras_sg_portrec_t, 1);
+  pr->port = port;
+  pr->meas = sock->meas;
+  pr->server = SIMIX_process_self();
+  xbt_dynar_push(hd->ports, &pr);
+  pr->rdv = SIMIX_req_rdv_create(NULL);
+
   /* Create the socket */
-  data = xbt_new(gras_trp_sg_sock_data_t,1);
-  data->from_PID     = -1;
-  data->to_PID       = MSG_process_self_PID();
-  data->to_host      = MSG_host_self();
-  data->to_chan      = pd->chan;
-  
+  data = xbt_new0(s_gras_trp_sg_sock_data_t, 1);
+  data->server = SIMIX_process_self();
+  data->server_port = port;
+  data->client = NULL;
+  data->rdv_server = pr->rdv;
+  data->rdv_client = NULL;
+  data->comm_recv = SIMIX_req_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL);
+
   sock->data = data;
 
-  VERB6("'%s' (%d) ears on %s:%d%s (%p)",
-    MSG_process_get_name(MSG_process_self()), MSG_process_self_PID(),
-    host,sock->port,sock->raw? " (mode RAW)":"",sock);
+  VERB10
+      ("'%s' (%d) ears on %s:%d%s (%p; data:%p); Here rdv: %p; Remote rdv: %p; Comm %p",
+       SIMIX_req_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+       SIMIX_host_self_get_name(), port,
+       sock->meas ? " (mode meas)" : "", sock, data,
+       (data->server ==
+        SIMIX_process_self())? data->rdv_server : data->rdv_client,
+       (data->server ==
+        SIMIX_process_self())? data->rdv_client : data->rdv_server,
+       data->comm_recv);
 
-  return no_error;
 }
 
-void gras_trp_sg_socket_close(gras_socket_t sock){
-  gras_hostdata_t *hd=(gras_hostdata_t *)MSG_host_get_data(MSG_host_self());
-  int cpt;
-  
+void gras_trp_sg_socket_close(gras_socket_t sock)
+{
+  gras_hostdata_t *hd =
+      (gras_hostdata_t *) SIMIX_host_self_get_data();
+  unsigned int cpt;
   gras_sg_portrec_t pr;
 
-  if (!sock) return;
-  xbt_assert0(hd,"Please run gras_process_init on each process");
+  XBT_IN1(" (sock=%p)", sock);
+
+  if (!sock)
+    return;
 
-  if (sock->data)
-    xbt_free(sock->data);
+  xbt_assert0(hd, "Please run gras_process_init on each process");
 
-  if (sock->incoming) {
-    /* server mode socket. Un register it from 'OS' tables */
+  gras_trp_sg_sock_data_t sockdata = sock->data;
+
+  if (sock->incoming && !sock->outgoing && sockdata->server_port >= 0) {
+    /* server mode socket. Unregister it from 'OS' tables */
     xbt_dynar_foreach(hd->ports, cpt, pr) {
       DEBUG2("Check pr %d of %lu", cpt, xbt_dynar_length(hd->ports));
-      if (pr.port == sock->port) {
-       xbt_dynar_cursor_rm(hd->ports, &cpt);
-       return;
+      if (pr->port == sockdata->server_port) {
+        xbt_dynar_cursor_rm(hd->ports, &cpt);
+        XBT_OUT;
+        return;
       }
     }
-    WARN0("socket_close called on an unknown socket");
+    WARN2
+        ("socket_close called on the unknown incoming socket %p (port=%d)",
+         sock, sockdata->server_port);
+  }
+  if (sock->data) {
+    /* FIXME: kill the rdv point if receiver side */
+    free(sock->data);
   }
+  XBT_OUT;
 }
 
 typedef struct {
@@ -229,136 +286,98 @@ typedef struct {
   void *data;
 } sg_task_data_t;
 
-xbt_error_t gras_trp_sg_chunk_send(gras_socket_t sock,
-                                   const char *data,
-                                   long int size) {
-  m_task_t task=NULL;
-  static unsigned int count=0;
+void gras_trp_sg_chunk_send(gras_socket_t sock,
+                            const char *data,
+                            unsigned long int size, int stable_ignored)
+{
+  gras_trp_sg_chunk_send_raw(sock, data, size);
+}
+
+void gras_trp_sg_chunk_send_raw(gras_socket_t sock,
+                                const char *data, unsigned long int size)
+{
+#ifdef KILLME
   char name[256];
-  gras_trp_sg_sock_data_t *sock_data = (gras_trp_sg_sock_data_t *)sock->data;
-  sg_task_data_t *task_data;
-  
-  sprintf(name,"Chunk[%d]",count++);
-
-  task_data=xbt_new(sg_task_data_t,1);
-  task_data->data=(void*)xbt_malloc(size);
-  task_data->size = size;
-  memcpy(task_data->data,data,size);
-
-  task=MSG_task_create(name,0,((double)size)/(1024.0*1024.0),task_data);
-
-  DEBUG5("send chunk %s from %s to  %s:%d (size=%ld)",
-        name, MSG_host_get_name(MSG_host_self()),
-        MSG_host_get_name(sock_data->to_host), sock_data->to_chan,size);
-  if (MSG_task_put(task, sock_data->to_host,sock_data->to_chan) != MSG_OK) {
-    RAISE0(system_error,"Problem during the MSG_task_put");
+  static unsigned int count = 0;
+
+  smx_action_t act;             /* simix action */
+  gras_trp_procdata_t trp_remote_proc;
+  gras_msg_procdata_t msg_remote_proc;
+  gras_msg_t msg;               /* message to send */
+
+  //gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data;
+  xbt_assert0(sock->meas,
+              "SG chunk exchange shouldn't be used on non-measurement sockets");
+
+
+  /* creates simix action and waits its ends, waits in the sender host
+     condition */
+  /*
+  if (XBT_LOG_ISENABLED(gras_trp_sg, xbt_log_priority_debug)) {
+    smx_process_t remote_dude =
+        (sock_data->server ==
+         SIMIX_process_self())? (sock_data->client) : (sock_data->server);
+    smx_host_t remote_host = SIMIX_req_process_get_host(remote_dude);
   }
-
-  return no_error;
+  */
+  //SIMIX_network_send(sock_data->rdv,size,1,-1,NULL,0,NULL,NULL);
+#endif
+  THROW_UNIMPLEMENTED;
 }
 
-xbt_error_t gras_trp_sg_chunk_recv(gras_socket_t sock,
-                                   char *data,
-                                   long int size){
-  gras_procdata_t *pd=gras_procdata_get();
-
-  m_task_t task=NULL;
-  sg_task_data_t *task_data;
-  gras_trp_sg_sock_data_t *sock_data = sock->data;
-
-  XBT_IN;
-  DEBUG4("recv chunk on %s ->  %s:%d (size=%ld)",
-        MSG_host_get_name(sock_data->to_host),
-        MSG_host_get_name(MSG_host_self()), sock_data->to_chan, size);
-  if (MSG_task_get(&task, (sock->raw ? pd->rawChan : pd->chan)) != MSG_OK)
-    RAISE0(unknown_error,"Error in MSG_task_get()");
-
-  task_data = MSG_task_get_data(task);
-  if (task_data->size != size)
-    RAISE5(mismatch_error,
-          "Got %d bytes when %ld where expected (in %s->%s:%d)",
-          task_data->size, size,
-          MSG_host_get_name(sock_data->to_host),
-          MSG_host_get_name(MSG_host_self()), sock_data->to_chan);
-  memcpy(data,task_data->data,size);
-  xbt_free(task_data->data);
-  xbt_free(task_data);
-
-  if (MSG_task_destroy(task) != MSG_OK)
-    RAISE0(unknown_error,"Error in MSG_task_destroy()");
+int gras_trp_sg_chunk_recv(gras_socket_t sock,
+                           char *data, unsigned long int size)
+{
+  //gras_trp_sg_sock_data_t *sock_data =
+  //    (gras_trp_sg_sock_data_t *) sock->data;
+
+  //SIMIX_req_comm_recv(sock_data->rdv,-1,NULL,0,NULL);
+  THROW_UNIMPLEMENTED;
+#ifdef KILLME
+  gras_trp_sg_sock_data_t *remote_sock_data;
+  gras_socket_t remote_socket = NULL;
+  gras_msg_t msg_got;
+  gras_msg_procdata_t msg_procdata =
+      (gras_msg_procdata_t) gras_libdata_by_name("gras_msg");
+  gras_trp_procdata_t trp_proc =
+      (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
+
+  xbt_assert0(sock->meas,
+              "SG chunk exchange shouldn't be used on non-measurement sockets");
+  xbt_queue_shift_timed(trp_proc->meas_selectable_sockets,
+                        &remote_socket, 60);
+
+  if (remote_socket == NULL) {
+    THROW0(timeout_error, 0, "Timeout");
+  }
 
-  XBT_OUT;
-  return no_error;
-}
+  remote_sock_data = (gras_trp_sg_sock_data_t *) remote_socket->data;
+  msg_got = xbt_fifo_shift(msg_procdata->msg_to_receive_queue_meas);
 
-/* Data exchange over raw sockets */
-xbt_error_t gras_socket_raw_exchange(gras_socket_t peer,
-                                     int sender,
-                                     unsigned int timeout,
-                                     unsigned long int expSize,
-                                     unsigned long int msgSize) {
-  unsigned int bytesTotal;
-  static unsigned int count=0;
-  m_task_t task=NULL;
-  char name[256];
-  gras_trp_sg_sock_data_t *sock_data = (gras_trp_sg_sock_data_t *)peer->data;
-  
-  gras_procdata_t *pd=gras_procdata_get();
-  double startTime;
-  
-  startTime=gras_os_time(); /* used only in sender mode */
-
-  for(bytesTotal = 0;  bytesTotal < expSize;  bytesTotal += msgSize) {
-
-    if (sender) {
-    
-      sprintf(name,"Raw data[%d]",count++);
-      
-      task=MSG_task_create(name,0,((double)msgSize)/(1024.0*1024.0),NULL);
-
-      DEBUG5("%f:%s: gras_socket_raw_send(%f %s -> %s) BEGIN",
-            gras_os_time(), MSG_process_get_name(MSG_process_self()),
-            ((double)msgSize)/(1024.0*1024.0),
-            MSG_host_get_name( MSG_host_self()), peer->peer_name);
-
-      if (MSG_task_put(task, sock_data->to_host,sock_data->to_chan) != MSG_OK)
-       RAISE0(system_error,"Problem during the MSG_task_put()");
-              
-      DEBUG5("%f:%s: gras_socket_raw_send(%f %s -> %s) END",
-            gras_os_time(), MSG_process_get_name(MSG_process_self()),
-            ((double)msgSize)/(1024.0*1024.0),
-            MSG_host_get_name( MSG_host_self()), peer->peer_name);
-                  
-    } else { /* we are receiver, simulate a select */
-      
-      task=NULL;
-      DEBUG2("%f:%s: gras_socket_raw_recv() BEGIN\n",
-            gras_os_time(), MSG_process_get_name(MSG_process_self()));
-      do {
-       if (MSG_task_Iprobe((m_channel_t) pd->rawChan)) {
-         if (MSG_task_get(&task, (m_channel_t) pd->rawChan) != MSG_OK) {
-           fprintf(stderr,"GRAS: Error in MSG_task_get()\n");
-           return unknown_error;
-         }
-         
-         if (MSG_task_destroy(task) != MSG_OK) {
-           fprintf(stderr,"GRAS: Error in MSG_task_destroy()\n");
-           return unknown_error;
-         }
-         
-         DEBUG2("%f:%s: gras_socket_raw_recv() END\n",
-                gras_os_time(), MSG_process_get_name(MSG_process_self()));
-         break;
-       } else {
-         MSG_process_sleep(0.0001);
-       }
-       
-      } while (gras_os_time() - startTime < timeout);
-      
-      if (gras_os_time() - startTime > timeout)
-       return timeout_error;
-    } /* receiver part */
-  } /* foreach msg */
-
-  return no_error;
+  sock_data = (gras_trp_sg_sock_data_t *) sock->data;
+
+  /* ok, I'm here, you can continue the communication */
+  SIMIX_req_cond_signal(remote_sock_data->cond);
+
+  SIMIX_req_mutex_lock(remote_sock_data->mutex);
+  /* wait for communication end */
+  SIMIX_req_cond_wait(remote_sock_data->cond, remote_sock_data->mutex);
+
+  if (msg_got->payl_size != size)
+    THROW5(mismatch_error, 0,
+           "Got %d bytes when %ld where expected (in %s->%s:%d)",
+           msg_got->payl_size, size,
+           SIMIX_req_host_get_name(sock_data->to_host),
+           SIMIX_host_self_get_name(), sock->peer_port);
+
+  if (data)
+    memcpy(data, msg_got->payl, size);
+
+  if (msg_got->payl)
+    xbt_free(msg_got->payl);
+
+  xbt_free(msg_got);
+  SIMIX_req_mutex_unlock(remote_sock_data->mutex);
+#endif
+  return 0;
 }