#include "xbt/dynar.h"
#include "xbt/dict.h"
#include "xbt/misc.h"
-#include "gras_config.h"
+#include "portable.h"
SG_BEGIN_DECL()
typedef struct surf_model_public {
s_surf_action_state_t states; /**< Any living action on this model */
void *(*name_service) (const char *name); /**< Return a model given its name */
- const char *(*get_resource_name) (void *resource_id); /**< Return the name of a model */
+ const char *(*get_resource_name) (void *resource_id); /**< Return the name of a resource */
e_surf_action_state_t(*action_get_state) (surf_action_t action); /**< Return the state of an action */
double (*action_get_start_time) (surf_action_t action); /**< Return the start time of an action */
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
* \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
*/
XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename);
-extern XBT_PUBLIC_DATA(int) surf_cpu_model_description_size;
+XBT_PUBLIC_DATA(int) surf_cpu_model_description_size;
/** \brief The list of all available cpu model models
* \ingroup SURF_models
*/
-extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[];
/* Network model */
-extern XBT_PUBLIC_DATA(int) surf_network_model_description_size;
+XBT_PUBLIC_DATA(int) surf_network_model_description_size;
/** \brief The list of all available network model models
* \ingroup SURF_models
*/
-extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[];
/** \brief Workstation model extension public
* \ingroup SURF_models
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,
*/
XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char *filename);
-extern XBT_PUBLIC_DATA(int) surf_workstation_model_description_size;
+XBT_PUBLIC_DATA(int) surf_workstation_model_description_size;
/** \brief The list of all available workstation model models
* \ingroup SURF_models
*/
-extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[];
/** \brief The network links
* \ingroup SURF_models
*
* \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;
*/
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*);
SG_END_DECL()