X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e50d4a9de8334346d43f962316c081e0069e56b3..0445b0862c323d8285fba620d5137a0891527914:/src/simdag/sd_workstation.c diff --git a/src/simdag/sd_workstation.c b/src/simdag/sd_workstation.c index 7474bba02b..428c71a2ea 100644 --- a/src/simdag/sd_workstation.c +++ b/src/simdag/sd_workstation.c @@ -11,6 +11,7 @@ #include "xbt/sysdep.h" #include "surf/surf.h" #include "surf/surf_resource.h" +#include "msg/msg.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd, "Logging specific to SimDag (workstation)"); @@ -45,8 +46,8 @@ SD_storage_t __SD_storage_create(void *surf_storage, void *data) storage = xbt_new(s_SD_storage_priv_t, 1); storage->data = data; /* user data */ - storage->host = surf_storage_get_host(surf_storage); name = surf_resource_name(surf_storage); + storage->host = surf_storage_get_host(surf_storage_resource_by_name(name)); xbt_lib_set(storage_lib,name, SD_STORAGE_LEVEL, storage); return xbt_lib_get_elm_or_null(storage_lib, name); } @@ -281,6 +282,15 @@ double SD_workstation_get_power(SD_workstation_t workstation) { return surf_workstation_get_speed(workstation, 1.0); } +/** + * \brief Returns the amount of cores of a workstation + * + * \param workstation a workstation + * \return the amount of cores of this workstation + */ +int SD_workstation_get_cores(SD_workstation_t workstation) { + return surf_workstation_get_core(workstation); +} /** * \brief Returns the proportion of available power in a workstation