X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9070feda0eec90cf10d562ece376fcd6a777ff7c..ab18a775a1f75bc5899cab352f64334fee259216:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 6690309406..262c7f1dfd 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -24,6 +24,7 @@ typedef enum { SURF_ACTION_RUNNING, /* Running */ SURF_ACTION_FAILED, /* Task Failure */ SURF_ACTION_DONE, /* Completed */ + SURF_ACTION_TO_FREE, /* Action to free in next cleanup */ SURF_ACTION_NOT_IN_THE_SYSTEM /* Not in the system anymore. Why did you ask ? */ } e_surf_action_state_t; @@ -40,6 +41,7 @@ typedef struct surf_action { s_xbt_swag_hookup_t state_hookup; xbt_swag_t state_set; double cost; /* cost */ + double priority; /* priority (1.0 by default) */ double max_duration; /* max_duration (may fluctuate until the task is completed) */ double remains; /* How much of that cost remains to @@ -48,6 +50,7 @@ typedef struct surf_action { double finish; /* finish time : this is modified during the run * and fluctuates until the task is completed */ void *data; /* for your convenience */ + int using; surf_resource_t resource_type; } s_surf_action_t; @@ -61,17 +64,19 @@ typedef struct surf_resource_public { void *(*name_service) (const char *name); const char *(*get_resource_name) (void *resource_id); - e_surf_action_state_t(*action_get_state) (surf_action_t action); - void (*action_free) (surf_action_t action); + e_surf_action_state_t(*action_get_state) (surf_action_t action); + void (*action_use) (surf_action_t action); + int (*action_free) (surf_action_t action); void (*action_cancel) (surf_action_t action); void (*action_recycle) (surf_action_t action); void (*action_change_state) (surf_action_t action, e_surf_action_state_t state); - void (*action_set_data) (surf_action_t action, - void *data); + void (*action_set_data) (surf_action_t action, void *data); void (*suspend) (surf_action_t action); void (*resume) (surf_action_t action); int (*is_suspended) (surf_action_t action); + void (*set_max_duration) (surf_action_t action, double duration); + void (*set_priority) (surf_action_t action, double priority); const char *name; } s_surf_resource_public_t, *surf_resource_public_t; @@ -80,25 +85,36 @@ typedef struct surf_resource { surf_resource_public_t common_public; } s_surf_resource_t; -typedef struct surf_resource_object { - surf_resource_t resource; -} s_surf_resource_object_t, *surf_resource_object_t; - /**************************************/ /* Implementations of resource object */ /**************************************/ +/* Timer resource */ +typedef struct surf_timer_resource_extension_public { + void (*set) (double date, void *function, void *arg); + int (*get) (void **function, void **arg); +} s_surf_timer_resource_extension_public_t, + *surf_timer_resource_extension_public_t; + +typedef struct surf_timer_resource { + surf_resource_private_t common_private; + surf_resource_public_t common_public; + surf_timer_resource_extension_public_t extension_public; +} s_surf_timer_resource_t, *surf_timer_resource_t; +extern surf_timer_resource_t surf_timer_resource; +void surf_timer_resource_init(const char *filename); + /* Cpu resource */ typedef enum { SURF_CPU_ON = 1, /* Ready */ SURF_CPU_OFF = 0 /* Running */ } e_surf_cpu_state_t; -typedef struct surf_cpu_resource_extension_private -*surf_cpu_resource_extension_private_t; typedef struct surf_cpu_resource_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); + 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_resource_extension_public_t, *surf_cpu_resource_extension_public_t; @@ -111,11 +127,10 @@ extern surf_cpu_resource_t surf_cpu_resource; void surf_cpu_resource_init_Cas01(const char *filename); /* Network resource */ -typedef struct surf_network_resource_extension_private -*surf_network_resource_extension_private_t; typedef struct surf_network_resource_extension_public { - surf_action_t(*communicate) (void *src, void *dst, double size, + surf_action_t(*communicate) (void *src, void *dst, double size, double max_rate); + void** (*get_route) (void *src, void *dst); } s_surf_network_resource_extension_public_t, *surf_network_resource_extension_public_t; @@ -127,17 +142,25 @@ typedef struct surf_network_resource { extern surf_network_resource_t surf_network_resource; void surf_network_resource_init_CM02(const char *filename); +extern xbt_dict_t network_link_set; /* Workstation resource */ -typedef struct surf_workstation_resource_extension_private -*surf_workstation_resource_extension_private_t; typedef struct surf_workstation_resource_extension_public { surf_action_t(*execute) (void *workstation, double size); surf_action_t(*sleep) (void *workstation, double duration); e_surf_cpu_state_t(*get_state) (void *workstation); + double (*get_speed) (void *workstation, double load); + double (*get_available_speed) (void *workstation); surf_action_t(*communicate) (void *workstation_src, - void *workstation_dst, double size, + void *workstation_dst, double size, double max_rate); + surf_action_t(*execute_parallel_task) (int workstation_nb, + void **workstation_list, + double *computation_amount, + double *communication_amount, + double amount, + double rate); + void** (*get_route) (void *src, void *dst); } s_surf_workstation_resource_extension_public_t, *surf_workstation_resource_extension_public_t; @@ -164,6 +187,6 @@ double surf_solve(void); /* update all states and returns the time elapsed since last event */ double surf_get_clock(void); -void surf_finalize(void); /* clean everything */ +void surf_exit(void); /* clean everything */ #endif /* _SURF_SURF_H */