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
Typos
[simgrid.git]
/
src
/
msg
/
host.c
diff --git
a/src/msg/host.c
b/src/msg/host.c
index
62ca0d8
..
d1425a2
100644
(file)
--- a/
src/msg/host.c
+++ b/
src/msg/host.c
@@
-69,8
+69,8
@@
m_host_t __MSG_host_create(smx_host_t workstation, void *data)
*/
MSG_error_t MSG_host_set_data(m_host_t host, void *data)
{
*/
MSG_error_t MSG_host_set_data(m_host_t host, void *data)
{
- xbt_assert
0
((host != NULL), "Invalid parameters");
- xbt_assert
0
((host->data == NULL), "Data already set");
+ xbt_assert((host != NULL), "Invalid parameters");
+ xbt_assert((host->data == NULL), "Data already set");
/* Assign data */
host->data = data;
/* Assign data */
host->data = data;
@@
-88,7
+88,7
@@
MSG_error_t MSG_host_set_data(m_host_t host, void *data)
void *MSG_host_get_data(m_host_t host)
{
void *MSG_host_get_data(m_host_t host)
{
- xbt_assert
0
((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
/* Return data */
return (host->data);
/* Return data */
return (host->data);
@@
-104,7
+104,7
@@
void *MSG_host_get_data(m_host_t host)
const char *MSG_host_get_name(m_host_t host)
{
const char *MSG_host_get_name(m_host_t host)
{
- xbt_assert
0
((host != NULL)
+ xbt_assert((host != NULL)
&& (host->simdata != NULL), "Invalid parameters");
/* Return data */
&& (host->simdata != NULL), "Invalid parameters");
/* Return data */
@@
-120,28
+120,19
@@
m_host_t MSG_host_self(void)
return MSG_process_get_host(MSG_process_self());
}
return MSG_process_get_host(MSG_process_self());
}
-/*
- *
Real function to destroy a host.
- *
MSG_host_destroy is just a front_end that also removes it from
+/*
* \ingroup m_host_management
+ *
+ *
\brief Destroys a host
*/
void __MSG_host_destroy(m_host_t host)
{
simdata_host_t simdata = NULL;
*/
void __MSG_host_destroy(m_host_t host)
{
simdata_host_t simdata = NULL;
- int i = 0;
- char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */
- xbt_assert
0
((host != NULL), "Invalid parameters");
+ xbt_assert((host != NULL), "Invalid parameters");
- /* Clean Simulator data */
- /* SIMIX host will be cleaned when MSG_clean calls SIMIX_clean */
+ /* Clean simulator data */
simdata = (host)->simdata;
simdata = (host)->simdata;
- for (i = 0; i < msg_global->max_channel; i++) {
- sprintf(alias, "%s:%d", host->name, i);
- MSG_mailbox_free((void *) (simdata->mailboxes[i]));
- memset(alias, 0, MAX_ALIAS_NAME + 1);
- }
-
if (msg_global->max_channel > 0)
free(simdata->mailboxes);
if (msg_global->max_channel > 0)
free(simdata->mailboxes);
@@
-190,7
+181,7
@@
m_host_t *MSG_get_host_table(void)
*/
int MSG_get_host_msgload(m_host_t h)
{
*/
int MSG_get_host_msgload(m_host_t h)
{
- xbt_assert
0
((h != NULL), "Invalid parameters");
+ xbt_assert((h != NULL), "Invalid parameters");
xbt_die( "Not implemented yet");
return (0);
xbt_die( "Not implemented yet");
return (0);
@@
-202,7
+193,7
@@
int MSG_get_host_msgload(m_host_t h)
*/
double MSG_get_host_speed(m_host_t h)
{
*/
double MSG_get_host_speed(m_host_t h)
{
- xbt_assert
0
((h != NULL), "Invalid parameters");
+ xbt_assert((h != NULL), "Invalid parameters");
return (SIMIX_req_host_get_speed(h->simdata->smx_host));
}
return (SIMIX_req_host_get_speed(h->simdata->smx_host));
}
@@
-227,7
+218,7
@@
const char *MSG_host_get_property_value(m_host_t host, const char *name)
*/
xbt_dict_t MSG_host_get_properties(m_host_t host)
{
*/
xbt_dict_t MSG_host_get_properties(m_host_t host)
{
- xbt_assert
0
((host != NULL), "Invalid parameters (host is NULL)");
+ xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
return (SIMIX_req_host_get_properties(host->simdata->smx_host));
}
return (SIMIX_req_host_get_properties(host->simdata->smx_host));
}
@@
-240,6
+231,6
@@
xbt_dict_t MSG_host_get_properties(m_host_t host)
*/
int MSG_host_is_avail(m_host_t h)
{
*/
int MSG_host_is_avail(m_host_t h)
{
- xbt_assert
0
((h != NULL), "Invalid parameters (host is NULL)");
+ xbt_assert((h != NULL), "Invalid parameters (host is NULL)");
return (SIMIX_req_host_get_state(h->simdata->smx_host));
}
return (SIMIX_req_host_get_state(h->simdata->smx_host));
}