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' of github.com:mquinson/simgrid
[simgrid.git]
/
src
/
simgrid
/
host.cpp
diff --git
a/src/simgrid/host.cpp
b/src/simgrid/host.cpp
index
9b7c46c
..
98049d9
100644
(file)
--- a/
src/simgrid/host.cpp
+++ b/
src/simgrid/host.cpp
@@
-8,10
+8,11
@@
#include "simgrid/host.h"
#include <xbt/Extendable.hpp>
#include <simgrid/s4u/host.hpp>
#include "simgrid/host.h"
#include <xbt/Extendable.hpp>
#include <simgrid/s4u/host.hpp>
+
+#include "src/surf/HostImpl.hpp"
#include "surf/surf.h" // routing_get_network_element_type FIXME:killme
#include "src/simix/smx_private.hpp"
#include "surf/surf.h" // routing_get_network_element_type FIXME:killme
#include "src/simix/smx_private.hpp"
-#include "src/surf/host_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sg_host, sd, "Logging specific to sg_hosts");
@@
-67,7
+68,7
@@
xbt_dynar_t sg_hosts_as_dynar(void)
const char* name = nullptr;
simgrid::s4u::Host* host = nullptr;
xbt_dict_foreach(host_list, cursor, name, host)
const char* name = nullptr;
simgrid::s4u::Host* host = nullptr;
xbt_dict_foreach(host_list, cursor, name, host)
- if (host && host->pimpl_netcard && host->pimpl_netcard->
getRcType() == SURF_NETWORK_ELEMENT_HOST
)
+ if (host && host->pimpl_netcard && host->pimpl_netcard->
isHost()
)
xbt_dynar_push(res, &host);
return res;
}
xbt_dynar_push(res, &host);
return res;
}
@@
-85,11
+86,6
@@
void sg_host_init()
__MSG_host_priv_free((msg_host_priv_t) p);
});
__MSG_host_priv_free((msg_host_priv_t) p);
});
- ROUTING_HOST_LEVEL = simgrid::s4u::Host::extension_create([](void *p) {
- delete static_cast<simgrid::surf::NetCard*>(p);
- });
-
- SD_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL);
SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy);
USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL);
}
SIMIX_HOST_LEVEL = simgrid::s4u::Host::extension_create(SIMIX_host_destroy);
USER_HOST_LEVEL = simgrid::s4u::Host::extension_create(NULL);
}
@@
-126,11
+122,11
@@
void sg_host_simix_destroy(sg_host_t host) {
// ========= storage related functions ============
xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
// ========= storage related functions ============
xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host){
- return host->extension<simgrid::surf::Host>()->getMountedStorageList();
+ return host->extension<simgrid::surf::Host
Impl
>()->getMountedStorageList();
}
xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
}
xbt_dynar_t sg_host_get_attached_storage_list(sg_host_t host){
- return host->extension<simgrid::surf::Host>()->getAttachedStorageList();
+ return host->extension<simgrid::surf::Host
Impl
>()->getAttachedStorageList();
}
}