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
Change variable waiting_task to waiting_action on msg process control.
[simgrid.git]
/
src
/
msg
/
environment.c
diff --git
a/src/msg/environment.c
b/src/msg/environment.c
index
8dfe4d0
..
fa6accc
100644
(file)
--- a/
src/msg/environment.c
+++ b/
src/msg/environment.c
@@
-10,6
+10,7
@@
#include "msg/private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "msg/private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
+#include "xbt/dict.h"
/** \defgroup msg_easier_life Platform and Application management
* \brief This section describes functions to manage the platform creation
/** \defgroup msg_easier_life Platform and Application management
* \brief This section describes functions to manage the platform creation
@@
-33,12
+34,12
@@
m_host_t MSG_get_host_by_name(const char *name)
{
smx_host_t simix_h = NULL;
m_host_t MSG_get_host_by_name(const char *name)
{
smx_host_t simix_h = NULL;
-
simix_h = SIMIX_host_get_by_name(name);
simix_h = SIMIX_host_get_by_name(name);
- if (simix_h == NULL) {
+
+ if (simix_h == NULL)
return NULL;
return NULL;
- } else
-
return (m_host_t) simix_h->data
;
+
+
return (m_host_t)SIMIX_host_get_data(simix_h)
;
}
/** \ingroup msg_easier_life
}
/** \ingroup msg_easier_life
@@
-49,7
+50,7
@@
m_host_t MSG_get_host_by_name(const char *name)
* \param file a filename of a xml description of a platform. This file
* follows this DTD :
*
* \param file a filename of a xml description of a platform. This file
* follows this DTD :
*
- * \include s
urfxml
.dtd
+ * \include s
imgrid
.dtd
*
* Here is a small example of such a platform
*
*
* Here is a small example of such a platform
*
@@
-59,16
+60,16
@@
m_host_t MSG_get_host_by_name(const char *name)
*/
void MSG_create_environment(const char *file)
{
*/
void MSG_create_environment(const char *file)
{
- smx_host_t *workstation = NULL;
- int i;
+ xbt_dict_cursor_t c;
+ smx_host_t h;
+ char *name;
SIMIX_create_environment(file);
SIMIX_create_environment(file);
+ SIMIX_init();
/* Initialize MSG hosts */
/* Initialize MSG hosts */
- workstation = SIMIX_host_get_table();
- for (i = 0; i < SIMIX_host_get_number(); i++) {
- __MSG_host_create(workstation[i], NULL);
+ xbt_dict_foreach(SIMIX_host_get_dict(), c, name, h) {
+ __MSG_host_create(h, NULL);
}
}
- xbt_free(workstation);
return;
}
return;
}