From d177472fea36c2a8f780637477591025663d30a4 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 10 Mar 2009 15:02:34 +0000 Subject: [PATCH] Gras listener thread of each process do select(-1) instead of while(1) {select(0.5)} So, it won't get active before a message actually arrived. The previous design was because when the main thread opens a server socket, it has to be added to the set of sockets select()ed by the listener. My solution is to add a new socket between main and listener threads. Each time the main opens a socket, it writes something on this socket, unlocking the listener. Who detects the fact that it's not a real message to handle, and get back to select(-1) (automagically adding the new socket to the set). git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6151 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/gras/Msg/gras_msg_listener.c | 53 +++++++---- src/gras/Msg/msg_interface.h | 11 +-- src/gras/Transport/transport.c | 146 ++++++++++++++++--------------- 3 files changed, 118 insertions(+), 92 deletions(-) diff --git a/src/gras/Msg/gras_msg_listener.c b/src/gras/Msg/gras_msg_listener.c index 3d74618de4..94d7863e4b 100644 --- a/src/gras/Msg/gras_msg_listener.c +++ b/src/gras/Msg/gras_msg_listener.c @@ -8,6 +8,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "gras/Msg/msg_private.h" +#include "gras/Transport/transport_private.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg_read,gras_msg,"Message reader thread"); #include "xbt/ex.h" @@ -18,29 +19,25 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg_read,gras_msg,"Message reader thread"); typedef struct s_gras_msg_listener_ { xbt_queue_t incomming_messages; + gras_socket_t wakeup_sock_listener_side; + gras_socket_t wakeup_sock_master_side; xbt_thread_t listener; } s_gras_msg_listener_t; static void listener_function(void *p) { gras_msg_listener_t me = (gras_msg_listener_t)p; s_gras_msg_t msg; - xbt_ex_t e; - int found =0; + gras_msgtype_t msg_wakeup_listener_t = gras_msgtype_by_name("_wakeup_listener"); DEBUG0("I'm the listener"); while (1) { - TRY { - DEBUG0("Select for .5 sec"); - msg.expe = gras_trp_select(0.5); - found =1; - DEBUG0("Select returned something"); - } - CATCH(e) { - xbt_ex_free(e); - } - if (found) { - gras_msg_recv(msg.expe, &msg); - xbt_queue_push(me->incomming_messages, &msg); - found =0; + DEBUG0("Selecting"); + msg.expe = gras_trp_select(-1); + DEBUG0("Select returned something"); + gras_msg_recv(msg.expe, &msg); + if (msg.type!=msg_wakeup_listener_t) + xbt_queue_push(me->incomming_messages, &msg); + else { + DEBUG0("Asked to get awake"); } } } @@ -48,12 +45,24 @@ static void listener_function(void *p) { gras_msg_listener_t gras_msg_listener_launch(xbt_queue_t msg_exchange){ gras_msg_listener_t arg = xbt_new0(s_gras_msg_listener_t,1); + int my_port; DEBUG0("Launch listener"); arg->incomming_messages = msg_exchange; + /* get a free socket for the receiving part of the listener, taking care that it does not get saved as "myport" number */ + my_port = ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport; + arg->wakeup_sock_listener_side=gras_socket_server_range(5000,6000,-1,0); + ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport = my_port; + /* Connect the other part of the socket */ + arg->wakeup_sock_master_side=gras_socket_client(gras_os_myname(),gras_socket_my_port(arg->wakeup_sock_listener_side)); + + /* declare the message used to awake the listener from the master */ + gras_msgtype_declare("_wakeup_listener",gras_datadesc_by_name("char")); + + /* actually start the thread */ arg->listener = xbt_thread_create("listener",listener_function,arg); - gras_os_sleep(0); /* give the listener a chance to initialize even if the main is empty and we cancel it right afterward */ + gras_os_sleep(0); /* TODO: useless? give the listener a chance to initialize even if the main is empty and we cancel it right afterward */ return arg; } @@ -63,3 +72,15 @@ void gras_msg_listener_shutdown(gras_msg_listener_t l) { xbt_queue_free(&l->incomming_messages); xbt_free(l); } + +#include "gras/Virtu/virtu_private.h" /* procdata_t content */ +void gras_msg_listener_awake(){ + gras_procdata_t *pd; + char c = '1'; + + DEBUG0("Awaking the listener"); + pd = gras_procdata_get(); + if (pd->listener) { + gras_msg_send(pd->listener->wakeup_sock_master_side,"_wakeup_listener",&c); + } +} diff --git a/src/gras/Msg/msg_interface.h b/src/gras/Msg/msg_interface.h index 7c726d93d0..ebef2be7ae 100644 --- a/src/gras/Msg/msg_interface.h +++ b/src/gras/Msg/msg_interface.h @@ -16,7 +16,7 @@ #include "xbt/fifo.h" /* - * Data of this module specific to each process + * Data of this module specific to each process * (used by sg_process.c to check some usual errors at the end of the simulation) * FIXME: it could be cleaned up ? */ @@ -34,10 +34,10 @@ typedef struct { /* registered callbacks for each message */ xbt_dynar_t cbl_list; /* elm type: gras_cblist_t */ - + /* registered timers */ xbt_dynar_t timers; /* elm type: s_gras_timer_t */ - + /* queue storing the msgs that have to received and the process synchronization made (wait the surf action done) */ xbt_fifo_t msg_to_receive_queue; /* elm type: s_gras_msg_t */ xbt_fifo_t msg_to_receive_queue_meas; /* elm type: s_gras_msg_t */ @@ -47,9 +47,10 @@ typedef struct { } s_gras_msg_procdata_t,*gras_msg_procdata_t; -void gras_msg_send_namev(gras_socket_t sock, - const char *namev, +void gras_msg_send_namev(gras_socket_t sock, + const char *namev, void *payload); +void gras_msg_listener_awake(void); #define GRAS_PROTOCOL_VERSION '\0'; diff --git a/src/gras/Transport/transport.c b/src/gras/Transport/transport.c index 2c532f3aef..d292390bda 100644 --- a/src/gras/Transport/transport.c +++ b/src/gras/Transport/transport.c @@ -16,6 +16,7 @@ int gras_opt_trp_nomoredata_on_close=0; #include "xbt/peer.h" #include "portable.h" #include "gras/Transport/transport_private.h" +#include "gras/Msg/msg_interface.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_trp,gras,"Conveying bytes over the network"); XBT_LOG_NEW_SUBCATEGORY(gras_trp_meas,gras_trp,"Conveying bytes over the network without formating for perf measurements"); @@ -29,7 +30,7 @@ gras_trp_plugin_new(const char *name, gras_trp_setup_t setup) { xbt_ex_t e; gras_trp_plugin_t plug = xbt_new0(s_gras_trp_plugin_t, 1); - + DEBUG1("Create plugin %s",name); plug->name=xbt_strdup(name); @@ -59,20 +60,20 @@ void gras_trp_init(void){ #ifdef HAVE_WINSOCK2_H /* initialize the windows mechanism */ - { + { WORD wVersionRequested; WSADATA wsaData; - + wVersionRequested = MAKEWORD( 2, 0 ); xbt_assert0(WSAStartup( wVersionRequested, &wsaData ) == 0, "Cannot find a usable WinSock DLL"); - + /* Confirm that the WinSock DLL supports 2.0.*/ /* Note that if the DLL supports versions greater */ /* than 2.0 in addition to 2.0, it will still return */ /* 2.0 in wVersion since that is the version we */ /* requested. */ - + xbt_assert0(LOBYTE( wsaData.wVersion ) == 2 && HIBYTE( wsaData.wVersion ) == 0, "Cannot find a usable WinSock DLL"); @@ -85,13 +86,13 @@ void gras_trp_init(void){ INFO0("Found and initialized winsock"); } #endif - + /* Add plugins */ gras_trp_plugin_new("file",gras_trp_file_setup); gras_trp_plugin_new("sg",gras_trp_sg_setup); gras_trp_plugin_new("tcp", gras_trp_tcp_setup); } - + _gras_trp_started++; } @@ -101,7 +102,7 @@ gras_trp_exit(void){ if (_gras_trp_started == 0) { return; } - + if ( --_gras_trp_started == 0 ) { #ifdef HAVE_WINSOCK_H if ( WSACleanup() == SOCKET_ERROR ) { @@ -165,26 +166,26 @@ void gras_trp_socket_new(int incoming, sock->data = NULL; sock->bufdata = NULL; - + *dst = sock; XBT_OUT; } - + /** * @brief Opens a server socket and makes it ready to be listened to. * @param port: port on which you want to listen * @param buf_size: size of the buffer (in byte) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change) * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages) - * - * In real life, you'll get a TCP socket. + * + * In real life, you'll get a TCP socket. */ gras_socket_t gras_socket_server_ext(unsigned short port, - + unsigned long int buf_size, int measurement) { - + xbt_ex_t e; gras_trp_plugin_t trp; gras_socket_t sock; @@ -206,7 +207,7 @@ gras_socket_server_ext(unsigned short port, TRY { trp->socket_server(trp, sock); DEBUG3("in=%c out=%c accept=%c", - sock->incoming?'y':'n', + sock->incoming?'y':'n', sock->outgoing?'y':'n', sock->accepting?'y':'n'); } CATCH(e) { @@ -217,28 +218,30 @@ gras_socket_server_ext(unsigned short port, if (!measurement) ((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->myport = port; - xbt_dynar_push(((gras_trp_procdata_t) + xbt_dynar_push(((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets,&sock); + + gras_msg_listener_awake(); return sock; } /** * @brief Opens a server socket on any port in the given range - * + * * @param minport: first port we will try * @param maxport: last port we will try * @param buf_size: size of the buffer (in byte) on the socket (for TCP sockets only). If 0, a sain default is used (32k, but may change) * @param measurement: whether this socket is meant to convey measurement (if you don't know, use 0 to exchange regular messages) - * + * * If none of the provided ports works, raises the exception got when trying the last possibility - */ + */ gras_socket_t gras_socket_server_range(unsigned short minport, unsigned short maxport, unsigned long int buf_size, int measurement) { - + int port; gras_socket_t res=NULL; xbt_ex_t e; - + for (port=minport; portsocket_client)(trp, sock); DEBUG3("in=%c out=%c accept=%c", - sock->incoming?'y':'n', + sock->incoming?'y':'n', sock->outgoing?'y':'n', sock->accepting?'y':'n'); } CATCH(e) { free(sock); RETHROW; } - xbt_dynar_push(((gras_trp_procdata_t) + xbt_dynar_push(((gras_trp_procdata_t) gras_libdata_by_id(gras_trp_libdata_id))->sockets,&sock); + gras_msg_listener_awake(); return sock; } /** * @brief Opens a server socket and make it ready to be listened to. - * + * * In real life, you'll get a TCP socket. */ gras_socket_t @@ -337,12 +341,12 @@ void gras_socket_close(gras_socket_t sock) { if (sock == _gras_lastly_selected_socket) { xbt_assert0(!gras_opt_trp_nomoredata_on_close || !sock->moredata, "Closing a socket having more data in buffer while the nomoredata_on_close option is activated"); - - if (sock->moredata) + + if (sock->moredata) CRITICAL0("Closing a socket having more data in buffer. Option nomoredata_on_close disabled, so continuing."); _gras_lastly_selected_socket=NULL; } - + /* FIXME: Issue an event when the socket is closed */ DEBUG1("sockets pointer before %p",sockets); if (sock) { @@ -353,7 +357,7 @@ void gras_socket_close(gras_socket_t sock) { if (sock == sock_iter) { DEBUG2("remove sock cursor %d dize %lu\n",cursor,xbt_dynar_length(sockets)); xbt_dynar_cursor_rm(sockets,&cursor); - if (sock->plugin->socket_close) + if (sock->plugin->socket_close) (* sock->plugin->socket_close)(sock); /* free the memory */ @@ -430,35 +434,35 @@ int gras_socket_is_meas(gras_socket_t sock) { return sock->meas; } -/** \brief Send a chunk of (random) data over a measurement socket +/** \brief Send a chunk of (random) data over a measurement socket * * @param peer measurement socket to use for the experiment * @param timeout timeout (in seconds) * @param msg_size size of each chunk sent over the socket (in bytes). - * @param msg_amount how many of these packets you want to send. + * @param msg_amount how many of these packets you want to send. + * + * Calls to gras_socket_meas_send() and gras_socket_meas_recv() on + * each side of the socket should be paired. * - * Calls to gras_socket_meas_send() and gras_socket_meas_recv() on - * each side of the socket should be paired. - * * The exchanged data is zeroed to make sure it's initialized, but - * there is no way to control what is sent (ie, you cannot use these + * there is no way to control what is sent (ie, you cannot use these * functions to exchange data out of band). - * - * @warning: in SimGrid version 3.1 and previous, the numerical arguments - * were the total amount of data to send and the msg_size. This - * was changed for the fool wanting to send more than MAXINT - * bytes in a fat pipe. + * + * @warning: in SimGrid version 3.1 and previous, the numerical arguments + * were the total amount of data to send and the msg_size. This + * was changed for the fool wanting to send more than MAXINT + * bytes in a fat pipe. */ -void gras_socket_meas_send(gras_socket_t peer, +void gras_socket_meas_send(gras_socket_t peer, unsigned int timeout, - unsigned long int msg_size, + unsigned long int msg_size, unsigned long int msg_amount) { char *chunk=NULL; unsigned long int sent_sofar; - + XBT_IN; - if (gras_if_RL()) + if (gras_if_RL()) chunk=xbt_malloc0(msg_size); xbt_assert0(peer->meas,"Asked to send measurement data on a regular socket"); @@ -473,34 +477,34 @@ void gras_socket_meas_send(gras_socket_t peer, CDEBUG5(gras_trp_meas,"Sent %lu msgs of %lu (size of each: %ld) to %s:%d", sent_sofar,msg_amount,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); - - if (gras_if_RL()) + + if (gras_if_RL()) free(chunk); XBT_OUT; } -/** \brief Receive a chunk of data over a measurement socket +/** \brief Receive a chunk of data over a measurement socket * - * Calls to gras_socket_meas_send() and gras_socket_meas_recv() on - * each side of the socket should be paired. + * Calls to gras_socket_meas_send() and gras_socket_meas_recv() on + * each side of the socket should be paired. * - * @warning: in SimGrid version 3.1 and previous, the numerical arguments - * were the total amount of data to send and the msg_size. This - * was changed for the fool wanting to send more than MAXINT - * bytes in a fat pipe. + * @warning: in SimGrid version 3.1 and previous, the numerical arguments + * were the total amount of data to send and the msg_size. This + * was changed for the fool wanting to send more than MAXINT + * bytes in a fat pipe. */ -void gras_socket_meas_recv(gras_socket_t peer, +void gras_socket_meas_recv(gras_socket_t peer, unsigned int timeout, - unsigned long int msg_size, + unsigned long int msg_size, unsigned long int msg_amount){ - + char *chunk=NULL; unsigned long int got_sofar; XBT_IN; - if (gras_if_RL()) + if (gras_if_RL()) chunk = xbt_malloc(msg_size); xbt_assert0(peer->meas, @@ -517,21 +521,21 @@ void gras_socket_meas_recv(gras_socket_t peer, got_sofar,msg_amount,msg_size, gras_socket_peer_name(peer), gras_socket_peer_port(peer)); - if (gras_if_RL()) + if (gras_if_RL()) free(chunk); XBT_OUT; } /** - * \brief Something similar to the good old accept system call. + * \brief Something similar to the good old accept system call. * * Make sure that there is someone speaking to the provided server socket. - * In RL, it does an accept(2) and return the result as last argument. + * In RL, it does an accept(2) and return the result as last argument. * In SG, as accepts are useless, it returns the provided argument as result. * You should thus test whether (peer != accepted) before closing both of them. * - * You should only call this on measurement sockets. It is automatically - * done for regular sockets, but you usually want more control about + * You should only call this on measurement sockets. It is automatically + * done for regular sockets, but you usually want more control about * what's going on with measurement sockets. */ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){ @@ -551,7 +555,7 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){ CDEBUG1(gras_trp_meas,"meas_accepted onto %d",res->sd); return res; -} +} /* @@ -559,12 +563,12 @@ gras_socket_t gras_socket_meas_accept(gras_socket_t peer){ */ static void *gras_trp_procdata_new(void) { gras_trp_procdata_t res = xbt_new(s_gras_trp_procdata_t,1); - + res->name = xbt_strdup("gras_trp"); res->name_len = 0; res->sockets = xbt_dynar_new_sync(sizeof(gras_socket_t*), NULL); res->myport = 0; - + return (void*)res; } @@ -573,14 +577,14 @@ static void *gras_trp_procdata_new(void) { */ static void gras_trp_procdata_free(void *data) { gras_trp_procdata_t res = (gras_trp_procdata_t)data; - + xbt_dynar_free(&( res->sockets )); free(res->name); free(res); } void gras_trp_socketset_dump(const char *name) { - gras_trp_procdata_t procdata = + gras_trp_procdata_t procdata = (gras_trp_procdata_t)gras_libdata_by_id(gras_trp_libdata_id); unsigned int it; -- 2.20.1