X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..c5671be7576dca4aca0cc73c77d4ee732df42140:/include/simgrid/simdag.h diff --git a/include/simgrid/simdag.h b/include/simgrid/simdag.h index fc162d65b5..466be705ff 100644 --- a/include/simgrid/simdag.h +++ b/include/simgrid/simdag.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -6,16 +6,31 @@ #ifndef SIMGRID_SIMDAG_H #define SIMGRID_SIMDAG_H +#include #include #include +#include #include #include #ifdef __cplusplus #include + +namespace simgrid { +namespace sd { +class Task; +XBT_PUBLIC std::set* simulate(double how_long); +} // namespace sd +} // namespace simgrid + +using sg_sd_Task = simgrid::sd::Task; +#else +typedef struct sd_Task sg_sd_Task; #endif -SG_BEGIN_DECL() +#ifdef __cplusplus +extern "C" { +#endif /** @brief Link opaque datatype @ingroup SD_link_api @@ -33,7 +48,8 @@ typedef sg_link_t SD_link_t; Each task has a @ref e_SD_task_state_t "state" indicating whether the task is scheduled, running, done, ... */ -typedef struct s_SD_task_t* SD_task_t; +typedef sg_sd_Task* SD_task_t; +typedef const sg_sd_Task* const_SD_task_t; /** @brief Task states @ingroup SD_task_api */ @@ -72,34 +88,34 @@ typedef enum { * @{ */ XBT_PUBLIC SD_task_t SD_task_create(const char* name, void* data, double amount); -XBT_PUBLIC void* SD_task_get_data(SD_task_t task); +XBT_PUBLIC void* SD_task_get_data(const_SD_task_t task); XBT_PUBLIC void SD_task_set_data(SD_task_t task, void* data); -XBT_PUBLIC e_SD_task_state_t SD_task_get_state(SD_task_t task); -XBT_PUBLIC const char* SD_task_get_name(SD_task_t task); +XBT_PUBLIC e_SD_task_state_t SD_task_get_state(const_SD_task_t task); +XBT_PUBLIC const char* SD_task_get_name(const_SD_task_t task); XBT_PUBLIC void SD_task_set_name(SD_task_t task, const char* name); XBT_PUBLIC void SD_task_set_rate(SD_task_t task, double rate); XBT_PUBLIC void SD_task_watch(SD_task_t task, e_SD_task_state_t state); XBT_PUBLIC void SD_task_unwatch(SD_task_t task, e_SD_task_state_t state); -XBT_PUBLIC double SD_task_get_amount(SD_task_t task); +XBT_PUBLIC double SD_task_get_amount(const_SD_task_t task); XBT_PUBLIC void SD_task_set_amount(SD_task_t task, double amount); -XBT_PUBLIC double SD_task_get_alpha(SD_task_t task); -XBT_PUBLIC double SD_task_get_remaining_amount(SD_task_t task); -XBT_PUBLIC double SD_task_get_execution_time(SD_task_t task, int host_count, const sg_host_t* host_list, +XBT_PUBLIC double SD_task_get_alpha(const_SD_task_t task); +XBT_PUBLIC double SD_task_get_remaining_amount(const_SD_task_t task); +XBT_PUBLIC double SD_task_get_execution_time(const_SD_task_t task, int host_count, const sg_host_t* host_list, const double* flops_amount, const double* bytes_amount); -XBT_PUBLIC e_SD_task_kind_t SD_task_get_kind(SD_task_t task); +XBT_PUBLIC e_SD_task_kind_t SD_task_get_kind(const_SD_task_t task); XBT_PUBLIC void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t* host_list, const double* flops_amount, const double* bytes_amount, double rate); XBT_PUBLIC void SD_task_unschedule(SD_task_t task); -XBT_PUBLIC double SD_task_get_start_time(SD_task_t task); -XBT_PUBLIC double SD_task_get_finish_time(SD_task_t task); -XBT_PUBLIC xbt_dynar_t SD_task_get_parents(SD_task_t task); -XBT_PUBLIC xbt_dynar_t SD_task_get_children(SD_task_t task); -XBT_PUBLIC int SD_task_get_workstation_count(SD_task_t task); -XBT_PUBLIC sg_host_t* SD_task_get_workstation_list(SD_task_t task); +XBT_PUBLIC double SD_task_get_start_time(const_SD_task_t task); +XBT_PUBLIC double SD_task_get_finish_time(const_SD_task_t task); +XBT_PUBLIC xbt_dynar_t SD_task_get_parents(const_SD_task_t task); +XBT_PUBLIC xbt_dynar_t SD_task_get_children(const_SD_task_t task); +XBT_PUBLIC int SD_task_get_workstation_count(const_SD_task_t task); +XBT_PUBLIC sg_host_t* SD_task_get_workstation_list(const_SD_task_t task); XBT_PUBLIC void SD_task_destroy(SD_task_t task); -XBT_PUBLIC void SD_task_dump(SD_task_t task); -XBT_PUBLIC void SD_task_dotty(SD_task_t task, void* out_FILE); +XBT_PUBLIC void SD_task_dump(const_SD_task_t task); +XBT_PUBLIC void SD_task_dotty(const_SD_task_t task, void* out_FILE); XBT_PUBLIC SD_task_t SD_task_create_comp_seq(const char* name, void* data, double amount); XBT_PUBLIC SD_task_t SD_task_create_comp_par_amdahl(const char* name, void* data, double amount, double alpha); @@ -130,7 +146,7 @@ XBT_PUBLIC void SD_task_schedulel(SD_task_t task, int count, ...); */ XBT_PUBLIC void SD_task_dependency_add(SD_task_t src, SD_task_t dst); XBT_PUBLIC void SD_task_dependency_remove(SD_task_t src, SD_task_t dst); -XBT_PUBLIC int SD_task_dependency_exists(SD_task_t src, SD_task_t dst); +XBT_PUBLIC int SD_task_dependency_exists(const_SD_task_t src, SD_task_t dst); /** @} */ /************************** Global *******************************************/ @@ -144,7 +160,7 @@ XBT_PUBLIC int SD_task_dependency_exists(SD_task_t src, SD_task_t dst); #define SD_init(argc, argv) \ do { \ sg_version_check(SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR, SIMGRID_VERSION_PATCH); \ - SD_init_nocheck(argc, argv); \ + SD_init_nocheck((argc), (argv)); \ } while (0) XBT_PUBLIC void SD_init_nocheck(int* argc, char** argv); @@ -152,8 +168,6 @@ XBT_PUBLIC void SD_config(const char* key, const char* value); XBT_PUBLIC void SD_create_environment(const char* platform_file); 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); @@ -161,11 +175,12 @@ XBT_PUBLIC xbt_dynar_t SD_PTG_dotload(const char* filename); /** @} */ /* Support some backward compatibility */ +#define SD_get_clock simgrid_get_clock #define SD_workstation_t sg_host_t -#define SD_link_get_name sg_link_name -#define SD_link_get_current_latency sg_link_latency -#define SD_link_get_current_bandwidth sg_link_bandwidth +#define SD_link_get_name sg_link_get_name +#define SD_link_get_current_latency sg_link_get_latency +#define SD_link_get_current_bandwidth sg_link_get_bandwidth #define SD_route_get_current_latency SD_route_get_latency #define SD_route_get_current_bandwidth SD_route_get_bandwidth @@ -176,32 +191,25 @@ XBT_PUBLIC xbt_dynar_t SD_PTG_dotload(const char* filename); #define SD_workstation_get_name sg_host_get_name #define SD_workstation_get_by_name sg_host_by_name #define SD_workstation_dump sg_host_dump -#define SD_workstation_get_data sg_host_user -#define SD_workstation_set_data sg_host_user_set +#define SD_workstation_get_data sg_host_get_data +#define SD_workstation_set_data sg_host_set_data #define SD_workstation_get_properties sg_host_get_properties #define SD_workstation_get_property_value sg_host_get_property_value -#define SD_workstation_get_power sg_host_speed +#define SD_workstation_get_power sg_host_get_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_route_get_latency sg_host_get_route_latency +#define SD_route_get_bandwidth sg_host_get_route_bandwidth -#define SD_workstation_get_mounted_storage_list sg_host_get_mounted_storage_list // Lost functions //SD_workstation_get_access_mode //SD_workstation_set_access_mode //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_communication_time => SD_route_get_latency() + amount / SD_route_get_bandwidth() +//SD_workstation_get_computation_time => amount / sg_host_get_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