X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b05a0ed4f5fb7b81f96777af37b8f7fc5a4bf160..2c69087d11c54eee924f6870373883d6aa9ff228:/include/simdag/simdag.h diff --git a/include/simdag/simdag.h b/include/simdag/simdag.h index 6469356888..de490705ed 100644 --- a/include/simdag/simdag.h +++ b/include/simdag/simdag.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2006-2010, 2012-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -83,6 +83,7 @@ XBT_PUBLIC(int) SD_route_get_size(SD_workstation_t src, XBT_PUBLIC(double) SD_workstation_get_power(SD_workstation_t workstation); XBT_PUBLIC(double) SD_workstation_get_available_power(SD_workstation_t workstation); +XBT_PUBLIC(int) SD_workstation_get_cores(SD_workstation_t workstation); XBT_PUBLIC(e_SD_workstation_access_mode_t) SD_workstation_get_access_mode(SD_workstation_t workstation); XBT_PUBLIC(void) SD_workstation_set_access_mode(SD_workstation_t @@ -90,21 +91,22 @@ XBT_PUBLIC(void) SD_workstation_set_access_mode(SD_workstation_t e_SD_workstation_access_mode_t access_mode); -XBT_PUBLIC(double) SD_workstation_get_computation_time(SD_workstation_t - workstation, - double - computation_amount); +XBT_PUBLIC(double) SD_workstation_get_computation_time(SD_workstation_t workstation, + double flops_amount); XBT_PUBLIC(double) SD_route_get_current_latency(SD_workstation_t src, SD_workstation_t dst); XBT_PUBLIC(double) SD_route_get_current_bandwidth(SD_workstation_t src, SD_workstation_t dst); XBT_PUBLIC(double) SD_route_get_communication_time(SD_workstation_t src, SD_workstation_t dst, - double - communication_amount); - -XBT_PUBLIC(SD_task_t) SD_workstation_get_current_task(SD_workstation_t - workstation); + double bytes_amount); + +XBT_PUBLIC(SD_task_t) SD_workstation_get_current_task(SD_workstation_t workstation); +XBT_PUBLIC(xbt_dict_t) + SD_workstation_get_mounted_storage_list(SD_workstation_t workstation); +XBT_PUBLIC(xbt_dynar_t) + SD_workstation_get_attached_storage_list(SD_workstation_t workstation); +XBT_PUBLIC(const char*) SD_storage_get_host(SD_storage_t storage); /** @} */ /************************** Task handling ************************************/ @@ -135,20 +137,21 @@ 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(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 workstation_nb, const SD_workstation_t * workstation_list, - const double - *computation_amount, const double - *communication_amount); + const double *flops_amount, + const double *bytes_amount); XBT_PUBLIC(int) SD_task_get_kind(SD_task_t task); XBT_PUBLIC(void) SD_task_schedule(SD_task_t task, int workstation_nb, const SD_workstation_t * workstation_list, - const double *computation_amount, - const double *communication_amount, + 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); @@ -174,12 +177,10 @@ 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_amdhal(SD_task_t task, int ws_count); +XBT_PUBLIC(void) SD_task_distribute_comp_amdahl(SD_task_t task, int ws_count); XBT_PUBLIC(void) SD_task_schedulev(SD_task_t task, int count, const SD_workstation_t * list); XBT_PUBLIC(void) SD_task_schedulel(SD_task_t task, int count, ...); -XBT_PUBLIC(void) SD_task_set_category (SD_task_t task, const char *category); -XBT_PUBLIC(const char *) SD_task_get_category (SD_task_t task); /** @brief A constant to use in SD_task_schedule to mean that there is no cost. @@ -188,7 +189,7 @@ XBT_PUBLIC(const char *) SD_task_get_category (SD_task_t task); * * SD_task_schedule(task, my_workstation_nb, * my_workstation_list, - * my_computation_amount, + * my_flops_amount, * SD_TASK_SCHED_NO_COST, * my_rate); */ @@ -208,6 +209,8 @@ XBT_PUBLIC(const char *) SD_task_get_category (SD_task_t task); XBT_PUBLIC(void) SD_task_dependency_add(const char *name, void *data, 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(const char *) SD_task_dependency_get_name(SD_task_t src, + SD_task_t dst); XBT_PUBLIC(void *) SD_task_dependency_get_data(SD_task_t src, SD_task_t dst); XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst); @@ -224,14 +227,15 @@ XBT_PUBLIC(int) SD_task_dependency_exists(SD_task_t src, SD_task_t dst); * @{ */ XBT_PUBLIC(void) SD_init(int *argc, char **argv); +XBT_PUBLIC(void) SD_config(const char *key, const char *value); XBT_PUBLIC(void) SD_application_reinit(void); XBT_PUBLIC(void) SD_create_environment(const char *platform_file); -XBT_PUBLIC(void) SD_load_environment_script(const char *script_file); XBT_PUBLIC(xbt_dynar_t) SD_simulate(double how_long); XBT_PUBLIC(double) SD_get_clock(void); XBT_PUBLIC(void) SD_exit(void); 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_PTG_dotload(const char *filename); XBT_PUBLIC(xbt_dynar_t) SD_dotload_with_sched(const char *filename); XBT_PUBLIC(void) uniq_transfer_task_name(SD_task_t task);