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
Make msg_comm_t be a real structure again, not an alias of smx_comm_t.
[simgrid.git]
/
src
/
simix
/
smx_environment.c
diff --git
a/src/simix/smx_environment.c
b/src/simix/smx_environment.c
index
979958d
..
6c46122
100644
(file)
--- a/
src/simix/smx_environment.c
+++ b/
src/simix/smx_environment.c
@@
-1,7
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
- All rights reserved. */
+/* Copyright (c) 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. */
@@
-11,6
+9,7
@@
#include "xbt/log.h"
#include "xbt/xbt_os_time.h"
#include "xbt/config.h"
#include "xbt/log.h"
#include "xbt/xbt_os_time.h"
#include "xbt/config.h"
+#include "surf/surfxml_parse.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
"Logging specific to SIMIX (environment)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
"Logging specific to SIMIX (environment)");
@@
-34,24
+33,30
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
*/
void SIMIX_create_environment(const char *file)
{
*/
void SIMIX_create_environment(const char *file)
{
-
xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = NULL;
char *name = NULL;
void *workstation = NULL;
double start, end;
char *name = NULL;
void *workstation = NULL;
double start, end;
- surf_timer_model_init(file);
- surf_config_models_setup(file);
+ platform_filename = bprintf("%s",file);
+
+ // Reset callbacks
+ surf_parse_reset_callbacks();
+ // Add config callbacks
+ surf_parse_add_callback_config();
+
parse_platform_file(file);
surf_config_models_create_elms();
parse_platform_file(file);
surf_config_models_create_elms();
- start = xbt_os_time();
+ start = xbt_os_time();
+ /* FIXME: what time are we measuring ??? */
end = xbt_os_time();
DEBUG1("PARSE TIME: %lg", (end - start));
end = xbt_os_time();
DEBUG1("PARSE TIME: %lg", (end - start));
- xbt_dict_foreach(workstation_set, cursor, name, workstation) {
- __SIMIX_host_create(name, workstation, NULL);
+ xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
+ name, workstation) {
+ SIMIX_host_create(name, workstation, NULL);
}
}
-
- return;
+ surf_presolve();
}
}