X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/655afa10c8acf337cde1196c8a9505d2f91b3702..6a6157abf9619875297ff1d16c1e5c63c526d4c1:/src/gras/Transport/transport_plugin_sg.c

diff --git a/src/gras/Transport/transport_plugin_sg.c b/src/gras/Transport/transport_plugin_sg.c
index f83b704373..fe83110648 100644
--- a/src/gras/Transport/transport_plugin_sg.c
+++ b/src/gras/Transport/transport_plugin_sg.c
@@ -75,24 +75,26 @@ static gras_sg_portrec_t find_port(gras_hostdata_t * hd, int port)
  ***/
 static int gras_trp_sg_my_port(gras_socket_t s) {
   gras_trp_sg_sock_data_t sockdata = s->data;
-  if (sockdata->rdv_client == NULL) /* Master socket, I'm server */
+  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 (sockdata->server == SIMIX_process_self())
+  if (gras_socket_im_the_server(s))
     return sockdata->client_port;
   else
     return sockdata->server_port;
 }
+
 static const char* gras_trp_sg_peer_name(gras_socket_t s) {
   gras_trp_sg_sock_data_t sockdata = s->data;
-  if (sockdata->server == SIMIX_process_self())
-    return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->client));
-  else
-    return SIMIX_host_get_name(SIMIX_process_get_host(sockdata->server));
+  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;
@@ -137,11 +139,11 @@ 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_host_get_by_name(host)))
+  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_host_get_data(peer)))
+  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);
@@ -169,7 +171,7 @@ void gras_trp_sg_socket_client(gras_trp_plugin_t self,
   }
 
   /* create simulation data of the socket */
-  data = xbt_new(s_gras_trp_sg_sock_data_t, 1);
+  data = xbt_new0(s_gras_trp_sg_sock_data_t, 1);
   data->client = SIMIX_process_self();
   data->server = pr->server;
   data->server_port = port;
@@ -177,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_rdv_create(NULL);
-  data->comm_recv = SIMIX_network_irecv(data->rdv_client, NULL, 0);
+  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;
 
-  DEBUG8("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)",
-         SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
+  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(),
          sock->meas ? "meas" : "regular", host, port,
          data->rdv_server,data->rdv_client,data->comm_recv);
 }
@@ -194,7 +196,7 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s
 {
 
   gras_hostdata_t *hd =
-      (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self());
+      (gras_hostdata_t *) SIMIX_host_self_get_data();
   gras_sg_portrec_t pr;
   gras_trp_sg_sock_data_t data;
 
@@ -208,31 +210,31 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s
   if (pr)
     THROW2(mismatch_error, 0,
            "can't listen on address %s:%d: port already in use.",
-           SIMIX_host_get_name(SIMIX_host_self()), port);
+           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();
-  pr->rdv = SIMIX_rdv_create(NULL);
   xbt_dynar_push(hd->ports, &pr);
+  pr->rdv = SIMIX_req_rdv_create(NULL);
 
   /* Create the socket */
-  data = xbt_new(s_gras_trp_sg_sock_data_t, 1);
+  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_network_irecv(pr->rdv, NULL, 0);
+  data->comm_recv = SIMIX_req_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL);
 
   sock->data = data;
 
-  VERB10
+  XBT_VERB
       ("'%s' (%d) ears on %s:%d%s (%p; data:%p); Here rdv: %p; Remote rdv: %p; Comm %p",
-       SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
-       SIMIX_host_get_name(SIMIX_host_self()), port,
+       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,
@@ -245,11 +247,11 @@ void gras_trp_sg_socket_server(gras_trp_plugin_t self, int port, gras_socket_t s
 void gras_trp_sg_socket_close(gras_socket_t sock)
 {
   gras_hostdata_t *hd =
-      (gras_hostdata_t *) SIMIX_host_get_data(SIMIX_host_self());
+      (gras_hostdata_t *) SIMIX_host_self_get_data();
   unsigned int cpt;
   gras_sg_portrec_t pr;
 
-  XBT_IN1(" (sock=%p)", sock);
+  XBT_IN(" (sock=%p)", sock);
 
   if (!sock)
     return;
@@ -261,14 +263,14 @@ void gras_trp_sg_socket_close(gras_socket_t sock)
   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));
+      XBT_DEBUG("Check pr %d of %lu", cpt, xbt_dynar_length(hd->ports));
       if (pr->port == sockdata->server_port) {
         xbt_dynar_cursor_rm(hd->ports, &cpt);
-        XBT_OUT;
+        XBT_OUT();
         return;
       }
     }
-    WARN2
+    XBT_WARN
         ("socket_close called on the unknown incoming socket %p (port=%d)",
          sock, sockdata->server_port);
   }
@@ -276,7 +278,7 @@ void gras_trp_sg_socket_close(gras_socket_t sock)
     /* FIXME: kill the rdv point if receiver side */
     free(sock->data);
   }
-  XBT_OUT;
+  XBT_OUT();
 }
 
 typedef struct {
@@ -315,7 +317,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_process_get_host(remote_dude);
+    smx_host_t remote_host = SIMIX_req_process_get_host(remote_dude);
   }
   */
   //SIMIX_network_send(sock_data->rdv,size,1,-1,NULL,0,NULL,NULL);
@@ -329,7 +331,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_network_recv(sock_data->rdv,-1,NULL,0,NULL);
+  //SIMIX_req_comm_recv(sock_data->rdv,-1,NULL,0,NULL);
   THROW_UNIMPLEMENTED;
 #ifdef KILLME
   gras_trp_sg_sock_data_t *remote_sock_data;
@@ -355,18 +357,18 @@ 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_cond_signal(remote_sock_data->cond);
+  SIMIX_req_cond_signal(remote_sock_data->cond);
 
-  SIMIX_mutex_lock(remote_sock_data->mutex);
+  SIMIX_req_mutex_lock(remote_sock_data->mutex);
   /* wait for communication end */
-  SIMIX_cond_wait(remote_sock_data->cond, remote_sock_data->mutex);
+  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_host_get_name(sock_data->to_host),
-           SIMIX_host_get_name(SIMIX_host_self()), sock->peer_port);
+           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);
@@ -375,7 +377,7 @@ int gras_trp_sg_chunk_recv(gras_socket_t sock,
     xbt_free(msg_got->payl);
 
   xbt_free(msg_got);
-  SIMIX_mutex_unlock(remote_sock_data->mutex);
+  SIMIX_req_mutex_unlock(remote_sock_data->mutex);
 #endif
   return 0;
 }