/** @Brief Specify that we use that action */
XBT_PUBLIC(void) surf_action_ref(surf_action_t action);
+
/** @brief Creates a new action.
*
* @param size The size is the one of the subtype you want to create
double cost; /**< cost */
double priority; /**< priority (1.0 by default) */
double max_duration; /**< max_duration (may fluctuate until
- the task is completed) */
+ the task is completed) */
double remains; /**< How much of that cost remains to
- * be done in the currently running task */
+ * be done in the currently running task */
#ifdef HAVE_LATENCY_BOUND_TRACKING
int latency_limited; /**< Set to 1 if is limited by latency, 0 otherwise */
#endif
double start; /**< start time */
double finish; /**< finish time : this is modified during the run
- * and fluctuates until the task is completed */
+ * and fluctuates until the task is completed */
void *data; /**< for your convenience */
int refcount;
surf_model_t model_type;
s_xbt_swag_hookup_t action_list_hookup;
int index_heap;
double last_update;
+ double last_value;
enum heap_action_type hat;
} s_surf_action_lmm_t, *surf_action_lmm_t;
/***************************/
/* Generic model object */
/***************************/
-typedef struct s_routing_global s_routing_global_t, *routing_global_t;
-XBT_PUBLIC_DATA(routing_global_t) global_routing;
+typedef struct s_routing_platf s_routing_platf_t, *routing_platf_t;
+XBT_PUBLIC_DATA(routing_platf_t) routing_platf;
/** \ingroup SURF_models
void (*add_traces) (void);
} s_surf_model_extension_cpu_t;
-typedef struct s_network_element_info *network_element_t;
-
/* Network model */
/** \ingroup SURF_models
* Public functions specific to the network model
*/
typedef struct surf_network_model_extension_public {
- surf_action_t (*communicate) (network_element_t src,
- network_element_t dst,
+ surf_action_t (*communicate) (sg_routing_edge_t src,
+ sg_routing_edge_t dst,
double size, double rate);
xbt_dynar_t(*get_route) (void *src, void *dst); //FIXME: kill field? That is done by the routing nowadays
double (*get_link_bandwidth) (const void *link);
*/
typedef struct surf_storage_model_extension_public {
- surf_action_t(*open) (void *storage, const char* path, const char* mode);
+ surf_action_t(*open) (void *storage, const char* mount, const char* path, const char* mode);
surf_action_t(*close) (void *storage, surf_file_t fp);
- surf_action_t(*read) (void *storage, void* ptr, size_t size, size_t nmemb, surf_file_t stream);
+ surf_action_t(*read) (void *storage, void* ptr, double size, size_t nmemb, surf_file_t stream);
surf_action_t(*write) (void *storage, const void* ptr, size_t size, size_t nmemb, surf_file_t stream);
surf_action_t(*stat) (void *storage, surf_file_t stream);
- void* (*create_resource) (const char* id, const char* model,const char* type_id);
+ surf_action_t(*unlink) (void *storage, surf_file_t stream);
+ void* (*create_resource) (const char* id, const char* model, const char* type_id, const char *content);
} s_surf_model_extension_storage_t;
/** \ingroup SURF_models
*/
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 */
+ and create the corresponding action */
surf_action_t(*sleep) (void *workstation, double duration); /**< Make a workstation sleep during a given duration */
e_surf_resource_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 */
void **workstation_list,
double *computation_amount,
double *communication_amount,
- double amount, double rate);
+ double rate);
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 */
surf_action_t(*open) (void *workstation, const char* storage, const char* path, const char* mode);
- surf_action_t(*close) (void *workstation, const char* storage, surf_file_t fp);
- surf_action_t(*read) (void *workstation, const char* storage, void* ptr, size_t size, size_t nmemb, surf_file_t stream);
- surf_action_t(*write) (void *workstation, const char* storage, const void* ptr, size_t size, size_t nmemb, surf_file_t stream);
- surf_action_t(*stat) (void *workstation, const char* storage, surf_file_t stream);
+ surf_action_t(*close) (void *workstation, surf_file_t fp);
+ surf_action_t(*read) (void *workstation, void* ptr, size_t size, size_t nmemb, surf_file_t stream);
+ surf_action_t(*write) (void *workstation, const void* ptr, size_t size, size_t nmemb, surf_file_t stream);
+ surf_action_t(*stat) (void *workstation, surf_file_t stream);
+ surf_action_t(*unlink) (void *workstation, surf_file_t stream);
int (*link_shared) (const void *link);
xbt_dict_t(*get_properties) (const void *resource);
void* (*link_create_resource) (const char *name,
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 */
- int (*action_unref) (surf_action_t action); /**< Specify that we don't use that action anymore */
+ int (*action_unref) (surf_action_t action); /**< Specify that we don't use that action anymore. Returns true if the action was destroyed and false if someone still has references on it. */
void (*action_cancel) (surf_action_t action); /**< Cancel a running action */
void (*action_recycle) (surf_action_t action); /**< Recycle an action */
void (*action_data_set) (surf_action_t action, void *data); /**< Set the user data of an action */
int (*get_latency_limited) (surf_action_t action); /**< Return 1 if action is limited by latency, 0 otherwise */
#endif
+ void (*gap_remove) (surf_action_lmm_t action);
+
surf_model_private_t model_private;
union extension {
void surf_model_exit(surf_model_t model);
static inline void *surf_cpu_resource_by_name(const char *name) {
- return xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL);
+ return xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL);
}
static inline void *surf_workstation_resource_by_name(const char *name){
- return xbt_lib_get_or_null(host_lib, name, SURF_WKS_LEVEL);
-}
-static inline void *surf_network_resource_by_name(const char *name){
- network_element_t net_elm = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
- if(!net_elm) net_elm = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
- return net_elm;
+ return xbt_lib_get_or_null(host_lib, name, SURF_WKS_LEVEL);
}
static inline void *surf_storage_resource_by_name(const char *name){
return xbt_lib_get_or_null(storage_lib, name, SURF_STORAGE_LEVEL);
XBT_PUBLIC_DATA(s_surf_model_description_t)
surf_network_model_description[];
-
-
-
-
-
/** \ingroup SURF_models
* \brief The storage model
*/
*/
XBT_PUBLIC_DATA(s_surf_model_description_t) surf_storage_model_description[];
-
-
-
-
-
-
/** \ingroup SURF_models
* \brief The workstation model
*
XBT_PUBLIC(double) get_cpu_power(const char *power);
+XBT_PUBLIC(xbt_dict_t) get_as_router_properties(const char* name);
+
int surf_get_nthreads(void);
void surf_set_nthreads(int nthreads);
+void surf_watched_hosts(void);
+
SG_END_DECL()
#endif /* _SURF_SURF_H */
