Kill old $Id$ command dating from CVS

[simgrid.git] / src / gras / Virtu / sg_process.c

diff --git a/src/gras/Virtu/sg_process.c b/src/gras/Virtu/sg_process.c
index 1ecbf3e..df308e2 100644 (file)
--- a/src/gras/Virtu/sg_process.c
+++ b/src/gras/Virtu/sg_process.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* process_sg - GRAS process handling on simulator                          */
 
 /* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved.            */
@@ -179,7 +177,7 @@ const char *xbt_procname(void)
     As a hack we check for maestro by looking to the assigned host, if it is
     NULL then we are sure is maestro
   */
-  if (process != NULL && SIMIX_host_self())
+  if (process != NULL && SIMIX_process_get_host(process))
     return SIMIX_process_get_name(process);
 
   return "";
@@ -243,32 +241,13 @@ void gras_function_register(const char *name, xbt_main_func_t code)
 
 void gras_main()
 {
-  smx_action_t 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);
   SIMIX_init();
 
-  while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
-    while ((action = xbt_fifo_pop(actions_failed))) {
-      DEBUG1("** %s failed **", SIMIX_action_get_name(action));
-      SIMIX_action_signal_all (action);
-      /* action finished, destroy it */
-      //        SIMIX_action_destroy(action);
-    }
-
-    while ((action = xbt_fifo_pop(actions_done))) {
-      DEBUG1("** %s done **", SIMIX_action_get_name(action));
-      SIMIX_action_signal_all (action);
-      /* action finished, destroy it */
-      //SIMIX_action_destroy(action);
-    }
-  }
-  xbt_fifo_free(actions_failed);
-  xbt_fifo_free(actions_done);
+  while (SIMIX_solve(NULL, NULL) != -1.0);
+  
   return;
 }