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
use a typed extension for simix::Host
[simgrid.git]
/
src
/
simgrid
/
host.cpp
diff --git
a/src/simgrid/host.cpp
b/src/simgrid/host.cpp
index
78ce58d
..
1d32fc2
100644
(file)
--- a/
src/simgrid/host.cpp
+++ b/
src/simgrid/host.cpp
@@
-28,7
+28,7
@@
size_t sg_host_count()
* internally).
* \see sg_host_count()
*/
* internally).
* \see sg_host_count()
*/
-sg_host_t *sg_host_list(
void
) {
+sg_host_t *sg_host_list() {
xbt_assert(sg_host_count() > 0, "There is no host!");
return (sg_host_t*)xbt_dynar_to_array(sg_hosts_as_dynar());
}
xbt_assert(sg_host_count() > 0, "There is no host!");
return (sg_host_t*)xbt_dynar_to_array(sg_hosts_as_dynar());
}
@@
-53,14
+53,9
@@
sg_host_t sg_host_by_name(const char *name)
return simgrid::s4u::Host::by_name_or_null(name);
}
return simgrid::s4u::Host::by_name_or_null(name);
}
-
sg_host_t sg_host_by_name_or_create(const char *name
)
+
xbt_dynar_t sg_hosts_as_dynar(
)
{
{
- return simgrid::s4u::Host::by_name_or_create(name);
-}
-
-xbt_dynar_t sg_hosts_as_dynar(void)
-{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),NULL);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t),nullptr);
xbt_dict_cursor_t cursor = nullptr;
const char* name = nullptr;
xbt_dict_cursor_t cursor = nullptr;
const char* name = nullptr;
@@
-96,14
+91,15
@@
void sg_host_msg_set(sg_host_t host, msg_host_priv_t smx_host) {
}
// ========== Simix layer =============
}
// ========== Simix layer =============
+#include "src/simix/smx_host_private.h"
smx_host_priv_t sg_host_simix(sg_host_t host){
smx_host_priv_t sg_host_simix(sg_host_t host){
- return
(smx_host_priv_t) host->extension(SIMIX_HOST_LEVEL
);
+ return
host->extension<simgrid::simix::Host>(
);
}
void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) {
}
void sg_host_simix_set(sg_host_t host, smx_host_priv_t smx_host) {
- host->extension_set
(SIMIX_HOST_LEVEL,
smx_host);
+ host->extension_set
<simgrid::simix::Host>(
smx_host);
}
void sg_host_simix_destroy(sg_host_t host) {
}
void sg_host_simix_destroy(sg_host_t host) {
- host->extension_set
(SIMIX_HOST_LEVEL,
nullptr);
+ host->extension_set
<simgrid::simix::Host>(
nullptr);
}
// ========= storage related functions ============
}
// ========= storage related functions ============
@@
-162,7
+158,7
@@
xbt_dict_t sg_host_get_properties(sg_host_t host) {
*
* \param host a host
* \param name a property name
*
* \param host a host
* \param name a property name
- * \return value of a property (or
NULL
if property not set)
+ * \return value of a property (or
nullptr
if property not set)
*/
const char *sg_host_get_property_value(sg_host_t host, const char *name)
{
*/
const char *sg_host_get_property_value(sg_host_t host, const char *name)
{
@@
-173,7
+169,7
@@
const char *sg_host_get_property_value(sg_host_t host, const char *name)
void sg_host_dump(sg_host_t host)
{
xbt_dict_t props;
void sg_host_dump(sg_host_t host)
{
xbt_dict_t props;
- xbt_dict_cursor_t cursor=
NULL
;
+ xbt_dict_cursor_t cursor=
nullptr
;
char *key,*data;
XBT_INFO("Displaying host %s", sg_host_get_name(host));
char *key,*data;
XBT_INFO("Displaying host %s", sg_host_get_name(host));