From 883fca3cce00e333e4970bfb63e0b028188f25db Mon Sep 17 00:00:00 2001 From: thiery Date: Mon, 26 Jun 2006 13:28:33 +0000 Subject: [PATCH 1/1] Fix SimDag compilation warnings. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2432 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/simdag/simdag.h | 2 +- src/simdag/sd_global.c | 44 +---------------------------------------- src/simdag/sd_task.c | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) diff --git a/include/simdag/simdag.h b/include/simdag/simdag.h index a1f2a96bbd..1215fc00f3 100644 --- a/include/simdag/simdag.h +++ b/include/simdag/simdag.h @@ -71,7 +71,7 @@ void SD_task_destroy(SD_task_t task); void SD_init(int *argc, char **argv); void SD_create_environment(const char *platform_file); SD_task_t* SD_simulate(double how_long); /* returns a NULL-terminated array of SD_task_t whose state has changed */ -void SD_exit(); /* cleans everything */ +void SD_exit(void); /* cleans everything */ SG_END_DECL() diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c index 7c153b4845..262dbab38f 100644 --- a/src/simdag/sd_global.c +++ b/src/simdag/sd_global.c @@ -1,4 +1,3 @@ -#include "simdag/simdag.h" #include "private.h" #include "xbt/sysdep.h" #include "xbt/dynar.h" @@ -136,51 +135,10 @@ SD_task_t* SD_simulate(double how_long) return changed_tasks; } -void SD_test() { - /* temporary test to explore the workstations and the links */ - xbt_dict_cursor_t cursor = NULL; - char *name = NULL; - SD_workstation_t workstation = NULL; - double power, available_power, bandwidth, latency; - SD_link_t link = NULL; - - surf_solve(); - - xbt_dict_foreach(sd_global->workstations, cursor, name, workstation) { - power = SD_workstation_get_power(workstation); - available_power = SD_workstation_get_available_power(workstation); - printf("Workstation name: %s, power: %f Mflop/s, available power: %f%%\n", name, power, (available_power*100)); - } - - xbt_dict_foreach(sd_global->links, cursor, name, link) { - bandwidth = SD_link_get_current_bandwidth(link); - latency = SD_link_get_current_latency(link); - printf("Link name: %s, bandwidth: %f, latency: %f\n", name, bandwidth, latency); - } - - /* test the route between two workstations */ - SD_workstation_t src, dst; - xbt_dict_cursor_first(sd_global->workstations, &cursor); - xbt_dict_cursor_get_or_free(&cursor, &name, (void**) &src); - xbt_dict_cursor_step(cursor); - xbt_dict_cursor_get_or_free(&cursor, &name, (void**) &dst); - xbt_dict_cursor_free(&cursor); - - SD_link_t *route = SD_workstation_route_get_list(src, dst); - int route_size = SD_workstation_route_get_size(src, dst); - - printf("Route between %s and %s (%d links) : ", SD_workstation_get_name(src), SD_workstation_get_name(dst), route_size); - int i; - for (i = 0; i < route_size; i++) { - printf("%s ", SD_link_get_name(route[i])); - } - printf("\n"); -} - /* Destroys all SD internal data. This function should be called when the simulation is over. * The tasks should have been destroyed first. */ -void SD_exit() { +void SD_exit(void) { if (sd_global != NULL) { xbt_dict_free(&sd_global->workstations); xbt_dict_free(&sd_global->links); diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c index 1e91daf0d5..5a64783d12 100644 --- a/src/simdag/sd_task.c +++ b/src/simdag/sd_task.c @@ -154,7 +154,7 @@ void __SD_print_dependencies(SD_task_t task) { /* Destroys a dependency between two tasks. */ -void __SD_task_destroy_dependency(void *dependency) { +static void __SD_task_destroy_dependency(void *dependency) { if (((SD_dependency_t) dependency)->name != NULL) xbt_free(((SD_dependency_t) dependency)->name); xbt_free(dependency); -- 2.20.1