Fix supernovae mode.

[simgrid.git] / src / surf / surf_model_timer.c

diff --git a/src/surf/surf_model_timer.c b/src/surf/surf_model_timer.c
index d0d77cd..4cf18e1 100644 (file)
--- a/src/surf/surf_model_timer.c
+++ b/src/surf/surf_model_timer.c
@@ -1,6 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2005 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -40,7 +39,8 @@ static command_t command_new(void *fun, void *args)
   command->args = args;
   xbt_swag_insert(command, command_pending);
   command->action =
-    surf_action_new(sizeof(s_surf_action_timer_t), 0, surf_timer_model, 0);
+      surf_action_new(sizeof(s_surf_action_timer_t), 0, surf_timer_model,
+                      0);
   return command;
 }
 
@@ -155,7 +155,7 @@ static int action_is_suspended(surf_action_t action)
   return 0;
 }
 
-static void finalize(void)
+static void timer_finalize(void)
 {
   xbt_heap_free(timer_heap);
   timer_heap = NULL;
@@ -180,10 +180,10 @@ static void surf_timer_model_init_internal(void)
   surf_timer_model->model_private->resource_used = resource_used;
   surf_timer_model->model_private->share_resources = share_resources;
   surf_timer_model->model_private->update_actions_state =
-    update_actions_state;
+      update_actions_state;
   surf_timer_model->model_private->update_resource_state =
-    update_resource_state;
-  surf_timer_model->model_private->finalize = finalize;
+      update_resource_state;
+  surf_timer_model->model_private->finalize = timer_finalize;
 
   surf_timer_model->suspend = action_suspend;
   surf_timer_model->resume = action_resume;
@@ -194,8 +194,10 @@ static void surf_timer_model_init_internal(void)
 
   {
     s_command_t var;
-    command_pending = xbt_swag_new(xbt_swag_offset(var, command_set_hookup));
-    command_to_run = xbt_swag_new(xbt_swag_offset(var, command_set_hookup));
+    command_pending =
+        xbt_swag_new(xbt_swag_offset(var, command_set_hookup));
+    command_to_run =
+        xbt_swag_new(xbt_swag_offset(var, command_set_hookup));
   }
 
   empty_trace = tmgr_empty_trace_new();