X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15142e98775405b23e3059da088d4aeecb906b78..19a7582234a64354e454fdab60a0d8c7ac16d2cc:/src/simix/smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 3681493839..b4de7e8266 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -30,13 +30,21 @@ static void* SIMIX_action_mallocator_new_f(void);
 static void SIMIX_action_mallocator_free_f(void* action);
 static void SIMIX_action_mallocator_reset_f(void* action);
 
+extern void smx_ctx_raw_new_sr(void);
+
 /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
 #include <signal.h>
 
+int _surf_do_verbose_exit = 1;
 static void _XBT_CALL inthandler(int ignored)
 {
-  XBT_INFO("CTRL-C pressed. Displaying status and bailing out");
-  SIMIX_display_process_status();
+  if ( _surf_do_verbose_exit ) {
+     XBT_INFO("CTRL-C pressed. Displaying status and bailing out");
+     SIMIX_display_process_status();
+  }
+  else {
+     XBT_INFO("CTRL-C pressed. bailing out without displaying because verbose-exit disabled");
+  }
   exit(1);
 }
 
@@ -70,8 +78,8 @@ void SIMIX_global_init(int *argc, char **argv)
 
     simix_global = xbt_new0(s_smx_global_t, 1);
 
-    simix_global->host = xbt_dict_new();
-    simix_global->process_to_run = xbt_dynar_new(sizeof(void *), NULL);
+    simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL);
+    simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), NULL);
     simix_global->process_list =
         xbt_swag_new(xbt_swag_offset(proc, process_hookup));
     simix_global->process_to_destroy =
@@ -95,9 +103,6 @@ void SIMIX_global_init(int *argc, char **argv)
     __xbt_running_ctx_fetch = SIMIX_process_get_running_context;
     __xbt_ex_terminate = SIMIX_process_exception_terminate;
 
-    /* Initialize request mechanism */
-    SIMIX_request_init();
-
     /* Initialize the SIMIX network module */
     SIMIX_network_init();
 
@@ -107,6 +112,9 @@ void SIMIX_global_init(int *argc, char **argv)
   if (!simix_timers) {
     simix_timers = xbt_heap_new(8, &free);
   }
+
+  XBT_DEBUG("ADD SIMIX LEVELS");
+  SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
 }
 
 /**
@@ -116,24 +124,25 @@ void SIMIX_global_init(int *argc, char **argv)
  */
 void SIMIX_clean(void)
 {
+#ifdef TIME_BENCH
+  smx_ctx_raw_new_sr();
+#endif
+
   /* Kill everyone (except maestro) */
   SIMIX_process_killall(simix_global->maestro_process);
 
   /* Exit the SIMIX network module */
   SIMIX_network_exit();
 
-  /* Exit request mechanism */
-  SIMIX_request_destroy();
-
   xbt_heap_free(simix_timers);
   /* Free the remaining data structures */
   xbt_dynar_free(&simix_global->process_to_run);
+  xbt_dynar_free(&simix_global->process_that_ran);
   xbt_swag_free(simix_global->process_to_destroy);
   xbt_swag_free(simix_global->process_list);
   simix_global->process_list = NULL;
   simix_global->process_to_destroy = NULL;
   xbt_dict_free(&(simix_global->registered_functions));
-  xbt_dict_free(&(simix_global->host));
 
   /* Let's free maestro now */
   SIMIX_context_free(simix_global->maestro_process->context);
@@ -175,7 +184,7 @@ XBT_INLINE double SIMIX_get_clock(void)
 void SIMIX_run(void)
 {
   double time = 0;
-  smx_req_t req;
+  smx_process_t process;
   xbt_swag_t set;
   surf_action_t action;
   smx_timer_t timer;
@@ -185,15 +194,20 @@ void SIMIX_run(void)
   do {
     XBT_DEBUG("New Schedule Round; size(queue)=%lu",
         xbt_dynar_length(simix_global->process_to_run));
-    do {
+#ifdef TIME_BENCH
+    smx_ctx_raw_new_sr();
+#endif
+    while (xbt_dynar_length(simix_global->process_to_run)) {
       XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu",
               xbt_dynar_length(simix_global->process_to_run));
-      SIMIX_context_runall(simix_global->process_to_run);
-      while ((req = SIMIX_request_pop())) {
-        XBT_DEBUG("Handling request %p", req);
-        SIMIX_request_pre(req, 0);
+      SIMIX_process_runall();
+      xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
+        if (process->request.call != REQ_NO_REQ) {
+          XBT_DEBUG("Handling request %p", &process->request);
+          SIMIX_request_pre(&process->request, 0);
+        }
       }
-    } while (xbt_dynar_length(simix_global->process_to_run));
+    }
 
     time = surf_solve(SIMIX_timer_next());
 
@@ -224,6 +238,10 @@ void SIMIX_run(void)
 
   if (xbt_swag_size(simix_global->process_list) != 0) {
 
+#ifdef HAVE_TRACING
+    TRACE_end();
+#endif
+
     XBT_WARN("Oops ! Deadlock or code not perfectly clean.");
     SIMIX_display_process_status();
     xbt_abort();