A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Make GTNETS compatible with new parsing and variable name convention.
[simgrid.git]
/
src
/
simix
/
smx_host.c
diff --git
a/src/simix/smx_host.c
b/src/simix/smx_host.c
index
7367c49
..
e26ffb6
100644
(file)
--- a/
src/simix/smx_host.c
+++ b/
src/simix/smx_host.c
@@
-169,7
+169,7
@@
double SIMIX_host_get_speed(smx_host_t host)
{
xbt_assert0((host != NULL), "Invalid parameters");
- return (surf_workstation_
resource
->
+ return (surf_workstation_
model
->
extension_public->get_speed(host->simdata->host, 1.0));
}
@@
-183,7
+183,7
@@
double SIMIX_host_get_available_speed(smx_host_t host)
{
xbt_assert0((host != NULL), "Invalid parameters");
- return (surf_workstation_
resource
->
+ return (surf_workstation_
model
->
extension_public->get_available_speed(host->simdata->host));
}
@@
-210,6
+210,22
@@
smx_host_t SIMIX_host_get_by_name(const char *name)
return NULL;
}
+/**
+ * \brief Returns a xbt_dynar_t consisting of the list of properties assigned to this host
+ *
+ * \param host a host
+ * \return the dynamic array consisting of property names
+ */
+xbt_dict_t SIMIX_host_get_properties(smx_host_t host)
+{
+ xbt_assert0((host != NULL), "Invalid parameters");
+
+ return (surf_workstation_model->
+ common_public->get_properties(host->simdata->host));
+
+}
+
+
/**
* \brief Return the state of a workstation
*
@@
-221,7
+237,7
@@
int SIMIX_host_get_state(smx_host_t host)
{
xbt_assert0((host != NULL), "Invalid parameters");
- return (surf_workstation_
resource
->
+ return (surf_workstation_
model
->
extension_public->get_state(host->simdata->host));
}