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
Chord: reproduce the scenario of the Oversim paper
[simgrid.git]
/
src
/
msg
/
host.c
diff --git
a/src/msg/host.c
b/src/msg/host.c
index
f5d3057
..
f5cbf87
100644
(file)
--- a/
src/msg/host.c
+++ b/
src/msg/host.c
@@
-1,8
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2002-2007 Arnaud Legrand. */
-/* Copyright (c) 2007 Bruno Donassolo. */
-/* All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* 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. */
@@
-53,13
+50,11
@@
m_host_t __MSG_host_create(smx_host_t workstation, void *data)
sprintf(alias, "%s:%d", name, i);
/* the key of the mailbox (in this case) is build from the name of the host and the channel number */
sprintf(alias, "%s:%d", name, i);
/* the key of the mailbox (in this case) is build from the name of the host and the channel number */
- simdata->mailboxes[i] = MSG_mailbox_create(alias);
- MSG_mailbox_set_hostname(simdata->mailboxes[i], name);
+ simdata->mailboxes[i] = MSG_mailbox_new(alias);
memset(alias, 0, MAX_ALIAS_NAME + 1);
}
memset(alias, 0, MAX_ALIAS_NAME + 1);
}
- simdata->mutex = SIMIX_mutex_init();
- SIMIX_host_set_data(workstation, host);
+ SIMIX_req_host_set_data(workstation, host);
/* Update global variables */
xbt_fifo_unshift(msg_global->host, host);
/* Update global variables */
xbt_fifo_unshift(msg_global->host, host);
@@
-152,7
+147,7
@@
void __MSG_host_destroy(m_host_t host)
if (msg_global->max_channel > 0)
free(simdata->mailboxes);
if (msg_global->max_channel > 0)
free(simdata->mailboxes);
- SIMIX_mutex_destroy(simdata->mutex);
+
free(simdata);
/* Clean host structure */
free(simdata);
/* Clean host structure */
@@
-198,7
+193,7
@@
double MSG_get_host_speed(m_host_t h)
{
xbt_assert0((h != NULL), "Invalid parameters");
{
xbt_assert0((h != NULL), "Invalid parameters");
- return (SIMIX_host_get_speed(h->simdata->smx_host));
+ return (SIMIX_
req_
host_get_speed(h->simdata->smx_host));
}
/** \ingroup m_host_management
}
/** \ingroup m_host_management
@@
-221,9
+216,9
@@
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_assert0((host != NULL), "Invalid parameters");
+ xbt_assert0((host != NULL), "Invalid parameters
(host is NULL)
");
- return (SIMIX_host_get_properties(host->simdata->smx_host));
+ return (SIMIX_
req_
host_get_properties(host->simdata->smx_host));
}
}
@@
-234,6
+229,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_assert0((h != NULL), "Invalid parameters");
- return (SIMIX_host_get_state(h->simdata->smx_host));
+ xbt_assert0((h != NULL), "Invalid parameters
(host is NULL)
");
+ return (SIMIX_
req_
host_get_state(h->simdata->smx_host));
}
}