typedef struct surf_model_description {
const char *name;
surf_model_t model;
- void (*model_init) (const char *filename);
- void (*create_ws) (void);
+ void (*model_init_preparse) (const char *filename);
+ void (*model_init_postparse) (void);
} s_surf_model_description_t, *surf_model_description_t;
XBT_PUBLIC(void) update_model_description(s_surf_model_description_t * table,
/* Generic model object */
/***************************/
-/** \brief Public data available on all models
- * \ingroup SURF_models
- *
- * These functions are implemented by all models.
- */
- 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 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 */
- double (*action_get_finish_time) (surf_action_t action);
- /**< Return the finish time of an action */
- void (*action_use) (surf_action_t action);
- /**< Set an action used */
- int (*action_free) (surf_action_t action);
- /**< Free an action */
- void (*action_cancel) (surf_action_t action);
- /**< Cancel a running action */
- void (*action_recycle) (surf_action_t action);
- /**< Recycle an action */
- void (*action_change_state) (surf_action_t action,
- /**< Change an action state*/
- e_surf_action_state_t state);
- void (*action_set_data) (surf_action_t action, void *data);
- /**< Set the user data of an action */
- void (*suspend) (surf_action_t action);
- /**< Suspend an action */
- void (*resume) (surf_action_t action);
- /**< Resume a suspended action */
- int (*is_suspended) (surf_action_t action);
- /**< Return whether an action is suspended */
- 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 */
- xbt_dict_t(*get_properties) (void *resource_id);
- /**< Return the properties dictionary */
- const char *name;
- /**< Name of this model */
- } s_surf_model_public_t, *surf_model_public_t;
-
/** \brief Private data available on all models
* \ingroup SURF_models
*/
typedef struct surf_model_private *surf_model_private_t;
+ /** \brief Timer model extension public
+ * \ingroup SURF_model
+ *
+ * Additionnal functions specific to the timer model
+ */
+ typedef struct surf_timer_model_extension_public {
+ void (*set) (double date, void *function, void *arg);
+ int (*get) (void **function, void **arg);
+ } s_surf_model_extension_timer_t;
+
+ /* Cpu model */
+
+ /** \brief CPU state
+ * \ingroup SURF_models
+ */
+ typedef enum {
+ SURF_CPU_ON = 1, /**< Up & ready */
+ SURF_CPU_OFF = 0 /**< Down & broken */
+ } e_surf_cpu_state_t;
+
+ /** \brief CPU model extension public
+ * \ingroup SURF_models
+ *
+ * Public functions specific to the CPU model.
+ */
+ typedef struct surf_cpu_model_extension_public {
+ surf_action_t(*execute) (void *cpu, double size);
+ surf_action_t(*sleep) (void *cpu, double duration);
+ e_surf_cpu_state_t(*get_state) (void *cpu);
+ double (*get_speed) (void *cpu, double load);
+ double (*get_available_speed) (void *cpu);
+ } s_surf_model_extension_cpu_t;
+
+ /* Network model */
+
+ /** \brief Network model extension public
+ * \ingroup SURF_models
+ *
+ * Public functions specific to the network model
+ */
+ typedef struct surf_network_model_extension_public {
+ surf_action_t(*communicate) (void *src, void *dst, double size,
+ double max_rate);
+ const void **(*get_route) (void *src, void *dst);
+ int (*get_route_size) (void *src, void *dst);
+ double (*get_link_bandwidth) (const void *link);
+ double (*get_link_latency) (const void *link);
+ int (*link_shared) (const void *link);
+ } s_surf_model_extension_network_t;
+
+ /** \brief Workstation model extension public
+ * \ingroup SURF_models
+ *
+ * Public functions specific to the workstation model.
+ */
+ typedef struct surf_workstation_model_extension_public {
+ surf_action_t(*execute) (void *workstation, double size); /**< Execute a computation amount on a workstation
+ and create the corresponding action */
+ surf_action_t(*sleep) (void *workstation, double duration); /**< Make a workstation sleep during a given duration */
+ e_surf_cpu_state_t(*get_state) (void *workstation); /**< Return the CPU state of a workstation */
+ double (*get_speed) (void *workstation, double load); /**< Return the speed of a workstation */
+ double (*get_available_speed) (void *workstation); /**< Return tha available speed of a workstation */
+ 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,
+ double *communication_amount,
+ double amount, double rate);
+ const void **(*get_route) (void *src, void *dst); /**< Return the network link list between two workstations */
+ int (*get_route_size) (void *src, void *dst); /**< Return the route size between two workstations */
+ double (*get_link_bandwidth) (const void *link); /**< Return the current bandwidth of a network link */
+ double (*get_link_latency) (const void *link); /**< Return the current latency of a network link */
+ int (*link_shared) (const void *link);
+ } s_surf_model_extension_workstation_t;
+
/** \brief Model datatype
* \ingroup SURF_models
*
* the CPUs and the network links are examples of models.
*/
typedef struct surf_model {
- surf_model_private_t common_private;
- surf_model_public_t common_public;
+ const char *name;/**< Name of this model */
+ s_surf_action_state_t states; /**< Any living action on this model */
+
+ 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 */
+ double (*action_get_finish_time) (surf_action_t action);/**< Return the finish time of an action */
+ void (*action_use) (surf_action_t action);/**< Set an action used */
+ int (*action_free) (surf_action_t action);/**< Free an action */
+ void (*action_cancel) (surf_action_t action);/**< Cancel a running action */
+ void (*action_recycle) (surf_action_t action);/**< Recycle an action */
+ void (*action_change_state) (surf_action_t action,
+ e_surf_action_state_t state);
+ /**< Change an action state*/
+ void (*action_set_data) (surf_action_t action, void *data);/**< Set the user data of an action */
+ void (*suspend) (surf_action_t action);/**< Suspend an action */
+ void (*resume) (surf_action_t action);/**< Resume a suspended action */
+ int (*is_suspended) (surf_action_t action);/**< Return whether an action is suspended */
+ 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 */
+ xbt_dict_t(*get_properties) (void *resource_id);/**< Return the properties dictionary */
+ xbt_dict_t resource_set;
+
+
+
+ surf_model_private_t model_private;
+
+
+
+ union extension {
+ s_surf_model_extension_timer_t timer;
+ s_surf_model_extension_cpu_t cpu;
+ s_surf_model_extension_network_t network;
+ s_surf_model_extension_workstation_t workstation;
+ } extension;
} s_surf_model_t;
+ surf_model_t surf_model_init(void);
+ void surf_model_exit(surf_model_t model);
+
+ void *surf_model_resource_by_name(surf_model_t model, const char *name);
+#define surf_model_resource_set(model) (model)->resource_set
+
+ typedef struct surf_resource {
+ surf_model_t model;
+ char *name;
+ } s_surf_resource_t, *surf_resource_t;
+
+XBT_PUBLIC(const char*) surf_resource_name(const void *resource);
+XBT_PUBLIC(void) surf_resource_free(void* resource);
/**************************************/
/* Implementations of model object */
/**************************************/
-/** \brief Timer model extension public
- * \ingroup SURF_model
- *
- * Additionnal functions specific to the timer model
- */
- typedef struct surf_timer_model_extension_public {
- void (*set) (double date, void *function, void *arg);
- int (*get) (void **function, void **arg);
- } s_surf_timer_model_extension_public_t,
- *surf_timer_model_extension_public_t;
-
-/** \brief Timer model
- * \ingroup SURF_models
- */
- typedef struct surf_timer_model {
- surf_model_private_t common_private;
- surf_model_public_t common_public;
- surf_timer_model_extension_public_t extension_public;
- } s_surf_timer_model_t, *surf_timer_model_t;
/** \brief The timer model
* \ingroup SURF_models
*/
-XBT_PUBLIC_DATA(surf_timer_model_t) surf_timer_model;
+XBT_PUBLIC_DATA(surf_model_t) surf_timer_model;
/** \brief Initializes the timer model
* \ingroup SURF_models
*/
XBT_PUBLIC(void) surf_timer_model_init(const char *filename);
-/* Cpu model */
-
-/** \brief CPU state
- * \ingroup SURF_models
- */
- typedef enum {
- SURF_CPU_ON = 1, /**< Up & ready */
- SURF_CPU_OFF = 0 /**< Down & broken */
- } e_surf_cpu_state_t;
-
-/** \brief CPU model extension public
- * \ingroup SURF_models
- *
- * Public functions specific to the CPU model.
- */
- typedef struct surf_cpu_model_extension_public {
- surf_action_t(*execute) (void *cpu, double size);
- surf_action_t(*sleep) (void *cpu, double duration);
- e_surf_cpu_state_t(*get_state) (void *cpu);
- double (*get_speed) (void *cpu, double load);
- double (*get_available_speed) (void *cpu);
- } s_surf_cpu_model_extension_public_t,
- *surf_cpu_model_extension_public_t;
-
-/** \brief CPU model datatype
- * \ingroup SURF_models
- */
- typedef struct surf_cpu_model {
- surf_model_private_t common_private;
- surf_model_public_t common_public;
- surf_cpu_model_extension_public_t extension_public;
- } s_surf_cpu_model_t, *surf_cpu_model_t;
-
/** \brief The CPU model
* \ingroup SURF_models
*/
-XBT_PUBLIC_DATA(surf_cpu_model_t) surf_cpu_model;
+XBT_PUBLIC_DATA(surf_model_t) surf_cpu_model;
/** \brief Initializes the CPU model with the model Cas01
* \ingroup SURF_models
*/
XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[];
-/* Network model */
-
-/** \brief Network model extension public
- * \ingroup SURF_models
- *
- * Public functions specific to the network model
- */
- typedef struct surf_network_model_extension_public {
- surf_action_t(*communicate) (void *src, void *dst, double size,
- double max_rate);
- const void **(*get_route) (void *src, void *dst);
- int (*get_route_size) (void *src, void *dst);
- const char *(*get_link_name) (const void *link);
- double (*get_link_bandwidth) (const void *link);
- double (*get_link_latency) (const void *link);
- int (*link_shared) (const void *link);
- } s_surf_network_model_extension_public_t,
- *surf_network_model_extension_public_t;
-
-/** \brief Network model datatype
- * \ingroup SURF_models
- */
- typedef struct surf_network_model {
- surf_model_private_t common_private;
- surf_model_public_t common_public;
- surf_network_model_extension_public_t extension_public;
- } s_surf_network_model_t, *surf_network_model_t;
-
XBT_PUBLIC(void) create_workstations(void);
/** \brief The network model
* model should be accessed because depending on the platform model,
* the network model can be NULL.
*/
-XBT_PUBLIC_DATA(surf_network_model_t) surf_network_model;
+XBT_PUBLIC_DATA(surf_model_t) surf_network_model;
/** \brief Initializes the platform with the network model 'LagrangeVelho'
* \ingroup SURF_models
*/
XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[];
-/** \brief Workstation model extension public
- * \ingroup SURF_models
- *
- * Public functions specific to the workstation model.
- */
- typedef struct surf_workstation_model_extension_public {
- surf_action_t(*execute) (void *workstation, double size); /**< Execute a computation amount on a workstation
- and create the corresponding action */
- surf_action_t(*sleep) (void *workstation, double duration); /**< Make a workstation sleep during a given duration */
- e_surf_cpu_state_t(*get_state) (void *workstation); /**< Return the CPU state of a workstation */
- double (*get_speed) (void *workstation, double load); /**< Return the speed of a workstation */
- double (*get_available_speed) (void *workstation); /**< Return tha available speed of a workstation */
- 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,
- double *communication_amount,
- double amount, double rate);
- const void **(*get_route) (void *src, void *dst); /**< Return the network link list between two workstations */
- int (*get_route_size) (void *src, void *dst); /**< Return the route size between two workstations */
- const char *(*get_link_name) (const void *link); /**< Return the name of a network link */
- double (*get_link_bandwidth) (const void *link); /**< Return the current bandwidth of a network link */
- double (*get_link_latency) (const void *link); /**< Return the current latency of a network link */
- int (*link_shared) (const void *link);
- } s_surf_workstation_model_extension_public_t,
- *surf_workstation_model_extension_public_t;
-
-/** \brief Workstation model datatype.
- * \ingroup SURF_models
- *
- */
- typedef struct surf_workstation_model {
- surf_model_private_t common_private;
- surf_model_public_t common_public;
- surf_workstation_model_extension_public_t extension_public;
- } s_surf_workstation_model_t, *surf_workstation_model_t;
/** \brief The workstation model
* \ingroup SURF_models
* because depending on the platform model, the network model and the CPU model
* may not exist.
*/
-XBT_PUBLIC_DATA(surf_workstation_model_t) surf_workstation_model;
+XBT_PUBLIC_DATA(surf_model_t) surf_workstation_model;
/** \brief Initializes the platform with a compound workstation model
* \ingroup SURF_models
*
* \see link_set
*/
-XBT_PUBLIC_DATA(xbt_dict_t) workstation_set;
-XBT_PUBLIC_DATA(xbt_dict_t) cpu_set;
/** \brief List of initialized models
* \ingroup SURF_models
*/
/*******************************************/
/*** SURF Globals **************************/
/*******************************************/
-xbt_cfg_t _surf_cfg_set;
+XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set;
/** \brief Initialize SURF
* \ingroup SURF_simulation
