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
[mc] Server side symbol evaluation
[simgrid.git]
/
src
/
simix
/
smx_environment.c
diff --git
a/src/simix/smx_environment.c
b/src/simix/smx_environment.c
index
dd4709a
..
4754e71
100644
(file)
--- a/
src/simix/smx_environment.c
+++ b/
src/simix/smx_environment.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-33,24
+33,34
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
*/
void SIMIX_create_environment(const char *file)
{
*/
void SIMIX_create_environment(const char *file)
{
- double start
, end
;
-
- start = xbt_os_time();
+ double start
= 0, end = 0
;
+ if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
+
start = xbt_os_time();
parse_platform_file(file);
parse_platform_file(file);
- end = xbt_os_time();
- XBT_DEBUG("PARSE TIME: %lg", (end - start));
+ if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
+ end = xbt_os_time();
+ XBT_DEBUG("PARSE TIME: %g", (end - start));
}
void SIMIX_post_create_environment(void) {
void **workstation = NULL;
}
void SIMIX_post_create_environment(void) {
void **workstation = NULL;
+ void **storage = NULL;
xbt_lib_cursor_t cursor = NULL;
char *name = NULL;
xbt_lib_cursor_t cursor = NULL;
char *name = 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);
}
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();
}