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

diff --git a/src/gras/Transport/sg_transport.c b/src/gras/Transport/sg_transport.c
index a767070c6d..b77eae404d 100644
--- a/src/gras/Transport/sg_transport.c
+++ b/src/gras/Transport/sg_transport.c
@@ -28,94 +28,97 @@ gras_socket_t _gras_lastly_selected_socket = NULL;
  * if timeout>0 and no message there, wait at most that amount of time before giving up.
  */
 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);
-	}
-
-	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;
-		}
-	}
-
-	/* Socket to expeditor not created yet */
-	DEBUG0("Create a socket to the expeditor");
-
-	trp = gras_trp_plugin_get_by_name("sg");
-
-	gras_trp_socket_new(1,&res);
-	res->plugin   = trp;
-
-	res->incoming  = 1;
-	res->outgoing  = 1;
-	res->accepting = 0;
-	res->sd        = -1;
-
-	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   = ((gras_trp_sg_sock_data_t*)(active_socket->data))->from_process;
+  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 */
+  int cursor;
+
+  DEBUG3("select on %s@%s with timeout=%f",
+	 SIMIX_process_get_name(SIMIX_process_self()),
+	 SIMIX_host_get_name(SIMIX_host_self()),
+	 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) {
+    DEBUG0("TIMEOUT");
+    THROW0(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 */
+  DEBUG1("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;
+    DEBUG1("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 == SIMIX_process_get_host(active_socket_data->from_process)) ) {
+			xbt_dynar_cursor_unlock(pd->sockets);	
+      return sock_iter;
+    }
+  }
+
+  /* Socket to expeditor not created yet */
+  DEBUG0("Create a socket to the expeditor");
+
+  trp = gras_trp_plugin_get_by_name("sg");
+
+  gras_trp_socket_new(1,&res);
+  res->plugin   = trp;
+
+  res->incoming  = 1;
+  res->outgoing  = 1;
+  res->accepting = 0;
+  res->sd        = -1;
+
+  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 */
-	((gras_trp_sg_sock_data_t*)active_socket->data)->to_socket = res;
-	sockdata->cond = SIMIX_cond_init();
-	sockdata->mutex = SIMIX_mutex_init();
+  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 = SIMIX_cond_init();
+  sockdata->mutex = SIMIX_mutex_init();
 
-	sockdata->to_host  = SIMIX_process_get_host(((gras_trp_sg_sock_data_t*)(active_socket->data))->from_process);
+  sockdata->to_host = SIMIX_process_get_host(active_socket_data->from_process);
 
-	res->data = sockdata;
-	res->peer_name = strdup(SIMIX_host_get_name(sockdata->to_host));
+  res->data = sockdata;
+  res->peer_name = strdup(SIMIX_host_get_name(sockdata->to_host));
 
-	gras_trp_buf_init_sock(res);
+  gras_trp_buf_init_sock(res);
 
-	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);
+  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;
+  return res;
 }