X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccf56140eb0b973a50ce9a981fa3e38667748495..67ae3ecf4e045a2410b261b597cdc953d50d53fa:/src/include/surf/surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 4b698aad8b..b6db621674 100644
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -141,6 +141,9 @@ typedef struct surf_model_public {
   void (*set_max_duration) (surf_action_t action, double duration); /**< Set the max duration of an action*/
   void (*set_priority) (surf_action_t action, double priority); /**< Set the priority of an action */
   const char *name; /**< Name of this model */
+
+  xbt_dict_t (*get_properties) (void* link); /**< Return the properties dictionary */
+
 } s_surf_model_public_t, *surf_model_public_t;
 
 /** \brief Private data available on all models
@@ -199,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
@@ -381,6 +384,7 @@ typedef struct surf_workstation_model_extension_public {
   surf_action_t(*communicate) (void *workstation_src,                  /**< Execute a communication amount between two workstations */
 			       void *workstation_dst, double size,
 			       double max_rate);
+
   surf_action_t(*execute_parallel_task) (int workstation_nb,           /**< Execute a parallel task on several workstations */
 					 void **workstation_list,
 					 double *computation_amount,
@@ -476,14 +480,14 @@ XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[]
  *
  *  \see workstation_set
  */
-XBT_PUBLIC_DATA(xbt_dict_t) network_link_set;
+XBT_PUBLIC_DATA(xbt_dict_t) link_set;
 
 /** \brief The workstations
  *  \ingroup SURF_models
  *
  *  This dict contains all workstations.
  *
- *  \see network_link_set
+ *  \see link_set
  */
 XBT_PUBLIC_DATA(xbt_dict_t)  workstation_set;
 
@@ -540,6 +544,12 @@ 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()