X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/984ea3223c5e84f4fd94cbfa594162e4ee87eac9..b08c515d1ded5726d50e3e9e11c03260e3e1546d:/src/simdag/sd_workstation.c diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index 1936cb73d1..574c99c586 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); } /** @@ -301,7 +304,7 @@ double SD_workstation_get_available_power(SD_workstation_t workstation) * * \param workstation a workstation * \param computation_amount the computation amount you want to evaluate (in flops) - * \return an approximative astimated computation time for the given computation amount on this workstation (in seconds) + * \return an approximative estimated computation time for the given computation amount on this workstation (in seconds) */ double SD_workstation_get_computation_time(SD_workstation_t workstation, double computation_amount) @@ -380,7 +383,7 @@ double SD_route_get_current_bandwidth(SD_workstation_t src, * \param src the first workstation * \param dst the second workstation * \param communication_amount the communication amount you want to evaluate (in bytes) - * \return an approximative astimated computation time for the given communication amount + * \return an approximative estimated computation time for the given communication amount * between the workstations (in seconds) */ double SD_route_get_communication_time(SD_workstation_t src, @@ -479,7 +482,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); }