X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e694957c5830a9f1407392fa7f76796274aa4d18..3fc50c3c70dc22b52b7be3faed1380d0688a22a5:/src/simdag/sd_workstation.c diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index fdc07befef..14a0c70f53 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2011. The SimGrid Team. +/* Copyright (c) 2006-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -57,7 +57,10 @@ SD_storage_t __SD_storage_create(void *surf_storage, void *data) */ void __SD_storage_destroy(void *storage) { - xbt_free(storage); + SD_storage_priv_t s; + + s = (SD_storage_priv_t) storage; + xbt_free(s); } /** @@ -361,8 +364,7 @@ double SD_route_get_current_bandwidth(SD_workstation_t src, links = SD_route_get_list(src, dst); nb_links = SD_route_get_size(src, dst); - bandwidth = min_bandwidth = -1.0; - + min_bandwidth = -1.0; for (i = 0; i < nb_links; i++) { bandwidth = SD_link_get_current_bandwidth(links[i]); @@ -479,7 +481,7 @@ void SD_workstation_set_access_mode(SD_workstation_t workstation, * \param workstation a workstation * \return a dynar containing all mounted storages on the workstation */ -xbt_dynar_t SD_workstation_get_storage_list(SD_workstation_t workstation){ +xbt_dict_t SD_workstation_get_storage_list(SD_workstation_t workstation){ return surf_workstation_model->extension.workstation.get_storage_list(workstation); }