Display the status of simulated processes when receiving SIGINT

[simgrid.git] / src / msg / global.c

diff --git a/src/msg/global.c b/src/msg/global.c
index 3ab2eca..75caaaf 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -22,7 +22,7 @@ MSG_Global_t msg_global = NULL;
 
 /** \defgroup msg_simulation   MSG simulation Functions
  *  \brief This section describes the functions you need to know to
- *  set up a simulation. You should have a look at \ref MSG_examples 
+ *  set up a simulation. You should have a look at \ref MSG_examples
  *  to have an overview of their usage.
  */
 /** @addtogroup msg_simulation
@@ -39,6 +39,12 @@ void MSG_global_init_args(int *argc, char **argv)
   MSG_global_init(argc, argv);
 }
 
+
+XBT_LOG_EXTERNAL_CATEGORY(msg_gos);
+XBT_LOG_EXTERNAL_CATEGORY(msg_kernel);
+XBT_LOG_EXTERNAL_CATEGORY(msg_mailbox);
+XBT_LOG_EXTERNAL_CATEGORY(msg_process);
+
 /** \ingroup msg_simulation
  * \brief Initialize some MSG internal data.
  */
@@ -46,6 +52,12 @@ void MSG_global_init(int *argc, char **argv)
 {
   xbt_getpid = MSG_process_self_PID;
   if (!msg_global) {
+    /* Connect our log channels: that must be done manually under windows */
+    XBT_LOG_CONNECT(msg_gos, msg);
+    XBT_LOG_CONNECT(msg_kernel, msg);
+    XBT_LOG_CONNECT(msg_mailbox, msg);
+    XBT_LOG_CONNECT(msg_process, msg);
+
     SIMIX_global_init(argc, argv);
 
     msg_global = xbt_new0(s_MSG_Global_t, 1);
@@ -54,10 +66,14 @@ void MSG_global_init(int *argc, char **argv)
     msg_global->process_list = xbt_fifo_new();
     msg_global->max_channel = 0;
     msg_global->PID = 1;
+    msg_global->sent_msg = 0;
 
        /* initialization of the mailbox module */
        MSG_mailbox_mod_init();
 
+       /* initialization of the action module */
+       _MSG_action_init();
+
     SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
     SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
@@ -79,7 +95,7 @@ void MSG_paje_output(const char *filename)
  */
 /** @addtogroup m_channel_management
  *    \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Channels" --> \endhtmlonly
- * 
+ *
  *
  *  For convenience, the simulator provides the notion of channel
  *  that is close to the tag notion in MPI. A channel is not a
@@ -112,7 +128,7 @@ MSG_error_t MSG_set_channel_number(int number)
 /** \ingroup m_channel_management
  * \brief Return the number of channel in the simulation.
  *
- * This function has to be called once the number of channel is fixed. I can't 
+ * This function has to be called once the number of channel is fixed. I can't
    figure out a reason why anyone would like to call this function but nevermind.
  * \return the number of channel in the simulation.
  */
@@ -125,21 +141,6 @@ int MSG_get_channel_number(void)
   return msg_global->max_channel;
 }
 
-void __MSG_display_process_status(void)
-{
-}
-
-
-/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
-#include <signal.h>
-
-static void _XBT_CALL inthandler(int ignored)
-{
-  INFO0("CTRL-C pressed. Displaying status and bailing out");
-  __MSG_display_process_status();
-  exit(1);
-}
-
 /** \ingroup msg_simulation
  * \brief Launch the MSG simulation
  */
@@ -150,12 +151,10 @@ MSG_error_t MSG_main(void)
   xbt_fifo_t actions_done = xbt_fifo_new();
   xbt_fifo_t actions_failed = xbt_fifo_new();
 
-  /* Prepare to display some more info when dying on Ctrl-C pressing */
-  signal(SIGINT, inthandler);
-
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
+  SIMIX_init();
 
   //surf_solve(); /* Takes traces into account. Returns 0.0 */
   /* xbt_fifo_size(msg_global->process_to_run) */
@@ -169,8 +168,6 @@ MSG_error_t MSG_main(void)
       while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
        SIMIX_cond_broadcast(cond);
       }
-      /* action finished, destroy it */
-      //      SIMIX_action_destroy(smx_action);
     }
 
     while ((smx_action = xbt_fifo_pop(actions_done))) {
@@ -179,8 +176,6 @@ MSG_error_t MSG_main(void)
       while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
        SIMIX_cond_broadcast(cond);
       }
-      /* action finished, destroy it */
-      //SIMIX_action_destroy(smx_action);
     }
   }
   xbt_fifo_free(actions_failed);
@@ -242,7 +237,7 @@ MSG_error_t MSG_clean(void)
 
   SIMIX_clean();
 
-  
+
 
   return MSG_OK;
 }
@@ -255,3 +250,7 @@ double MSG_get_clock(void)
 {
   return SIMIX_get_clock();
 }
+
+unsigned long int MSG_get_sent_msg() {
+  return msg_global->sent_msg;
+}