Oooups !

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index c4fbe62..3e0c099 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -57,10 +57,9 @@ typedef struct surf_resource_public {
   s_surf_action_state_t states; /* Any living action on this resource */
   void *(*name_service)(const char *name);
   const char *(*get_resource_name)(void *resource_id);
-  int (*resource_used)(void *resource_id);
 
   e_surf_action_state_t (*action_get_state)(surf_action_t action);
-  void (*action_free)(surf_action_t * action);
+  void (*action_free)(surf_action_t action);
   void (*action_cancel)(surf_action_t action);
   void (*action_recycle)(surf_action_t action);        
   void (*action_change_state)(surf_action_t action,
@@ -82,7 +81,7 @@ typedef struct surf_resource_object {
 /* Cpu resource */
 typedef enum {
   SURF_CPU_ON = 1,             /* Ready        */
-  SURF_CPU_OFF = 0,            /* Running      */
+  SURF_CPU_OFF = 0             /* Running      */
 } e_surf_cpu_state_t;
 
 typedef struct surf_cpu_resource_extension_private *surf_cpu_resource_extension_private_t;
@@ -122,10 +121,11 @@ void surf_network_resource_init(const char *filename);
 /*** SURF Globals **************************/
 /*******************************************/
 
-void surf_init(void);          /* initialize common structures */
+void surf_init(int *argc, char **argv);        /* initialize common structures */
 xbt_heap_float_t surf_solve(void);     /*  update all states and returns
                                           the time elapsed since last
                                           event */
 xbt_heap_float_t surf_get_clock(void);
+void surf_finalize(void);              /* clean everything */
 
 #endif                         /* _SURF_SURF_H */