merge conflict resolved

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

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index 9056dd1..b0fa264 100644 (file)
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -40,7 +40,7 @@ gras_socket_t gras_trp_select(double timeout)
   gras_socket_t sock_iter;      /* iterating over all sockets */
   unsigned int cursor;
 
-  DEBUG3("select on %s@%s with timeout=%f",
+  XBT_DEBUG("select on %s@%s with timeout=%f",
          SIMIX_process_self_get_name(),
          SIMIX_host_self_get_name(), timeout);
   if (timeout >= 0) {
@@ -51,18 +51,18 @@ gras_socket_t gras_trp_select(double timeout)
   }
 
   if (active_socket == NULL) {
-    DEBUG0("TIMEOUT");
-    THROW0(timeout_error, 0, "Timeout");
+    XBT_DEBUG("TIMEOUT");
+    THROWF(timeout_error, 0, "Timeout");
   }
   active_socket_data = (gras_trp_sg_sock_data_t *) active_socket->data;
 
   /* Ok, got something. Open a socket back to the expeditor */
 
   /* Try to reuse an already openned socket to that expeditor */
-  DEBUG1("Open sockets size %lu", xbt_dynar_length(pd->sockets));
+  XBT_DEBUG("Open sockets size %lu", xbt_dynar_length(pd->sockets));
   xbt_dynar_foreach(pd->sockets, cursor, sock_iter) {
     gras_trp_sg_sock_data_t *sock_data;
-    DEBUG1("Consider %p as outgoing socket to expeditor", sock_iter);
+    XBT_DEBUG("Consider %p as outgoing socket to expeditor", sock_iter);
 
     if (sock_iter->meas || !sock_iter->outgoing)
       continue;
@@ -70,14 +70,14 @@ 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;
     }
   }
 
   /* Socket to expeditor not created yet */
-  DEBUG0("Create a socket to the expeditor");
+  XBT_DEBUG("Create a socket to the expeditor");
 
   trp = gras_trp_plugin_get_by_name("sg");
 
@@ -107,21 +107,21 @@ 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);
 
-  DEBUG4("Create socket to process:%s(Port %d) from process: %s(Port %d)",
-         SIMIX_req_process_get_name(sockdata->from_process),
+  XBT_DEBUG("Create socket to process:%s(Port %d) from process: %s(Port %d)",
+         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;
 }
@@ -131,17 +131,17 @@ gras_socket_t gras_trp_select(double timeout)
 
 void gras_trp_tcp_setup(gras_trp_plugin_t plug)
 {
-  THROW0(mismatch_error, 0, NULL);
+  THROW(mismatch_error, 0);
 }
 
 void gras_trp_file_setup(gras_trp_plugin_t plug)
 {
-  THROW0(mismatch_error, 0, NULL);
+  THROW(mismatch_error, 0);
 }
 
 void gras_trp_iov_setup(gras_trp_plugin_t plug)
 {
-  THROW0(mismatch_error, 0, NULL);
+  THROW(mismatch_error, 0);
 }
 
 gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock)