X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3141b2111e49b104c2c6b59fe9e61146a688d38..b1b6cb61ca85e53ac6d90a9b2bdc7d031ebaa6b8:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index db89c27b1d..8ac134c418 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -142,11 +142,7 @@ typedef struct surf_model_public {
   void (*set_priority) (surf_action_t action, double priority); /**< Set the priority of an action */
   const char *name; /**< Name of this model */
 
-  /*for the properties of the link*/
-  xbt_dict_t (*get_link_properties) (void* link);
-
-  /*for the properties of the cpu*/
-  xbt_dict_t (*get_cpu_properties) (void* cpu);
+  xbt_dict_t (*get_properties) (void* link); /**< Return the properties dictionary */
 
 } s_surf_model_public_t, *surf_model_public_t;
 
@@ -206,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
@@ -549,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 */