X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a6157abf9619875297ff1d16c1e5c63c526d4c1..c5ad8ca1a68bbaa9152471c8d0eeb99d762f0d86:/src/gras/Transport/transport_plugin_sg.c?ds=sidebyside

diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c
index fe83110648..0eac7be89c 100644
--- a/src/gras/Transport/transport_plugin_sg.c
+++ b/src/gras/Transport/transport_plugin_sg.c
@@ -61,7 +61,7 @@ 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_assert(hd, "Please run gras_process_init on each process");
 
   xbt_dynar_foreach(hd->ports, cpt, pr) {
     if (pr->port == port)
@@ -91,9 +91,9 @@ static int gras_trp_sg_peer_port(gras_socket_t s) {
 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));
+    return SIMIX_host_get_name(simcall_process_get_host(sockdata->client));
   else {
-    return SIMIX_host_get_name(SIMIX_req_process_get_host(sockdata->server));
+    return SIMIX_host_get_name(simcall_process_get_host(sockdata->server));
   }
 }
 static const char* gras_trp_sg_peer_proc(gras_socket_t s) {
@@ -139,32 +139,32 @@ void gras_trp_sg_socket_client(gras_trp_plugin_t self,
   gras_sg_portrec_t pr;
 
   /* make sure this socket will reach someone */
-  if (!(peer = SIMIX_req_host_get_by_name(host)))
-    THROW1(mismatch_error, 0,
+  if (!(peer = simcall_host_get_by_name(host)))
+    THROWF(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,
+  if (!(hd = (gras_hostdata_t *) simcall_host_get_data(peer)))
+    THROWF(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,
+    THROWF(mismatch_error, 0,
            "can't connect to %s:%d, no process listen on this port",
            host, port);
   }
 
   /* Ensure that the listener is expecting the kind of stuff we want to send */
   if (pr->meas && !sock->meas) {
-    THROW2(mismatch_error, 0,
+    THROWF(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->meas && sock->meas) {
-    THROW2(mismatch_error, 0,
+    THROWF(mismatch_error, 0,
            "can't connect to %s:%d in measurement mode, the process listen "
            "in regular mode on this port", host,
            port);
@@ -179,15 +179,15 @@ void gras_trp_sg_socket_client(gras_trp_plugin_t self,
 
   /* 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);
+  data->rdv_client = simcall_rdv_create(NULL);
+  data->comm_recv = simcall_comm_irecv(data->rdv_client, &data->msg, NULL, NULL, NULL);
 
   /* connect that simulation data to the socket */
   sock->data = data;
   sock->incoming = 1;
 
   XBT_DEBUG("%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(),
+         simcall_process_get_name(SIMIX_process_self()), gras_os_getpid(),
          sock->meas ? "meas" : "regular", host, port,
          data->rdv_server,data->rdv_client,data->comm_recv);
 }
@@ -200,7 +200,7 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s
   gras_sg_portrec_t pr;
   gras_trp_sg_sock_data_t data;
 
-  xbt_assert0(hd, "Please run gras_process_init on each process");
+  xbt_assert(hd, "Please run gras_process_init on each process");
 
   sock->accepting = 1;
 
@@ -208,7 +208,7 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s
   pr = find_port(hd, port);
 
   if (pr)
-    THROW2(mismatch_error, 0,
+    THROWF(mismatch_error, 0,
            "can't listen on address %s:%d: port already in use.",
            SIMIX_host_self_get_name(), port);
 
@@ -218,7 +218,7 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s
   pr->meas = sock->meas;
   pr->server = SIMIX_process_self();
   xbt_dynar_push(hd->ports, &pr);
-  pr->rdv = SIMIX_req_rdv_create(NULL);
+  pr->rdv = simcall_rdv_create(NULL);
 
   /* Create the socket */
   data = xbt_new0(s_gras_trp_sg_sock_data_t, 1);
@@ -227,13 +227,13 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s
   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);
+  data->comm_recv = simcall_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL);
 
   sock->data = data;
 
   XBT_VERB
       ("'%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(),
+       simcall_process_get_name(SIMIX_process_self()), gras_os_getpid(),
        SIMIX_host_self_get_name(), port,
        sock->meas ? " (mode meas)" : "", sock, data,
        (data->server ==
@@ -256,7 +256,7 @@ void gras_trp_sg_socket_close(gras_socket_t sock)
   if (!sock)
     return;
 
-  xbt_assert0(hd, "Please run gras_process_init on each process");
+  xbt_assert(hd, "Please run gras_process_init on each process");
 
   gras_trp_sg_sock_data_t sockdata = sock->data;
 
@@ -274,10 +274,8 @@ void gras_trp_sg_socket_close(gras_socket_t sock)
         ("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);
-  }
+  /* FIXME: kill the rdv point if receiver side */
+  free(sock->data);
   XBT_OUT();
 }
 
@@ -306,7 +304,7 @@ void gras_trp_sg_chunk_send_raw(gras_socket_t sock,
   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,
+  xbt_assert(sock->meas,
               "SG chunk exchange shouldn't be used on non-measurement sockets");
 
 
@@ -317,7 +315,7 @@ void gras_trp_sg_chunk_send_raw(gras_socket_t sock,
     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);
+    smx_host_t remote_host = simcall_process_get_host(remote_dude);
   }
   */
   //SIMIX_network_send(sock_data->rdv,size,1,-1,NULL,0,NULL,NULL);
@@ -331,7 +329,7 @@ int gras_trp_sg_chunk_recv(gras_socket_t sock,
   //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);
+  //simcall_comm_recv(sock_data->rdv,-1,NULL,0,NULL);
   THROW_UNIMPLEMENTED;
 #ifdef KILLME
   gras_trp_sg_sock_data_t *remote_sock_data;
@@ -342,13 +340,13 @@ int gras_trp_sg_chunk_recv(gras_socket_t sock,
   gras_trp_procdata_t trp_proc =
       (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
 
-  xbt_assert0(sock->meas,
+  xbt_assert(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");
+    THROWF(timeout_error, 0, "Timeout");
   }
 
   remote_sock_data = (gras_trp_sg_sock_data_t *) remote_socket->data;
@@ -357,27 +355,26 @@ int gras_trp_sg_chunk_recv(gras_socket_t sock,
   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);
+  simcall_cond_signal(remote_sock_data->cond);
 
-  SIMIX_req_mutex_lock(remote_sock_data->mutex);
+  simcall_mutex_lock(remote_sock_data->mutex);
   /* wait for communication end */
-  SIMIX_req_cond_wait(remote_sock_data->cond, remote_sock_data->mutex);
+  simcall_cond_wait(remote_sock_data->cond, remote_sock_data->mutex);
 
   if (msg_got->payl_size != size)
-    THROW5(mismatch_error, 0,
+    THROWF(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),
+           simcall_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->payl);
 
   xbt_free(msg_got);
-  SIMIX_req_mutex_unlock(remote_sock_data->mutex);
+  simcall_mutex_unlock(remote_sock_data->mutex);
 #endif
   return 0;
 }