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
[mc] Remove MC code in sigsegvhandler
[simgrid.git]
/
src
/
msg
/
msg_host.c
diff --git
a/src/msg/msg_host.c
b/src/msg/msg_host.c
index
136a2ec
..
f96e1ee
100644
(file)
--- a/
src/msg/msg_host.c
+++ b/
src/msg/msg_host.c
@@
-4,8
+4,8
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
+#include "
src/
msg/msg_private.h"
+#include "
src/
msg/msg_mailbox.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "simgrid/simix.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "simgrid/simix.h"
@@
-75,7
+75,6
@@
msg_host_t MSG_host_by_name(const char *name)
return (msg_host_t) xbt_lib_get_elm_or_null(host_lib,name);
}
return (msg_host_t) xbt_lib_get_elm_or_null(host_lib,name);
}
-static const char *msg_data = "data";
/** \ingroup m_host_management
*
* \brief Set the user data of a #msg_host_t.
/** \ingroup m_host_management
*
* \brief Set the user data of a #msg_host_t.
@@
-83,9
+82,8
@@
static const char *msg_data = "data";
* This functions checks whether some data has already been associated to \a host
or not and attach \a data to \a host if it is possible.
*/
* This functions checks whether some data has already been associated to \a host
or not and attach \a data to \a host if it is possible.
*/
-msg_error_t MSG_host_set_data(msg_host_t host, void *data)
-{
- MSG_host_set_property_value(host, msg_data, data, NULL);
+msg_error_t MSG_host_set_data(msg_host_t host, void *data) {
+ sg_host_user_set(host, data);
return MSG_OK;
}
return MSG_OK;
}
@@
-96,9
+94,8
@@
msg_error_t MSG_host_set_data(msg_host_t host, void *data)
* This functions checks whether \a host is a valid pointer or not and return
the user data associated to \a host if it is possible.
*/
* This functions checks whether \a host is a valid pointer or not and return
the user data associated to \a host if it is possible.
*/
-void *MSG_host_get_data(msg_host_t host)
-{
- return (void *)MSG_host_get_property_value(host, msg_data);
+void *MSG_host_get_data(msg_host_t host) {
+ return sg_host_user(host);
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
@@
-236,7
+233,7
@@
double MSG_get_host_speed(msg_host_t h)
{
xbt_assert((h != NULL), "Invalid parameters");
{
xbt_assert((h != NULL), "Invalid parameters");
- return
(simcall_host_get_speed(h)
);
+ return
sg_host_get_speed(h
);
}
}
@@
-250,7
+247,7
@@
int MSG_host_get_core_number(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters");
{
xbt_assert((host != NULL), "Invalid parameters");
- return
(simcall_host_get_core(host)
);
+ return
sg_host_get_core(host
);
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
@@
-318,7
+315,7
@@
void MSG_host_set_property_value(msg_host_t host, const char *name, char *value,
int MSG_host_is_on(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
int MSG_host_is_on(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return
(simcall_host_get_state(host)
);
+ return
sg_host_get_state(host
);
}
/** @ingroup m_host_management
*
}
/** @ingroup m_host_management
*
@@
-329,7
+326,7
@@
int MSG_host_is_on(msg_host_t host)
int MSG_host_is_off(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
int MSG_host_is_off(msg_host_t host)
{
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return !(s
imcall
_host_get_state(host));
+ return !(s
g
_host_get_state(host));
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
@@
-383,9
+380,7
@@
double MSG_host_get_current_power_peak(msg_host_t host) {
* \param host host to test
*/
int MSG_host_get_nb_pstates(msg_host_t host) {
* \param host host to test
*/
int MSG_host_get_nb_pstates(msg_host_t host) {
-
- xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return (simcall_host_get_nb_pstates(host));
+ return sg_host_get_nb_pstates(host);
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
@@
-405,7
+400,7
@@
void MSG_host_set_pstate(msg_host_t host, int pstate_index) {
* \param host host to test
*/
int MSG_host_get_pstate(msg_host_t host) {
* \param host host to test
*/
int MSG_host_get_pstate(msg_host_t host) {
- return s
imcall
_host_get_pstate(host);
+ return s
g
_host_get_pstate(host);
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
@@
-416,7
+411,7
@@
int MSG_host_get_pstate(msg_host_t host) {
*/
double MSG_host_get_consumed_energy(msg_host_t host) {
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
*/
double MSG_host_get_consumed_energy(msg_host_t host) {
xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
- return s
imcall
_host_get_consumed_energy(host);
+ return s
g
_host_get_consumed_energy(host);
}
/** \ingroup m_host_management
* \brief Returns the amount of watt dissipated at the given pstate when the host is idling
}
/** \ingroup m_host_management
* \brief Returns the amount of watt dissipated at the given pstate when the host is idling