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

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index f6e3f05791..8e52a7569a 100644
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -1,20 +1,23 @@
-/* $Id$ */
-
 /* sg_transport - SG specific functions for transport                       */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 Martin Quinson.                                       */
+/* 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include "xbt/ex.h"
+#include "gras/Transport/transport_private.h"
+#include "gras/Virtu/virtu_sg.h"
 
-#include "Transport/transport_private.h"
-#include <msg.h>
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_trp);
 
-//GRAS_LOG_EXTERNAL_CATEGORY(transport);
-//GRAS_LOG_DEFAULT_CATEGORY(transport);
+/* check transport_private.h for an explanation of this variable;
+ * this just need to be defined to NULL in SG */
+xbt_socket_t _gras_lastly_selected_socket = NULL;
 
-/**
+#ifdef KILLME
+/**	
  * gras_trp_select:
  *
  * Returns the next socket to service having a message awaiting.
@@ -25,34 +28,101 @@
  *
  * if timeout>0 and no message there, wait at most that amount of time before giving up.
  */
-gras_error_t 
-gras_trp_select(double timeout,
-		gras_socket_t **dst) {
-
-  double startTime=gras_time();
-  gras_procdata_t *pd=gras_procdata_get();
- 
-  do {
-    if (MSG_task_Iprobe((m_channel_t) pd->chan)) {
-      *dst = pd->sock;
-
-      return no_error;
-    } else {
-      MSG_process_sleep(0.001);
+gras_socket_t gras_trp_select(double timeout)
+{
+  gras_socket_t res;
+  gras_trp_procdata_t pd =
+      (gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id);
+  gras_trp_sg_sock_data_t *sockdata;
+  gras_trp_plugin_t trp;
+  gras_socket_t active_socket = NULL;
+  gras_trp_sg_sock_data_t *active_socket_data;
+  gras_socket_t sock_iter;      /* iterating over all sockets */
+  unsigned int cursor;
+
+  XBT_DEBUG("select on %s@%s with timeout=%f",
+         SIMIX_process_self_get_name(),
+         SIMIX_host_self_get_name(), timeout);
+  if (timeout >= 0) {
+    xbt_queue_shift_timed(pd->msg_selectable_sockets,
+                          &active_socket, timeout);
+  } else {
+    xbt_queue_shift(pd->msg_selectable_sockets, &active_socket);
+  }
+
+  if (active_socket == NULL) {
+    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 */
+  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;
+    XBT_DEBUG("Consider %p as outgoing socket to expeditor", sock_iter);
+
+    if (sock_iter->meas || !sock_iter->outgoing)
+      continue;
+    sock_data = ((gras_trp_sg_sock_data_t *) sock_iter->data);
+
+    if ((sock_data->to_socket == active_socket) &&
+        (sock_data->to_host ==
+         simcall_process_get_host(active_socket_data->from_process))) {
+      xbt_dynar_cursor_unlock(pd->sockets);
+      return sock_iter;
     }
-  } while (gras_time()-startTime < timeout
-	   || MSG_task_Iprobe((m_channel_t) pd->chan));
+  }
 
-  return timeout_error;
+  /* Socket to expeditor not created yet */
+  XBT_DEBUG("Create a socket to the expeditor");
 
-}
+  trp = gras_trp_plugin_get_by_name("sg");
 
+  gras_trp_socket_new(1, &res);
+  res->plugin = trp;
 
-/* dummy implementations of the functions used in RL mode */
+  res->incoming = 1;
+  res->outgoing = 1;
+  res->accepting = 0;
+  res->sd = -1;
 
-gras_error_t gras_trp_tcp_setup(gras_trp_plugin_t *plug) {
-  return mismatch_error;
-}
-gras_error_t gras_trp_file_setup(gras_trp_plugin_t *plug) {
-  return mismatch_error;
+  res->port = -1;
+
+  /* initialize the ports */
+  //res->peer_port = active_socket->port;
+  res->port = active_socket->peer_port;
+
+  /* create sockdata */
+  sockdata = xbt_new(gras_trp_sg_sock_data_t, 1);
+  sockdata->from_process = SIMIX_process_self();
+  sockdata->to_process = active_socket_data->from_process;
+
+  res->peer_port = ((gras_trp_procdata_t)
+                    gras_libdata_by_name_from_remote("gras_trp",
+                                                     sockdata->to_process))->
+      myport;
+  sockdata->to_socket = active_socket;
+  /*update the peer to_socket  variable */
+  active_socket_data->to_socket = res;
+  sockdata->cond = simcall_cond_init();
+  sockdata->mutex = simcall_mutex_init();
+
+  sockdata->to_host =
+      simcall_process_get_host(active_socket_data->from_process);
+
+  res->data = sockdata;
+  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)",
+         simcall_process_get_name(sockdata->from_process),
+         res->peer_port,
+         simcall_process_get_name(sockdata->to_process), res->port);
+
+  return res;
 }
+#endif