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
Merge branch 'master' into disk
[simgrid.git]
/
src
/
s4u
/
s4u_Host.cpp
diff --git
a/src/s4u/s4u_Host.cpp
b/src/s4u/s4u_Host.cpp
index
6dbee95
..
f86b990
100644
(file)
--- a/
src/s4u/s4u_Host.cpp
+++ b/
src/s4u/s4u_Host.cpp
@@
-18,8
+18,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_host, s4u, "Logging specific to the S4U hosts");
XBT_LOG_EXTERNAL_CATEGORY(surf_route);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_host, s4u, "Logging specific to the S4U hosts");
XBT_LOG_EXTERNAL_CATEGORY(surf_route);
-int USER_HOST_LEVEL = -1;
-
namespace simgrid {
namespace xbt {
template class Extendable<s4u::Host>;
namespace simgrid {
namespace xbt {
template class Extendable<s4u::Host>;
@@
-400,17
+398,25
@@
xbt_dynar_t sg_hosts_as_dynar()
// ========= Layering madness ==============*
// ========== User data Layer ==========
// ========= Layering madness ==============*
// ========== User data Layer ==========
-void* sg_host_user(sg_host_t host)
+void* sg_host_data(sg_host_t host)
+{
+ return host->get_data();
+}
+void sg_host_data_set(sg_host_t host, void* userdata)
+{
+ host->set_data(userdata);
+}
+void* sg_host_user(sg_host_t host) // deprecated
{
{
- return host->
extension(USER_HOST_LEVEL
);
+ return host->
get_data(
);
}
}
-void sg_host_user_set(sg_host_t host, void* userdata)
+void sg_host_user_set(sg_host_t host, void* userdata)
// deprecated
{
{
- host->
extension_set(USER_HOST_LEVEL,
userdata);
+ host->
set_data(
userdata);
}
}
-void sg_host_user_destroy(sg_host_t host)
+void sg_host_user_destroy(sg_host_t host)
// deprecated
{
{
- host->
extension_set(USER_HOST_LEVEL,
nullptr);
+ host->
set_data(
nullptr);
}
// ========= storage related functions ============
}
// ========= storage related functions ============