X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a2f031cc377418f3716415ba669434bfd3a5df4..f9dd9e3d692f6c43f78500a9fc66fe8663dedbbf:/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 9ebfd79a75..277aea06e6 100644
--- a/src/gras/Transport/transport_plugin_sg.c
+++ b/src/gras/Transport/transport_plugin_sg.c
@@ -1,21 +1,22 @@
-/* $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.                                     */
 
-/* Copyright (c) 2004 Martin Quinson. All rights reserved.                  */
+/* 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. */
 
 #include "xbt/ex.h"
 
+#include "simix/simix.h"
 #include "gras/Msg/msg_private.h"
 #include "gras/Transport/transport_private.h"
 #include "gras/Virtu/virtu_sg.h"
+#include "xbt/xbt_socket_private.h" /* FIXME */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg, gras_trp,
                                 "SimGrid pseudo-transport");
@@ -25,23 +26,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp_sg, gras_trp,
  ***/
 
 /* retrieve the port record associated to a numerical port on an host */
-static void find_port(gras_hostdata_t * hd, int port,
-                      gras_sg_portrec_t * hpd);
-
-
-void gras_trp_sg_socket_client(gras_trp_plugin_t self,
-                               /* OUT */ gras_socket_t sock);
-void 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);
-
-void gras_trp_sg_chunk_send_raw(gras_socket_t sd,
+static gras_sg_portrec_t find_port(gras_hostdata_t * hd, int port);
+
+void gras_trp_sg_socket_client(xbt_trp_plugin_t self,
+                               const char*host,
+                               int port,
+                               /* OUT */ xbt_socket_t sock);
+void gras_trp_sg_socket_server(xbt_trp_plugin_t self,
+                               int port,
+                               /* OUT */ xbt_socket_t sock);
+void gras_trp_sg_socket_close(xbt_socket_t sd);
+
+void gras_trp_sg_chunk_send_raw(xbt_socket_t sd,
                                 const char *data, unsigned long int size);
-void gras_trp_sg_chunk_send(gras_socket_t sd,
+void gras_trp_sg_chunk_send(xbt_socket_t sd,
                             const char *data,
                             unsigned long int size, int stable_ignored);
 
-int gras_trp_sg_chunk_recv(gras_socket_t sd,
+int gras_trp_sg_chunk_recv(xbt_socket_t sd,
                            char *data, unsigned long int size);
 
 /***
@@ -55,25 +57,63 @@ typedef struct {
 /***
  *** Code
  ***/
-static void find_port(gras_hostdata_t * hd, int port, gras_sg_portrec_t * hpd)
+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) {
-      memcpy(hpd, &pr, sizeof(gras_sg_portrec_t));
-      return;
-    }
+    if (pr->port == port)
+      return pr;
   }
-  THROW1(mismatch_error, 0, "Unable to find any portrec for port #%d", port);
+  return NULL;
 }
 
+/***
+ *** Info about who's speaking
+ ***/
+static int gras_trp_sg_my_port(xbt_socket_t s)
+{
+  gras_trp_sg_sock_data_t sockdata = xbt_socket_get_data(s);
+  if (gras_socket_im_the_server(s))
+    return sockdata->server_port;
+  else
+    return sockdata->client_port;
+}
+static int gras_trp_sg_peer_port(xbt_socket_t s)
+{
+  gras_trp_sg_sock_data_t sockdata = xbt_socket_get_data(s);
+  if (gras_socket_im_the_server(s))
+    return sockdata->client_port;
+  else
+    return sockdata->server_port;
+}
 
-void gras_trp_sg_setup(gras_trp_plugin_t plug)
+static const char* gras_trp_sg_peer_name(xbt_socket_t s)
 {
+  gras_trp_sg_sock_data_t sockdata = xbt_socket_get_data(s);
+  if (gras_socket_im_the_server(s))
+    return SIMIX_host_get_name(simcall_process_get_host(sockdata->client));
+  else {
+    return SIMIX_host_get_name(simcall_process_get_host(sockdata->server));
+  }
+}
+static const char* gras_trp_sg_peer_proc(xbt_socket_t s) {
+  THROW_UNIMPLEMENTED;
+}
+static void gras_trp_sg_peer_proc_set(xbt_socket_t s,char *name) {
+  THROW_UNIMPLEMENTED;
+}
+
+void gras_trp_sg_setup(xbt_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);
 
@@ -90,157 +130,156 @@ void gras_trp_sg_setup(gras_trp_plugin_t plug)
   plug->flush = NULL;           /* nothing cached */
 }
 
-void gras_trp_sg_socket_client(gras_trp_plugin_t self,
-                               /* OUT */ gras_socket_t sock)
+void gras_trp_sg_socket_client(xbt_trp_plugin_t self,
+                               const char*host,
+                               int port,
+                               /* OUT */ xbt_socket_t sock)
 {
-  xbt_ex_t e;
 
   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 = SIMIX_host_get_by_name(sock->peer_name)))
-    THROW1(mismatch_error, 0,
-           "Can't connect to %s: no such host.\n", sock->peer_name);
+  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_host_get_data(peer)))
-    THROW1(mismatch_error, 0,
-           "can't connect to %s: no process on this host", sock->peer_name);
+  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);
 
-  TRY {
-    find_port(hd, sock->peer_port, &pr);
-  }
-  CATCH(e) {
-    if (e.category == mismatch_error) {
-      xbt_ex_free(e);
-      THROW2(mismatch_error, 0,
-             "can't connect to %s:%d, no process listen on this port",
-             sock->peer_name, sock->peer_port);
-    }
-    RETHROW;
+  pr = find_port(hd, port);
+
+  if (pr == NULL) {
+    THROWF(mismatch_error, 0,
+           "can't connect to %s:%d, no process listen on this port",
+           host, port);
   }
 
-  if (pr.meas && !sock->meas) {
-    THROW2(mismatch_error, 0,
+  /* Ensure that the listener is expecting the kind of stuff we want to send */
+  if (pr->meas && !sock->meas) {
+    THROWF(mismatch_error, 0,
            "can't connect to %s:%d in regular mode, the process listen "
-           "in measurement mode on this port", sock->peer_name,
-           sock->peer_port);
+           "in measurement mode on this port", host,
+           port);
   }
-  if (!pr.meas && sock->meas) {
-    THROW2(mismatch_error, 0,
+  if (!pr->meas && sock->meas) {
+    THROWF(mismatch_error, 0,
            "can't connect to %s:%d in measurement mode, the process listen "
-           "in regular mode on this port", sock->peer_name, sock->peer_port);
+           "in regular mode on this port", host,
+           port);
   }
-  /* create the socket */
-  data = xbt_new(gras_trp_sg_sock_data_t, 1);
-  data->from_process = SIMIX_process_self();
-  data->to_process = pr.process;
-  data->to_host = peer;
 
-  /* initialize mutex and condition of the socket */
-  data->mutex = SIMIX_mutex_init();
-  data->cond = SIMIX_cond_init();
-  data->to_socket = pr.socket;
+  /* 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 = 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;
 
-  DEBUG5("%s (PID %d) connects in %s mode to %s:%d",
-         SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
-         sock->meas ? "meas" : "regular", sock->peer_name, sock->peer_port);
+  XBT_DEBUG("%s (PID %d) connects in %s mode to %s:%d (rdv_ser:%p, rdv_cli:%p, comm:%p)",
+         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);
 }
 
-void gras_trp_sg_socket_server(gras_trp_plugin_t self, gras_socket_t sock)
+void gras_trp_sg_socket_server(xbt_trp_plugin_t self, int port, xbt_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();
   gras_sg_portrec_t pr;
-  gras_trp_sg_sock_data_t *data;
-  volatile int found;
+  gras_trp_sg_sock_data_t data;
 
-  const char *host = SIMIX_host_get_name(SIMIX_host_self());
+  xbt_assert(hd, "Please run gras_process_init on each process");
 
-  xbt_ex_t e;
+  sock->accepting = 1;
 
-  xbt_assert0(hd, "Please run gras_process_init on each process");
+  /* Check whether a server is already listening on that port or not */
+  pr = find_port(hd, port);
 
-  sock->accepting = 0;          /* no such nuisance in SG */
-  found = 0;
-  TRY {
-    find_port(hd, sock->port, &pr);
-    found = 1;
-  } CATCH(e) {
-    if (e.category == mismatch_error)
-      xbt_ex_free(e);
-    else
-      RETHROW;
-  }
-
-  if (found)
-    THROW2(mismatch_error, 0,
+  if (pr)
+    THROWF(mismatch_error, 0,
            "can't listen on address %s:%d: port already in use.",
-           host, sock->port);
+           SIMIX_host_self_get_name(), port);
 
-  pr.port = sock->port;
-  pr.meas = sock->meas;
-  pr.socket = sock;
-  pr.process = SIMIX_process_self();
+  /* 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 = simcall_rdv_create(NULL);
 
   /* Create the socket */
-  data = xbt_new(gras_trp_sg_sock_data_t, 1);
-  data->from_process = SIMIX_process_self();
-  data->to_process = NULL;
-  data->to_host = SIMIX_host_self();
-
-  data->cond = SIMIX_cond_init();
-  data->mutex = SIMIX_mutex_init();
+  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 = simcall_comm_irecv(pr->rdv, &data->msg, NULL, NULL, NULL);
 
   sock->data = data;
 
-  VERB6("'%s' (%d) ears on %s:%d%s (%p)",
-        SIMIX_process_get_name(SIMIX_process_self()), gras_os_getpid(),
-        host, sock->port, sock->meas ? " (mode meas)" : "", sock);
+  XBT_VERB
+      ("'%s' (%d) ears on %s:%d%s (%p; data:%p); Here rdv: %p; Remote rdv: %p; Comm %p",
+       simcall_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);
 
 }
 
-void gras_trp_sg_socket_close(gras_socket_t sock)
+void gras_trp_sg_socket_close(xbt_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;
 
-  xbt_assert0(hd, "Please run gras_process_init on each process");
+  xbt_assert(hd, "Please run gras_process_init on each process");
 
-  if (sock->data) {
-    SIMIX_cond_destroy(((gras_trp_sg_sock_data_t *) sock->data)->cond);
-    SIMIX_mutex_destroy(((gras_trp_sg_sock_data_t *) sock->data)->mutex);
-    free(sock->data);
-  }
+  gras_trp_sg_sock_data_t sockdata = sock->data;
 
-  if (sock->incoming && !sock->outgoing && sock->port >= 0) {
+  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_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("socket_close called on the unknown incoming socket %p (port=%d)",
-          sock, sock->port);
+    XBT_WARN
+        ("socket_close called on the unknown incoming socket %p (port=%d)",
+         sock, sockdata->server_port);
   }
-  XBT_OUT;
+  /* FIXME: kill the rdv point if receiver side */
+  free(sock->data);
+  XBT_OUT();
 }
 
 typedef struct {
@@ -248,97 +287,69 @@ typedef struct {
   void *data;
 } sg_task_data_t;
 
-void gras_trp_sg_chunk_send(gras_socket_t sock,
+void gras_trp_sg_chunk_send(xbt_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,
+void gras_trp_sg_chunk_send_raw(xbt_socket_t sock,
                                 const char *data, unsigned long int size)
 {
+#ifdef KILLME
   char name[256];
   static unsigned int count = 0;
 
   smx_action_t act;             /* simix action */
-  gras_trp_sg_sock_data_t *sock_data;
   gras_trp_procdata_t trp_remote_proc;
   gras_msg_procdata_t msg_remote_proc;
   gras_msg_t msg;               /* message to send */
 
-  sock_data = (gras_trp_sg_sock_data_t *) sock->data;
-
-  xbt_assert0(sock->meas,
+  //gras_trp_sg_sock_data_t sock_data = (gras_trp_sg_sock_data_t) sock->data;
+  xbt_assert(sock->meas,
               "SG chunk exchange shouldn't be used on non-measurement sockets");
 
-  SIMIX_mutex_lock(sock_data->mutex);
-  sprintf(name, "Chunk[%d]", count++);
-  /*initialize gras message */
-  msg = xbt_new(s_gras_msg_t, 1);
-  msg->expe = sock;
-  msg->payl_size = size;
-
-  if (data) {
-    msg->payl = (void *) xbt_malloc(size);
-    memcpy(msg->payl, data, size);
-  } else {
-    msg->payl = NULL;
-  }
-
-
-  /* put his socket on the selectable socket queue */
-  trp_remote_proc = (gras_trp_procdata_t)
-    gras_libdata_by_name_from_remote("gras_trp", sock_data->to_process);
-  xbt_queue_push(trp_remote_proc->meas_selectable_sockets, &sock);
-
-  /* put message on msg_queue */
-  msg_remote_proc = (gras_msg_procdata_t)
-    gras_libdata_by_name_from_remote("gras_msg", sock_data->to_process);
-
-  xbt_fifo_push(msg_remote_proc->msg_to_receive_queue_meas, msg);
-
-  /* wait for the receiver */
-  SIMIX_cond_wait(sock_data->cond, sock_data->mutex);
 
   /* creates simix action and waits its ends, waits in the sender host
      condition */
-  DEBUG5("send chunk %s from %s to  %s:%d (size=%ld)",
-         name, SIMIX_host_get_name(SIMIX_host_self()),
-         SIMIX_host_get_name(sock_data->to_host), sock->peer_port, size);
-
-  act = SIMIX_action_communicate(SIMIX_host_self(), sock_data->to_host,
-                                 name, size, -1);
-  SIMIX_register_action_to_condition(act, sock_data->cond);
-  SIMIX_cond_wait(sock_data->cond, sock_data->mutex);
-  SIMIX_unregister_action_to_condition(act, sock_data->cond);
-  /* error treatmeant (FIXME) */
-
-  /* cleanup structures */
-  SIMIX_action_destroy(act);
-
-  SIMIX_mutex_unlock(sock_data->mutex);
+  /*
+  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 = simcall_process_get_host(remote_dude);
+  }
+  */
+  //SIMIX_network_send(sock_data->rdv,size,1,-1,NULL,0,NULL,NULL);
+#endif
+  THROW_UNIMPLEMENTED;
 }
 
-int gras_trp_sg_chunk_recv(gras_socket_t sock,
+int gras_trp_sg_chunk_recv(xbt_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 =
+  //    (gras_trp_sg_sock_data_t *) sock->data;
+
+  //simcall_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;
+  xbt_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_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);
+      (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;
@@ -347,26 +358,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_cond_signal(remote_sock_data->cond);
+  simcall_cond_signal(remote_sock_data->cond);
 
-  SIMIX_mutex_lock(remote_sock_data->mutex);
+  simcall_mutex_lock(remote_sock_data->mutex);
   /* wait for communication end */
-  SIMIX_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_host_get_name(sock_data->to_host),
-           SIMIX_host_get_name(SIMIX_host_self()), sock->peer_port);
+           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_mutex_unlock(remote_sock_data->mutex);
+  simcall_mutex_unlock(remote_sock_data->mutex);
+#endif
   return 0;
 }