#ifndef SIMDAG_PRIVATE_H
#define SIMDAG_PRIVATE_H
-
-#include "xbt/base.h"
-#include "xbt/dict.h"
+#include <set>
#include "xbt/dynar.h"
-#include "xbt/fifo.h"
#include "simgrid/simdag.h"
#include "surf/surf.h"
#include "xbt/mallocator.h"
/* Global variables */
typedef struct SD_global {
- SD_workstation_t *workstation_list; /* array of workstations, created only if
- necessary in SD_workstation_get_list */
- 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? */
+ bool watch_point_reached; /* has a task just reached a watch point? */
- xbt_dynar_t initial_task_set;
- xbt_dynar_t executable_task_set;
- xbt_dynar_t completed_task_set;
+ std::set<SD_task_t> *initial_tasks;
+ std::set<SD_task_t> *executable_tasks;
+ std::set<SD_task_t> *completed_tasks;
xbt_dynar_t return_set;
- int task_number;
} s_SD_global_t, *SD_global_t;
extern XBT_PRIVATE SD_global_t sd_global;
-/* Workstation */
-typedef s_xbt_dictelm_t s_SD_workstation_t;
-typedef struct SD_workstation {
- 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_priv_t, *SD_workstation_priv_t;
-
-/* Storage */
-typedef s_xbt_dictelm_t s_SD_storage_t;
-typedef struct SD_storage {
- void *data; /* user data */
- const char *host;
-} s_SD_storage_priv_t, *SD_storage_priv_t;
-
-static inline SD_storage_priv_t SD_storage_priv(SD_storage_t storage){
- return (SD_storage_priv_t)xbt_lib_get_level(storage, SD_STORAGE_LEVEL);
-}
-
/* Task */
typedef struct SD_task {
e_SD_task_state_t state;
surf_action_t surf_action;
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;
int unsatisfied_dependencies;
unsigned int is_not_ready;
+ std::set<SD_task_t> *inputs;
+ std::set<SD_task_t> *outputs;
+ std::set<SD_task_t> *predecessors;
+ std::set<SD_task_t> *successors;
+
/* scheduling parameters (only exist in state SD_SCHEDULED) */
- int workstation_nb;
- SD_workstation_t *workstation_list; /* surf workstations */
+ int host_count;
+ sg_host_t *host_list;
double *flops_amount;
double *bytes_amount;
double rate;
char *category; /* sd task category for instrumentation */
} s_SD_task_t;
-/* Task dependencies */
-typedef struct SD_dependency {
- char *name;
- void *data;
- SD_task_t src;
- SD_task_t dst;
- /* src must be finished before dst can start */
-} s_SD_dependency_t, *SD_dependency_t;
-
/* SimDag private functions */
-XBT_PRIVATE SD_workstation_t __SD_workstation_create(const char* name);
-XBT_PRIVATE void __SD_workstation_destroy(void *workstation);
-XBT_PRIVATE int __SD_workstation_is_busy(SD_workstation_t workstation);
-
XBT_PRIVATE void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state);
-XBT_PRIVATE void __SD_task_really_run(SD_task_t task);
-XBT_PRIVATE void __SD_task_just_done(SD_task_t task);
-XBT_PRIVATE int __SD_task_try_to_run(SD_task_t task);
+XBT_PRIVATE void SD_task_run(SD_task_t task);
XBT_PRIVATE bool acyclic_graph_detail(xbt_dynar_t dag);
+XBT_PRIVATE void uniq_transfer_task_name(SD_task_t task);
/* Task mallocator functions */
XBT_PRIVATE void* SD_task_new_f(void);
XBT_PRIVATE void SD_task_recycle_f(void *t);
XBT_PRIVATE void SD_task_free_f(void *t);
-/* Functions to test if the task is in a given state. */
-
-/* Returns whether the given task is scheduled or runnable. */
-static XBT_INLINE int __SD_task_is_scheduled_or_runnable(SD_task_t task)
-{
- return task->state == SD_SCHEDULED || task->state == SD_RUNNABLE;
-}
-
-/* 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 == SD_SCHEDULABLE || task->state == SD_DONE;
-}
-
-/* Returns whether the state of the given task is SD_RUNNABLE or SD_IN_FIFO. */
-static XBT_INLINE int __SD_task_is_runnable_or_in_fifo(SD_task_t task)
-{
- return task->state == SD_RUNNABLE || task->state == SD_IN_FIFO;
-}
-
-/********** Storage **********/
-XBT_PRIVATE SD_storage_t __SD_storage_create(void *surf_storage, void *data);
-XBT_PRIVATE void __SD_storage_destroy(void *storage);
-
-/********** Tracing **********/
-/* declaration of instrumentation functions from sd_task_instr.c */
-XBT_PRIVATE void TRACE_sd_task_create(SD_task_t task);
-XBT_PRIVATE void TRACE_sd_task_execute_start(SD_task_t task);
-XBT_PRIVATE void TRACE_sd_task_execute_end(SD_task_t task);
-XBT_PRIVATE void TRACE_sd_task_destroy(SD_task_t task);
-
SG_END_DECL()
-
#endif
