X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9161dd12dbb9c069f5e100d30f56bf7b6f1362f5..20d5d4cbcb5580189461745935712009a7afbce5:/src/simix/smx_global.c

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index d736082cc5..ddf05b6a25 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -22,7 +22,7 @@ XBT_LOG_EXTERNAL_CATEGORY(simix_context);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
                                 "Logging specific to SIMIX (kernel)");
 
-SIMIX_Global_t simix_global = NULL;
+smx_global_t simix_global = NULL;
 static xbt_heap_t simix_timers = NULL;
 
 /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
@@ -63,7 +63,7 @@ void SIMIX_global_init(int *argc, char **argv)
     XBT_LOG_CONNECT(simix_synchro, simix);
     XBT_LOG_CONNECT(simix_context, simix);
 
-    simix_global = xbt_new0(s_SIMIX_Global_t, 1);
+    simix_global = xbt_new0(s_smx_global_t, 1);
 
     simix_global->host = xbt_dict_new();
     simix_global->process_to_run =
@@ -96,7 +96,7 @@ void SIMIX_global_init(int *argc, char **argv)
 
     /* Initialize the SIMIX network module */
     SIMIX_network_init();
-    
+
     /* Prepare to display some more info when dying on Ctrl-C pressing */
     signal(SIGINT, inthandler);
     surf_init(argc, argv);      /* Initialize SURF structures */
@@ -118,10 +118,10 @@ void SIMIX_clean(void)
 
   /* 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_swag_free(simix_global->process_to_run);
@@ -177,12 +177,12 @@ void SIMIX_run(void)
   smx_timer_t timer;
   surf_model_t model;
   unsigned int iter;
- 
+
   do {
     do {
       DEBUG0("New Schedule Round");
       SIMIX_context_runall(simix_global->process_to_run);
-      while((req = SIMIX_request_pop())){
+      while ((req = SIMIX_request_pop())) {
         DEBUG1("Handling request %p", req);
         SIMIX_request_pre(req);
       }
@@ -193,7 +193,7 @@ void SIMIX_run(void)
     /* Notify all the hosts that have failed */
     /* FIXME: iterate through the list of failed host and mark each of them */
     /* as failed. On each host, signal all the running processes with host_fail */
-    
+
     /* Handle any pending timer */
     while (xbt_heap_size(simix_timers) > 0 && SIMIX_get_clock() >= SIMIX_timer_next()) {
        //FIXME: make the timers being real callbacks
@@ -204,16 +204,16 @@ void SIMIX_run(void)
     }
     /* Wake up all process waiting for the action finish */
     xbt_dynar_foreach(model_list, iter, model) {
-      for(set = model->states.failed_action_set;
-          set;
-          set = (set == model->states.failed_action_set)
-                ? model->states.done_action_set
-                : NULL) {
+      for (set = model->states.failed_action_set;
+           set;
+           set = (set == model->states.failed_action_set)
+                 ? model->states.done_action_set
+                 : NULL) {
         while ((action = xbt_swag_extract(set)))
-          SIMIX_request_post((smx_action_t)action->data);
+          SIMIX_request_post((smx_action_t) action->data);
       }
     }
-  } while(time != -1.0);
+  } while (time != -1.0);
 
 }