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
nicer API to the Netcard type
[simgrid.git]
/
src
/
simgrid
/
host.cpp
diff --git
a/src/simgrid/host.cpp
b/src/simgrid/host.cpp
index
031e452
..
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");
@@
-29,14
+30,14
@@
size_t sg_host_count()
* internally).
* \see sg_host_count()
*/
* internally).
* \see sg_host_count()
*/
-
const
sg_host_t *sg_host_list(void) {
+sg_host_t *sg_host_list(void) {
xbt_assert(sg_host_count() > 0, "There is no host!");
return (sg_host_t*)xbt_dynar_to_array(sg_hosts_as_dynar());
}
const char *sg_host_get_name(sg_host_t host)
{
xbt_assert(sg_host_count() > 0, "There is no host!");
return (sg_host_t*)xbt_dynar_to_array(sg_hosts_as_dynar());
}
const char *sg_host_get_name(sg_host_t host)
{
-
return host->name().c_str();
+ return host->name().c_str();
}
void* sg_host_extension_get(sg_host_t host, size_t ext)
}
void* sg_host_extension_get(sg_host_t host, size_t ext)
@@
-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
(routing_get_network_element_type(name) == 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);
}
@@
-107,7
+103,7
@@
void sg_host_user_destroy(sg_host_t host) {
// ========== MSG Layer ==============
msg_host_priv_t sg_host_msg(sg_host_t host) {
// ========== MSG Layer ==============
msg_host_priv_t sg_host_msg(sg_host_t host) {
-
return (msg_host_priv_t) host->extension(MSG_HOST_LEVEL);
+ return (msg_host_priv_t) host->extension(MSG_HOST_LEVEL);
}
void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
host->extension_set(MSG_HOST_LEVEL, smx_host);
}
void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
host->extension_set(MSG_HOST_LEVEL, smx_host);
@@
-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();
}
}
@@
-157,7
+153,7
@@
int sg_host_core_count(sg_host_t host) {
* @return 1 if the host is active or 0 if it has crashed.
*/
int sg_host_is_on(sg_host_t host) {
* @return 1 if the host is active or 0 if it has crashed.
*/
int sg_host_is_on(sg_host_t host) {
- return host->is
_o
n();
+ return host->is
O
n();
}
/** @brief Returns the number of power states for a host.
}
/** @brief Returns the number of power states for a host.
@@
-165,7
+161,7
@@
int sg_host_is_on(sg_host_t host) {
* See also @ref SURF_plugin_energy.
*/
int sg_host_get_nb_pstates(sg_host_t host) {
* See also @ref SURF_plugin_energy.
*/
int sg_host_get_nb_pstates(sg_host_t host) {
- return host->pstates
_c
ount();
+ return host->pstates
C
ount();
}
/** @brief Gets the pstate at which that host currently runs.
}
/** @brief Gets the pstate at which that host currently runs.
@@
-180,7
+176,7
@@
int sg_host_get_pstate(sg_host_t host) {
* See also @ref SURF_plugin_energy.
*/
void sg_host_set_pstate(sg_host_t host,int pstate) {
* See also @ref SURF_plugin_energy.
*/
void sg_host_set_pstate(sg_host_t host,int pstate) {
- host->set
_p
state(pstate);
+ host->set
P
state(pstate);
}
/** @brief Get the properties of an host */
}
/** @brief Get the properties of an host */