X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab2a2facb2712c4f2eb91f9ab992dad388f78b74..a3ab1c4ed0a356487c9d46b810fcef4ef5ac6733:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 66e7041eec..0dfb43eb2b 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -10,6 +10,7 @@ #include "xbt/swag.h" #include "xbt/dynar.h" +#include "xbt/dict.h" /* Actions and resources are higly connected structures... */ typedef struct surf_action *surf_action_t; @@ -38,15 +39,15 @@ typedef struct surf_action_state { typedef struct surf_action { s_xbt_swag_hookup_t state_hookup; xbt_swag_t state_set; - xbt_maxmin_float_t cost; /* cost */ - xbt_maxmin_float_t max_duration; /* max_duration (may fluctuate until - the task is completed) */ - xbt_maxmin_float_t remains; /* How much of that cost remains to + double cost; /* cost */ + double max_duration; /* max_duration (may fluctuate until + the task is completed) */ + double remains; /* How much of that cost remains to * be done in the currently running task */ - xbt_heap_float_t start; /* start time */ - xbt_heap_float_t finish; /* finish time : this is modified during the run + double start; /* start time */ + double finish; /* finish time : this is modified during the run * and fluctuates until the task is completed */ - void *callback; /* for your convenience */ + void *data; /* for your convenience */ surf_resource_t resource_type; } s_surf_action_t; @@ -66,6 +67,10 @@ typedef struct surf_resource_public { 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 (*suspend) (surf_action_t action); + void (*resume) (surf_action_t action); + int (*is_suspended) (surf_action_t action); const char *name; } s_surf_resource_public_t, *surf_resource_public_t; @@ -74,13 +79,26 @@ 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_private +*surf_timer_resource_extension_private_t; +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 */ @@ -90,11 +108,9 @@ typedef enum { 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, xbt_maxmin_float_t size); - surf_action_t(*sleep) (void *cpu, xbt_maxmin_float_t duration); - void (*suspend) (surf_action_t action); - void (*resume) (surf_action_t action); - e_surf_cpu_state_t(*get_state) (void *cpu); + 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); } s_surf_cpu_resource_extension_public_t, *surf_cpu_resource_extension_public_t; @@ -104,14 +120,14 @@ typedef struct surf_cpu_resource { surf_cpu_resource_extension_public_t extension_public; } s_surf_cpu_resource_t, *surf_cpu_resource_t; extern surf_cpu_resource_t surf_cpu_resource; -void surf_cpu_resource_init(const char *filename); +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, - xbt_maxmin_float_t size); + surf_action_t(*communicate) (void *src, void *dst, double size, + double max_rate); } s_surf_network_resource_extension_public_t, *surf_network_resource_extension_public_t; @@ -122,20 +138,18 @@ typedef struct surf_network_resource { } s_surf_network_resource_t, *surf_network_resource_t; extern surf_network_resource_t surf_network_resource; -void surf_network_resource_init(const char *filename); +void surf_network_resource_init_CM02(const char *filename); /* 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, xbt_maxmin_float_t size); - surf_action_t(*sleep) (void *workstation, xbt_maxmin_float_t duration); - void (*suspend) (surf_action_t action); - void (*resume) (surf_action_t action); - e_surf_cpu_state_t(*get_state) (void *workstation); - surf_action_t(*communicate) (void *workstation_src, - void *workstation_dst, - xbt_maxmin_float_t size); + 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); + surf_action_t(*communicate) (void *workstation_src, + void *workstation_dst, double size, + double max_rate); } s_surf_workstation_resource_extension_public_t, *surf_workstation_resource_extension_public_t; @@ -146,7 +160,9 @@ typedef struct surf_workstation_resource { } s_surf_workstation_resource_t, *surf_workstation_resource_t; extern surf_workstation_resource_t surf_workstation_resource; -void surf_workstation_resource_init(const char *filename); +void surf_workstation_resource_init_CLM03(const char *filename); +void surf_workstation_resource_init_KCCFLN05(const char *filename); +extern xbt_dict_t workstation_set; /*******************************************/ /*** SURF Globals **************************/ @@ -156,10 +172,10 @@ void surf_init(int *argc, char **argv); /* initialize common structures */ extern xbt_dynar_t resource_list; /* list of initialized resources */ -xbt_heap_float_t surf_solve(void); /* update all states and returns - the time elapsed since last - event */ -xbt_heap_float_t surf_get_clock(void); +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 */ #endif /* _SURF_SURF_H */