X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..f9dd9e3d692f6c43f78500a9fc66fe8663dedbbf:/src/gras/Transport/sg_transport.c

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index 4416c09a04..8e52a7569a 100644
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -14,7 +14,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_trp);
 
 /* check transport_private.h for an explanation of this variable;
  * this just need to be defined to NULL in SG */
-gras_socket_t _gras_lastly_selected_socket = NULL;
+xbt_socket_t _gras_lastly_selected_socket = NULL;
 
 #ifdef KILLME
 /**	
@@ -52,7 +52,7 @@ gras_socket_t gras_trp_select(double timeout)
 
   if (active_socket == NULL) {
     XBT_DEBUG("TIMEOUT");
-    THROW0(timeout_error, 0, "Timeout");
+    THROWF(timeout_error, 0, "Timeout");
   }
   active_socket_data = (gras_trp_sg_sock_data_t *) active_socket->data;
 
@@ -70,7 +70,7 @@ gras_socket_t gras_trp_select(double timeout)
 
     if ((sock_data->to_socket == active_socket) &&
         (sock_data->to_host ==
-         SIMIX_req_process_get_host(active_socket_data->from_process))) {
+         simcall_process_get_host(active_socket_data->from_process))) {
       xbt_dynar_cursor_unlock(pd->sockets);
       return sock_iter;
     }
@@ -107,44 +107,22 @@ gras_socket_t gras_trp_select(double timeout)
   sockdata->to_socket = active_socket;
   /*update the peer to_socket  variable */
   active_socket_data->to_socket = res;
-  sockdata->cond = SIMIX_req_cond_init();
-  sockdata->mutex = SIMIX_req_mutex_init();
+  sockdata->cond = simcall_cond_init();
+  sockdata->mutex = simcall_mutex_init();
 
   sockdata->to_host =
-      SIMIX_req_process_get_host(active_socket_data->from_process);
+      simcall_process_get_host(active_socket_data->from_process);
 
   res->data = sockdata;
-  res->peer_name = strdup(SIMIX_req_host_get_name(sockdata->to_host));
+  res->peer_name = strdup(simcall_host_get_name(sockdata->to_host));
 
   gras_trp_buf_init_sock(res);
 
   XBT_DEBUG("Create socket to process:%s(Port %d) from process: %s(Port %d)",
-         SIMIX_req_process_get_name(sockdata->from_process),
+         simcall_process_get_name(sockdata->from_process),
          res->peer_port,
-         SIMIX_req_process_get_name(sockdata->to_process), res->port);
+         simcall_process_get_name(sockdata->to_process), res->port);
 
   return res;
 }
 #endif
-
-/* dummy implementations of the functions used in RL mode */
-
-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;
-}