updating the dtd and some memory leacks

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 5c7e5634cdc914d940c4b0ae4568788f6d8aa35d..8ac134c4187f54fa65b3021916bbc7d9b682197c 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -202,8 +202,8 @@ XBT_PUBLIC(void) surf_timer_model_init(const char *filename);
  *  \ingroup SURF_models
  */
 typedef enum {
-  SURF_CPU_ON = 1,             /**< Ready        */
-  SURF_CPU_OFF = 0             /**< Running      */
+  SURF_CPU_ON = 1,             /**< Up & ready        */
+  SURF_CPU_OFF = 0             /**< Down & broken     */
 } e_surf_cpu_state_t;
 
 /** \brief CPU model extension public
@@ -545,11 +545,10 @@ XBT_PUBLIC(double)surf_get_clock(void);
 XBT_PUBLIC(void) surf_exit(void);
 
 /* Prototypes of the functions that handle the properties */
+XBT_PUBLIC_DATA(xbt_dict_t) current_property_set; /* the prop set for the currently parsed element (also used in SIMIX) */
 void parse_properties(void);
 void free_string(void*);
 
-XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function);
-
 SG_END_DECL()
 
 #endif                         /* _SURF_SURF_H */