X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a201b7ceece70d2bc461ac48c8b746a36d07243..c7b463c9c17665403d001fc59cb649551e93d950:/src/gras/Msg/gras_msg_listener.c diff --git a/src/gras/Msg/gras_msg_listener.c b/src/gras/Msg/gras_msg_listener.c index 77bdf1462b..0dcc36fb46 100644 --- a/src/gras/Msg/gras_msg_listener.c +++ b/src/gras/Msg/gras_msg_listener.c @@ -1,6 +1,7 @@ /* Thread in charge of listening the network and queuing incoming messages */ -/* Copyright (c) 2007 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2007, 2008, 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. */ @@ -17,37 +18,66 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg_read, gras_msg, #include "gras/Transport/transport_interface.h" /* gras_select */ typedef struct s_gras_msg_listener_ { - xbt_queue_t incomming_messages; + xbt_thread_t listener; /* keep this first, gras_socket_im_the_server() does funky transtyping in sg_msg.c */ + xbt_queue_t incoming_messages; /* messages received from the wire and still to be used by master */ xbt_queue_t socks_to_close; /* let the listener close the sockets, since it may be selecting on them. Darwin don't like this trick */ - gras_socket_t wakeup_sock_listener_side; - gras_socket_t wakeup_sock_master_side; - xbt_thread_t listener; + xbt_socket_t wakeup_sock_listener_side; + xbt_socket_t wakeup_sock_master_side; + int port; /* The port on which the listener opened the command socket */ + xbt_mutex_t init_mutex; /* both this mutex and condition are used at initialization to make sure that */ + xbt_cond_t init_cond; /* the main thread speaks to the listener only once it is started (FIXME: It would be easier using a semaphore, if only semaphores were in xbt_synchro) */ } s_gras_msg_listener_t; +#include "gras/Virtu/virtu_private.h" /* gras_procdata_t */ static void listener_function(void *p) { gras_msg_listener_t me = (gras_msg_listener_t) p; - s_gras_msg_t msg; + gras_msg_t msg; xbt_ex_t e; gras_msgtype_t msg_wakeup_listener_t = - gras_msgtype_by_name("_wakeup_listener"); - DEBUG0("I'm the listener"); + gras_msgtype_by_name("_wakeup_listener"); + XBT_DEBUG("I'm the listener"); + + /* get a free socket for the receiving part of the listener */ + me->wakeup_sock_listener_side =NULL; + for (me->port = 5000; me->port < 6000; me->port++) { + TRY { + me->wakeup_sock_listener_side = gras_socket_server_ext(me->port, -1, 0); + } + CATCH(e) { + if (me->port == 6000) + RETHROW; + xbt_ex_free(e); + } + if (me->wakeup_sock_listener_side) + break; + } + + /* wake up the launcher */ + xbt_mutex_acquire(me->init_mutex); + xbt_cond_signal(me->init_cond); + xbt_mutex_release(me->init_mutex); + + /* Main loop */ while (1) { - 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 { - char got = *(char *) msg.payl; + msg = gras_msg_recv_any(); + if (msg->type != msg_wakeup_listener_t) { + /* Cannot display who sent this since in SG, xbt_socket_peer_* wont work: + I'm not the user process but I'm just the listener. Too bad */ + XBT_VERB("Got a '%s' message (%s) from sock %p. Queue it for handling by main thread", + gras_msgtype_get_name(msg->type),e_gras_msg_kind_names[msg->kind],msg->expe); + xbt_queue_push(me->incoming_messages, msg); + } else { + char got = *(char *) msg->payl; if (got == '1') { - VERB0("Asked to get awake"); - free(msg.payl); + XBT_VERB("Asked to get awake"); + free(msg->payl); + free(msg); } else { - VERB0("Asked to die"); - // gras_socket_close(me->wakeup_sock_listener_side); - free(msg.payl); + XBT_VERB("Asked to die"); + //gras_socket_close(me->wakeup_sock_listener_side); + free(msg->payl); + free(msg); return; } } @@ -57,8 +87,13 @@ static void listener_function(void *p) int sock; xbt_queue_shift_timed(me->socks_to_close, &sock, 0); if (tcp_close(sock) < 0) { - WARN3("error while closing tcp socket %d: %d (%s)\n", +#ifdef _XBT_WIN32 + XBT_WARN("error while closing tcp socket %d: %d\n", sock, + sock_errno); +#else + XBT_WARN("error while closing tcp socket %d: %d (%s)\n", sock, sock_errno, sock_errstr(sock_errno)); +#endif } } } @@ -70,33 +105,34 @@ static void listener_function(void *p) } } -gras_msg_listener_t gras_msg_listener_launch(xbt_queue_t msg_exchange) +gras_msg_listener_t gras_msg_listener_launch(xbt_queue_t msg_received) { gras_msg_listener_t arg = xbt_new0(s_gras_msg_listener_t, 1); - int my_port; - DEBUG0("Launch listener"); - arg->incomming_messages = msg_exchange; + XBT_VERB("Launch listener"); + arg->incoming_messages = msg_received; arg->socks_to_close = xbt_queue_new(0, sizeof(int)); - - /* 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)); + arg->init_mutex = xbt_mutex_init(); + arg->init_cond = xbt_cond_init(); /* declare the message used to awake the listener from the master */ - gras_msgtype_declare("_wakeup_listener", gras_datadesc_by_name("char")); + gras_msgtype_declare("_wakeup_listener", xbt_datadesc_by_name("char")); + + /* actually start the thread, and */ + /* wait for the listener to initialize before we connect to its socket */ + xbt_mutex_acquire(arg->init_mutex); + arg->listener = + xbt_thread_create("listener", listener_function, arg, + 1 /*joinable */ ); + xbt_cond_wait(arg->init_cond, arg->init_mutex); + xbt_mutex_release(arg->init_mutex); + xbt_cond_destroy(arg->init_cond); + xbt_mutex_destroy(arg->init_mutex); - /* actually start the thread */ - arg->listener = xbt_thread_create("listener", listener_function, arg,1/*joinable*/); - 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 */ + /* Connect the other part of the socket */ + arg->wakeup_sock_master_side = + gras_socket_client(gras_os_myname(), + arg->port); return arg; } @@ -105,16 +141,16 @@ void gras_msg_listener_shutdown() { gras_procdata_t *pd = gras_procdata_get(); char kill = '0'; - DEBUG0("Listener quit"); + XBT_DEBUG("Listener quit"); if (pd->listener) - gras_msg_send(pd->listener->wakeup_sock_master_side, "_wakeup_listener", - &kill); + gras_msg_send(pd->listener->wakeup_sock_master_side, + "_wakeup_listener", &kill); xbt_thread_join(pd->listener->listener); // gras_socket_close(pd->listener->wakeup_sock_master_side); FIXME: uncommenting this leads to deadlock at terminaison - xbt_queue_free(&pd->listener->incomming_messages); + xbt_queue_free(&pd->listener->incoming_messages); xbt_queue_free(&pd->listener->socks_to_close); xbt_free(pd->listener); } @@ -124,11 +160,11 @@ void gras_msg_listener_awake() gras_procdata_t *pd; char c = '1'; - DEBUG0("Awaking the listener"); + XBT_DEBUG("Awaking the listener"); pd = gras_procdata_get(); if (pd->listener) { - gras_msg_send(pd->listener->wakeup_sock_master_side, "_wakeup_listener", - &c); + gras_msg_send(pd->listener->wakeup_sock_master_side, + "_wakeup_listener", &c); } }