Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Integrate Bruno's work on SIMIX onto main stream. Tests are broken, but it looks...
[simgrid.git] / src / gras / Transport / sg_transport.c
index 917d8af..a767070 100644 (file)
@@ -2,20 +2,21 @@
 
 /* sg_transport - SG specific functions for transport                       */
 
-/* Authors: Martin Quinson                                                  */
-/* Copyright (C) 2004 Martin Quinson.                                       */
+/* Copyright (c) 2004 Martin Quinson. 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 "Transport/transport_private.h"
-#include <msg.h>
-#include "Virtu/virtu_sg.h"
+#include "xbt/ex.h"
+#include "gras/Transport/transport_private.h"
+#include "gras/Virtu/virtu_sg.h"
 
-GRAS_LOG_EXTERNAL_CATEGORY(transport);
-GRAS_LOG_DEFAULT_CATEGORY(transport);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(gras_trp);
 
-/**
+/* check transport_private.h for an explanation of this variable; this just need to be defined to NULL in SG */
+gras_socket_t _gras_lastly_selected_socket = NULL;
+
+/**    
  * gras_trp_select:
  *
  * Returns the next socket to service having a message awaiting.
@@ -26,94 +27,103 @@ GRAS_LOG_DEFAULT_CATEGORY(transport);
  *
  * 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) {
-
-  gras_error_t errcode;
-  double startTime=gras_time();
-  gras_procdata_t *pd=gras_procdata_get();
-  gras_trp_sg_sock_data_t *sockdata;
-  gras_trp_plugin_t *trp;
-
-  gras_socket_t *sock_iter; /* iterating over all sockets */
-  int cursor;               /* iterating over all sockets */
-
-  int r_pid, cpt;
-  gras_hostdata_t *remote_hd;
-
-  DEBUG1("select with timeout=%d",timeout);
-  do {
-    r_pid = MSG_task_probe_from((m_channel_t) pd->chan);
-    if (r_pid >= 0) {
-      /* Try to reuse an already openned socket to that expeditor */
-      gras_dynar_foreach(pd->sockets,cursor,sock_iter) {
-       DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter);
-       sockdata = sock_iter->data;
-
-       if (sock_iter->raw || !sock_iter->outgoing)
-         continue;
-
-       if (sockdata->from_PID == r_pid) {
-         *dst=sock_iter;
-         return no_error;
+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;
+       gras_socket_t sock_iter; /* iterating over all sockets */
+       int cursor;
+
+       DEBUG0("Trying to get the lock pd, trp_select");
+       SIMIX_mutex_lock(pd->mutex);
+       DEBUG3("select on %s@%s with timeout=%f",
+                       SIMIX_process_get_name(SIMIX_process_self()),
+                       SIMIX_host_get_name(SIMIX_host_self()),
+                       timeout);
+
+       if (xbt_fifo_size(pd->active_socket) == 0) {
+       /* message didn't arrive yet, wait */
+               SIMIX_cond_wait_timeout(pd->cond,pd->mutex,timeout);
        }
-      }
-
-      /* Socket to expeditor not created yet */
-      DEBUG0("Create a socket to the expeditor");
 
-      TRY(gras_trp_plugin_get_by_name("sg",&trp));
+       if (xbt_fifo_size(pd->active_socket) == 0) {
+               DEBUG0("TIMEOUT");
+               SIMIX_mutex_unlock(pd->mutex);
+               THROW0(timeout_error,0,"Timeout");
+       }
+       active_socket = xbt_fifo_shift(pd->active_socket);
+       
+       /* 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_dynar_foreach(pd->sockets,cursor,sock_iter) {
+               DEBUG1("Consider %p as outgoing socket to expeditor",sock_iter);
+
+               if (sock_iter->meas || !sock_iter->outgoing)
+                       continue;
+                       /*
+               if ((sock_iter->peer_port == active_socket->port) && 
+                               (((gras_trp_sg_sock_data_t*)sock_iter->data)->to_host == SIMIX_process_get_host(((gras_trp_sg_sock_data_t*)active_socket->data)->from_process))) {
+                               */
+               if ( (((gras_trp_sg_sock_data_t*)sock_iter->data)->to_socket == active_socket) && (((gras_trp_sg_sock_data_t*)sock_iter->data)->to_host == SIMIX_process_get_host(((gras_trp_sg_sock_data_t*)active_socket->data)->from_process)) ) {
+                       SIMIX_mutex_unlock(pd->mutex);
+                       return sock_iter;
+               }
+       }
 
-      TRY(gras_trp_socket_new(1,dst));
-      (*dst)->plugin   = trp;
+       /* Socket to expeditor not created yet */
+       DEBUG0("Create a socket to the expeditor");
 
-      (*dst)->incoming  = 1;
-      (*dst)->outgoing  = 1;
-      (*dst)->accepting = 0;
-      (*dst)->sd        = -1;
+       trp = gras_trp_plugin_get_by_name("sg");
 
-      (*dst)->port      = -1;
+       gras_trp_socket_new(1,&res);
+       res->plugin   = trp;
 
-      if (!(sockdata = malloc(sizeof(gras_trp_sg_sock_data_t))))
-       RAISE_MALLOC;
+       res->incoming  = 1;
+       res->outgoing  = 1;
+       res->accepting = 0;
+       res->sd        = -1;
 
-      sockdata->from_PID = r_pid;
-      sockdata->to_PID = MSG_process_self_PID();
-      sockdata->to_host = MSG_process_get_host(MSG_process_from_PID(r_pid));
-      (*dst)->data = sockdata;
+       res->port = -1;
 
-      (*dst)->peer_port = -1;
-      (*dst)->peer_name = strdup(MSG_host_get_name(sockdata->to_host));
+       /* initialize the ports */
+       //res->peer_port = active_socket->port;
+       res->port = active_socket->peer_port;
 
-      remote_hd=(gras_hostdata_t *)MSG_host_get_data(sockdata->to_host);
-      gras_assert0(remote_hd,"Run gras_process_init!!");
+       /* create sockdata */
+       sockdata = xbt_new(gras_trp_sg_sock_data_t,1);
+       sockdata->from_process = SIMIX_process_self();
+       sockdata->to_process   = ((gras_trp_sg_sock_data_t*)(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 */
+       ((gras_trp_sg_sock_data_t*)active_socket->data)->to_socket = res;
+       sockdata->cond = SIMIX_cond_init();
+       sockdata->mutex = SIMIX_mutex_init();
 
-      sockdata->to_chan = -1;
-      for (cpt=0; cpt< GRAS_MAX_CHANNEL; cpt++)
-       if (r_pid == remote_hd->proc[cpt])
-         sockdata->to_chan = cpt;
+       sockdata->to_host  = SIMIX_process_get_host(((gras_trp_sg_sock_data_t*)(active_socket->data))->from_process);
 
-      gras_assert0(sockdata->to_chan>0,
-                  "Got a message from a process without channel");
+       res->data = sockdata;
+       res->peer_name = strdup(SIMIX_host_get_name(sockdata->to_host));
 
-      return no_error;
-    } else {
-      MSG_process_sleep(0.01);
-    }
-  } while (gras_time()-startTime < timeout
-          || MSG_task_Iprobe((m_channel_t) pd->chan));
+       gras_trp_buf_init_sock(res);
 
-  return timeout_error;
+       DEBUG4("Create socket to process:%s(Port %d) from process: %s(Port %d)",SIMIX_process_get_name(sockdata->from_process),res->peer_port, SIMIX_process_get_name(sockdata->to_process), res->port);
 
+       SIMIX_mutex_unlock(pd->mutex);
+       return res;
 }
 
   
 /* dummy implementations of the functions used in RL mode */
 
-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;
-}
+void gras_trp_tcp_setup(gras_trp_plugin_t plug) {  THROW0(mismatch_error,0,NULL); }
+void gras_trp_file_setup(gras_trp_plugin_t plug){  THROW0(mismatch_error,0,NULL); }
+void gras_trp_iov_setup(gras_trp_plugin_t plug) {  THROW0(mismatch_error,0,NULL); }
+
+gras_socket_t gras_trp_buf_init_sock(gras_socket_t sock) { return sock;}
+