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
requalify a tesh
[simgrid.git]
/
src
/
simix
/
smx_environment.c
diff --git
a/src/simix/smx_environment.c
b/src/simix/smx_environment.c
index
8f60fcc
..
b8655fa
100644
(file)
--- a/
src/simix/smx_environment.c
+++ b/
src/simix/smx_environment.c
@@
-1,14
+1,15
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2013
. 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. */
* 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. */
-#include "private.h"
+#include "
smx_
private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/xbt_os_time.h"
#include "xbt/config.h"
#include "xbt/sysdep.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)");
@@
-32,27
+33,33
@@
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;
- char *name = NULL;
- void *workstation = NULL;
-
double start, end;
double start, end;
- //First pass of platform file
- surf_config_add_callback();
- parse_platform_file(file);
-
- surf_config_models_setup(file);
- parse_platform_file(file);
- surf_config_models_create_elms();
start = xbt_os_time();
start = xbt_os_time();
- /* FIXME: what time are we measuring ??? */
+ parse_platform_file(file);
end = xbt_os_time();
end = xbt_os_time();
- DEBUG1("PARSE TIME: %lg", (end - start));
+ XBT_DEBUG("PARSE TIME: %g", (end - start));
+
+}
+
+void SIMIX_post_create_environment(void) {
+
+ void **workstation = NULL;
+ void **storage = NULL;
+ xbt_lib_cursor_t cursor = NULL;
+ char *name = NULL;
- xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
- name, workstation) {
- SIMIX_host_create(name, workstation, NULL);
+ /* Create host at SIMIX level */
+ xbt_lib_foreach(host_lib, cursor, name, workstation) {
+ if(workstation[SURF_WKS_LEVEL])
+ SIMIX_host_create(name, workstation[SURF_WKS_LEVEL], NULL);
}
}
+
+ /* Create storage at SIMIX level */
+ xbt_lib_foreach(storage_lib, cursor, name, storage) {
+ if(storage[SURF_STORAGE_LEVEL])
+ SIMIX_storage_create(name, storage[SURF_STORAGE_LEVEL], NULL);
+ }
+
surf_presolve();
}
surf_presolve();
}