X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ee3e6ba1b2e81efa3f9857ed0c8692e165f7131f..2489210b4ea8d03fbece8db288ef9e3ff6725723:/src/simdag/private.h diff --git a/src/simdag/private.h b/src/simdag/private.h index 243a9e0851..e48de288e1 100644 --- a/src/simdag/private.h +++ b/src/simdag/private.h @@ -13,25 +13,22 @@ #include "simdag/simdag.h" #include "simdag/datatypes.h" #include "surf/surf.h" - -#define SD_INITIALISED() (sd_global != NULL) -#define SD_CHECK_INIT_DONE() xbt_assert0(SD_INITIALISED(), "Call SD_init() first"); +#include "xbt/swag.h" +#include "xbt/mallocator.h" +#include /* Global variables */ typedef struct SD_global { - xbt_dict_t workstations; /* workstation dictionary */ - int workstation_count; /* number of workstations */ SD_workstation_t *workstation_list; /* array of workstations, created only if necessary in SD_workstation_get_list */ - - xbt_dict_t links; /* links */ - int link_count; /* number of links */ SD_link_t *link_list; /* array of links, created only if necessary in SD_link_get_list */ SD_link_t *recyclable_route; /* array returned by SD_route_get_list and mallocated only once */ + xbt_mallocator_t task_mallocator; /* to not remalloc new tasks */ + int watch_point_reached; /* has a task just reached a watch point? */ /* task state sets */ @@ -44,6 +41,7 @@ typedef struct SD_global { xbt_swag_t done_task_set; xbt_swag_t failed_task_set; + xbt_swag_t return_set; int task_number; } s_SD_global_t, *SD_global_t; @@ -58,37 +56,44 @@ typedef struct SD_link { } s_SD_link_t; /* Workstation */ +typedef s_xbt_dictelm_t s_SD_workstation_t; typedef struct SD_workstation { - void *surf_workstation; /* surf object */ void *data; /* user data */ e_SD_workstation_access_mode_t access_mode; xbt_fifo_t task_fifo; /* only used in sequential mode */ SD_task_t current_task; /* only used in sequential mode */ -} s_SD_workstation_t; +} s_SD_workstation_priv_t, *SD_workstation_priv_t; + +static inline SD_workstation_priv_t SD_workstation_priv(SD_workstation_t host){ + return xbt_lib_get_level(host, SD_HOST_LEVEL); +} /* Task */ typedef struct SD_task { s_xbt_swag_hookup_t state_hookup; + s_xbt_swag_hookup_t return_hookup; xbt_swag_t state_set; e_SD_task_state_t state; void *data; /* user data */ char *name; int kind; double amount; + double alpha; /* used by typed parallel tasks */ double remains; double start_time; double finish_time; surf_action_t surf_action; - unsigned short watch_points; /* bit field xor()ed with masks */ + unsigned short watch_points; /* bit field xor()ed with masks */ int fifo_checked; /* used by SD_task_just_done to make sure we evaluate the task only once */ + int marked; /* used to check if the task DAG has some cycle*/ /* dependencies */ xbt_dynar_t tasks_before; xbt_dynar_t tasks_after; - unsigned int unsatisfied_dependencies; + int unsatisfied_dependencies; unsigned int is_not_ready; /* scheduling parameters (only exist in state SD_SCHEDULED) */ @@ -97,6 +102,11 @@ typedef struct SD_task { double *computation_amount; double *communication_amount; double rate; + +#ifdef HAVE_TRACING + long long int counter; /* task unique identifier for instrumentation */ + char *category; /* sd task category for instrumentation */ +#endif } s_SD_task_t; /* Task dependencies */ @@ -109,11 +119,14 @@ typedef struct SD_dependency { } s_SD_dependency_t, *SD_dependency_t; /* SimDag private functions */ +XBT_PUBLIC(xbt_swag_t) SD_simulate_swag(double how_long); /* could be public, but you need to see the internals of the SD_task_t to use it */ + SD_link_t __SD_link_create(void *surf_link, void *data); -void __SD_link_destroy(void *link); +#define __SD_link_destroy xbt_free_f -SD_workstation_t __SD_workstation_create(void *surf_workstation, void *data); +SD_workstation_t __SD_workstation_create(void *surf_workstation, + void *data); void __SD_workstation_destroy(void *workstation); int __SD_workstation_is_busy(SD_workstation_t workstation); @@ -121,6 +134,12 @@ void __SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state); void __SD_task_really_run(SD_task_t task); int __SD_task_try_to_run(SD_task_t task); void __SD_task_just_done(SD_task_t task); +bool acyclic_graph_detail(xbt_dynar_t dag); + +/* Task mallocator functions */ +void* SD_task_new_f(void); +void SD_task_recycle_f(void *t); +void SD_task_free_f(void *t); /* Functions to test if the task is in a given state. */ @@ -128,14 +147,14 @@ void __SD_task_just_done(SD_task_t task); static XBT_INLINE int __SD_task_is_scheduled_or_runnable(SD_task_t task) { return task->state_set == sd_global->scheduled_task_set || - task->state_set == sd_global->runnable_task_set; + task->state_set == sd_global->runnable_task_set; } /* Returns whether the given task is scheduled or runnable. */ static XBT_INLINE int __SD_task_is_schedulable_or_done(SD_task_t task) { return task->state_set == sd_global->schedulable_task_set || - task->state_set == sd_global->done_task_set; + task->state_set == sd_global->done_task_set; } /* Returns whether the state of the given task is SD_NOT_SCHEDULED. */ @@ -172,7 +191,7 @@ static XBT_INLINE int __SD_task_is_in_fifo(SD_task_t task) static XBT_INLINE int __SD_task_is_runnable_or_in_fifo(SD_task_t task) { return task->state_set == sd_global->runnable_task_set || - task->state_set == sd_global->in_fifo_task_set; + task->state_set == sd_global->in_fifo_task_set; } /* Returns whether the state of the given task is SD_RUNNING. */ @@ -180,5 +199,12 @@ static XBT_INLINE int __SD_task_is_running(SD_task_t task) { return task->state_set == sd_global->running_task_set; } +/********** Tracing **********/ +/* declaration of instrumentation functions from sd_task_instr.c */ +void TRACE_sd_task_create(SD_task_t task); +void TRACE_sd_task_execute_start(SD_task_t task); +void TRACE_sd_task_execute_end(SD_task_t task); +void TRACE_sd_task_destroy(SD_task_t task); + #endif