X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9df6a0ce7023e4e22d83bb6c50f27bd21fab329..b9d2f7277242a82702b73e4ccdf63aec98855b5e:/include/simgrid/simdag.h diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index 115d9eab8c..8f64ea326a 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2010, 2012-2016. The SimGrid Team. +/* Copyright (c) 2006-2010, 2012-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,14 +7,13 @@ #ifndef SIMDAG_SIMDAG_H #define SIMDAG_SIMDAG_H -#include "xbt/misc.h" -#include "xbt/dynar.h" -#include "xbt/dict.h" -#include "xbt/asserts.h" -#include "xbt/log.h" -#include "simgrid/link.h" #include "simgrid/host.h" - +#include "simgrid/link.h" +#include "xbt/log.h" +#include "xbt/sysdep.h" +#ifdef __cplusplus +#include +#endif SG_BEGIN_DECL() /** @brief Link opaque datatype @@ -23,7 +22,7 @@ SG_BEGIN_DECL() A link is a network node represented as a name, a bandwidth and a latency. A route is a list of links between two hosts. */ -typedef Link *SD_link_t; +typedef sg_link_t SD_link_t; /** @brief Task opaque datatype @ingroup SD_task_api @@ -33,19 +32,19 @@ typedef Link *SD_link_t; Each task has a \ref e_SD_task_state_t "state" indicating whether the task is scheduled, running, done, ... */ -typedef struct SD_task *SD_task_t; +typedef struct s_SD_task_t* SD_task_t; /** @brief Task states @ingroup SD_task_api */ typedef enum { - SD_NOT_SCHEDULED = 0, /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */ - SD_SCHEDULABLE = 0x0001, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */ - SD_SCHEDULED = 0x0002, /**< @brief A task becomes SD_SCHEDULED when you call function + SD_NOT_SCHEDULED = 0x0001, /**< @brief Initial state (not valid for SD_watch and SD_unwatch). */ + SD_SCHEDULABLE = 0x0002, /**< @brief A task becomes SD_SCHEDULABLE as soon as its dependencies are satisfied */ + SD_SCHEDULED = 0x0004, /**< @brief A task becomes SD_SCHEDULED when you call function SD_task_schedule. SD_simulate will execute it when it becomes SD_RUNNABLE. */ - SD_RUNNABLE = 0x0004, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */ - SD_RUNNING = 0x0008, /**< @brief An SD_RUNNABLE task becomes SD_RUNNING when it is launched. */ - SD_DONE = 0x0010, /**< @brief The task is successfully finished. */ - SD_FAILED = 0x0020 /**< @brief A problem occurred during the execution of the task. */ + SD_RUNNABLE = 0x0008, /**< @brief A scheduled task becomes runnable is SD_simulate as soon as its dependencies are satisfied. */ + SD_RUNNING = 0x0010, /**< @brief An SD_RUNNABLE task becomes SD_RUNNING when it is launched. */ + SD_DONE = 0x0020, /**< @brief The task is successfully finished. */ + SD_FAILED = 0x0040 /**< @brief A problem occurred during the execution of the task. */ } e_SD_task_state_t; /** @brief Task kinds @@ -58,23 +57,6 @@ typedef enum { SD_TASK_COMM_PAR_MXN_1D_BLOCK = 4 /**< @brief MxN data redistribution (1D Block distribution) */ } e_SD_task_kind_t; -/************************** Workstation handling ****************************/ -/** @addtogroup SD_host_api - * - * A host is a place where a task can be executed. - * A host is represented as a physical resource with computing capabilities and has a name. - * - * The hosts are created from the description file when you call the function SD_create_environment. - * - * @see sg_host_t - * @{ - */ -XBT_PUBLIC(SD_link_t *) SD_route_get_list(sg_host_t src, sg_host_t dst); -XBT_PUBLIC(int) SD_route_get_size(sg_host_t src, sg_host_t dst); -XBT_PUBLIC(double) SD_route_get_latency(sg_host_t src, sg_host_t dst); -XBT_PUBLIC(double) SD_route_get_bandwidth(sg_host_t src, sg_host_t dst); -/** @} */ - /************************** Task handling ************************************/ /** @defgroup SD_task_api Tasks * @brief Functions for managing the tasks @@ -124,6 +106,7 @@ XBT_PUBLIC(SD_task_t) SD_task_create_comm_e2e(const char *name, void *data, doub XBT_PUBLIC(SD_task_t) SD_task_create_comm_par_mxn_1d_block(const char *name, void *data, double amount); XBT_PUBLIC(void) SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count); +XBT_PUBLIC(void) SD_task_build_MxN_1D_block_matrix(SD_task_t task, int src_nb, int dst_nb); XBT_PUBLIC(void) SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list); XBT_PUBLIC(void) SD_task_schedulel(SD_task_t task, int count, ...); @@ -138,8 +121,8 @@ XBT_PUBLIC(void) SD_task_schedulel(SD_task_t task, int count, ...); /** @} */ -/** @addtogroup SD_task_dependency_api - * +/** @addtogroup SD_task_dependency_api + * * This section describes the functions for managing the dependencies between the tasks. * * @see SD_task_api @@ -157,17 +140,24 @@ XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst); * * @{ */ -XBT_PUBLIC(void) SD_init(int *argc, char **argv); + +#define SD_init(argc, argv) \ + do { \ + sg_version_check(SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, SIMGRID_VERSION_PATCH); \ + SD_init_nocheck(argc, argv); \ + } while (0) + +XBT_PUBLIC(void) SD_init_nocheck(int *argc, char **argv); XBT_PUBLIC(void) SD_config(const char *key, const char *value); XBT_PUBLIC(void) SD_create_environment(const char *platform_file); -XBT_PUBLIC(xbt_dynar_t) SD_simulate(double how_long); +XBT_PUBLIC(void) SD_simulate(double how_long); +XBT_PUBLIC(void) SD_simulate_with_update(double how_long, xbt_dynar_t changed_tasks_dynar); XBT_PUBLIC(double) SD_get_clock(); XBT_PUBLIC(void) SD_exit(); XBT_PUBLIC(xbt_dynar_t) SD_daxload(const char *filename); XBT_PUBLIC(xbt_dynar_t) SD_dotload(const char *filename); XBT_PUBLIC(xbt_dynar_t) SD_dotload_with_sched(const char *filename); XBT_PUBLIC(xbt_dynar_t) SD_PTG_dotload(const char *filename); - /** @} */ /* Support some backward compatibility */ @@ -192,6 +182,8 @@ XBT_PUBLIC(xbt_dynar_t) SD_PTG_dotload(const char *filename); #define SD_workstation_get_property_value sg_host_get_property_value #define SD_workstation_get_power sg_host_speed #define SD_workstation_get_available_power sg_host_get_available_speed +#define SD_route_get_latency sg_host_route_latency +#define SD_route_get_bandwidth sg_host_route_bandwidth #define SD_workstation_get_mounted_storage_list sg_host_get_mounted_storage_list // Lost functions @@ -200,7 +192,17 @@ XBT_PUBLIC(xbt_dynar_t) SD_PTG_dotload(const char *filename); //SD_workstation_get_current_task //SD_route_get_communication_time => SG_route_get_latency() + amount / SD_route_get_bandwidth() //SD_workstation_get_computation_time => amount / sg_host_speed() +//SD_route_get_size +//SD_route_get_list //TRACE_sd_set_task_category - SG_END_DECL() + +#ifdef __cplusplus +namespace simgrid { +namespace sd { +XBT_PUBLIC(std::set*) simulate(double how_long); +} +} +#endif + #endif