X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9bb80daccf52fba2e729885ff8cf57f76d4ab1d..1038b1a8e8bcb6f17417a1027a6c59438d248555:/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 e4930fc617..3540090d04 100644 --- a/src/gras/Msg/gras_msg_listener.c +++ b/src/gras/Msg/gras_msg_listener.c @@ -1,8 +1,7 @@ -/* $Id$ */ - /* 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. */ @@ -19,7 +18,7 @@ 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_queue_t incomming_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; @@ -29,27 +28,34 @@ typedef struct s_gras_msg_listener_ { 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"); + + /* get a free socket for the receiving part of the listener */ + me->wakeup_sock_listener_side = gras_socket_server_range(5000, 6000, -1, 0); + + + /* 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) { + VERB1("Got a '%s' message. Queue it for handling by main thread", + gras_msgtype_get_name(msg->type)); + xbt_queue_push(me->incomming_messages, msg); + } else { + char got = *(char *) msg->payl; if (got == '1') { VERB0("Asked to get awake"); - free(msg.payl); + free(msg->payl); + free(msg); } else { VERB0("Asked to die"); - // gras_socket_close(me->wakeup_sock_listener_side); - free(msg.payl); + //gras_socket_close(me->wakeup_sock_listener_side); + free(msg->payl); + free(msg); return; } } @@ -59,8 +65,12 @@ static void listener_function(void *p) int sock; xbt_queue_shift_timed(me->socks_to_close, &sock, 0); if (tcp_close(sock) < 0) { +#ifdef _XBT_WIN32 + WARN2("error while closing tcp socket %d: %d\n", sock, sock_errno); +#else WARN3("error while closing tcp socket %d: %d (%s)\n", sock, sock_errno, sock_errstr(sock_errno)); +#endif } } } @@ -72,59 +82,49 @@ 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; + VERB0("Launch listener"); + arg->incomming_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)); /* 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,0/*not 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 */ + arg->listener = xbt_thread_create("listener", listener_function, arg,1/*joinable*/); + gras_os_sleep(0); /* give the listener a chance to initialize before we connect to its socket */ + + /* We do an active wait until the listener had created the socket (FIXME: ugly hack ) */ + while(arg->wakeup_sock_listener_side == NULL); + + /* 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)); return arg; } #include "gras/Virtu/virtu_private.h" /* procdata_t content */ -void gras_msg_listener_shutdown(gras_msg_listener_t l) +void gras_msg_listener_shutdown() { gras_procdata_t *pd = gras_procdata_get(); char kill = '0'; DEBUG0("Listener quit"); - if (pd->listener) gras_msg_send(pd->listener->wakeup_sock_master_side, "_wakeup_listener", - &kill); + &kill); - /* FIXME: thread_join is not implemented in SG (remove next conditional when fixed) - * But I guess it's not a big deal since we're terminating the thread mainly to - * make it free its OS locks on darwin. - * darwin is definitly different from the neat & nice SG world */ - if (gras_if_RL()) - xbt_thread_join(pd->listener->listener); + 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(&l->incomming_messages); - xbt_queue_free(&l->socks_to_close); - xbt_free(l); + xbt_queue_free(&pd->listener->incomming_messages); + xbt_queue_free(&pd->listener->socks_to_close); + xbt_free(pd->listener); } void gras_msg_listener_awake()