From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 6 Aug 2007 14:23:37 +0000 (+0000)
Subject: cosmetics
X-Git-Tag: v3.3~1371
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/78f7b6b11f281beb6250137ee404a94ec4cf7f77?hp=c394d513c7c5cc4348ff885de7161f03da7a6f11

cosmetics


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3989 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index 7c25905ae7..3a212730b0 100644
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -174,48 +174,45 @@ void gras_create_environment(const char *file) {
 void gras_function_register(const char *name, xbt_main_func_t code) {
    return SIMIX_function_register(name, code);
 }
-void gras_main() {
-   smx_cond_t cond = NULL;
-   smx_action_t smx_action;
-   xbt_fifo_t actions_done = xbt_fifo_new();
-   xbt_fifo_t actions_failed = xbt_fifo_new();
-   
 
-   /* Clean IO before the run */
-   fflush(stdout);
-   fflush(stderr);
-   
+void gras_main() {
+  smx_cond_t cond = NULL;
+  smx_action_t action;
+  xbt_fifo_t actions_done = xbt_fifo_new();
+  xbt_fifo_t actions_failed = xbt_fifo_new();
    
-   while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
-
-      while ( (smx_action = xbt_fifo_pop(actions_failed)) ) {
-	 
-	 
-	 DEBUG1("** %s failed **",smx_action->name);
-	 while ( (cond = xbt_fifo_pop(smx_action->cond_list)) ) {
-	    SIMIX_cond_broadcast(cond);
-			}
-	 /* action finished, destroy it */
-	 //	SIMIX_action_destroy(smx_action);
+  /* Clean IO before the run */
+  fflush(stdout);
+  fflush(stderr);
+
+  while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
+    while ( (action = xbt_fifo_pop(actions_failed)) ) {
+      DEBUG1("** %s failed **",action->name);
+      while ( (cond = xbt_fifo_pop(action->cond_list)) ) {
+	SIMIX_cond_broadcast(cond);
       }
-      
-      while ( (smx_action = xbt_fifo_pop(actions_done)) ) {
-	 
-	 DEBUG1("** %s done **",smx_action->name);
-	 while ( (cond = xbt_fifo_pop(smx_action->cond_list)) ) {
-	    SIMIX_cond_broadcast(cond);
-	 }
-	 /* action finished, destroy it */
-	 //SIMIX_action_destroy(smx_action);
+      /* action finished, destroy it */
+      //	SIMIX_action_destroy(action);
+    }
+    
+    while ( (action = xbt_fifo_pop(actions_done)) ) {
+      DEBUG1("** %s done **",action->name);
+      while ( (cond = xbt_fifo_pop(action->cond_list)) ) {
+	SIMIX_cond_broadcast(cond);
       }
-   }
-   xbt_fifo_free(actions_failed);
-   xbt_fifo_free(actions_done);
-   return;   
+      /* action finished, destroy it */
+      //SIMIX_action_destroy(action);
+    }
+  }
+  xbt_fifo_free(actions_failed);
+  xbt_fifo_free(actions_done);
+  return;   
 }
+
 void gras_launch_application(const char *file) {
    return SIMIX_launch_application(file);
 }
+
 void gras_clean() {
    return SIMIX_clean();
 }
diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 4a2bb97975..b1e90f1f6d 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -67,8 +67,7 @@ static void parse_process_finalize(void)
 						 create_process_function,
 						 arg);
     else
-      surf_timer_resource->extension_public->set(start_time,
-						 (void *)
+      surf_timer_resource->extension_public->set(start_time, (void *)
 						 &SIMIX_process_create,
 						 arg);
 
@@ -93,8 +92,7 @@ static void parse_process_finalize(void)
 						   kill_process_function,
 						   arg);
       else
-	surf_timer_resource->extension_public->set(kill_time,
-						   (void *)
+	surf_timer_resource->extension_public->set(kill_time, (void *)
 						   &SIMIX_process_kill,
 						   (void *) process);
     }