-/* $Id$ */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
- All rights reserved. */
+/* Copyright (c) 2007-2015. 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. */
-#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 "surf/surfxml_parse.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
"Logging specific to SIMIX (environment)");
*/
void SIMIX_create_environment(const char *file)
{
- xbt_dict_cursor_t cursor = NULL;
- char *name = NULL;
- void *workstation = NULL;
-
- double start, end;
-
- surf_timer_model_init(file);
- surf_config_models_setup(file);
+ double start = 0, end = 0;
+ if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
+ start = xbt_os_time();
parse_platform_file(file);
- surf_config_models_create_elms();
- start = xbt_os_time();
+ if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
+ end = xbt_os_time();
+ XBT_DEBUG("PARSE TIME: %g", (end - start));
- end = xbt_os_time();
- DEBUG1("PARSE TIME: %lg", (end - start));
-
- xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
- name, workstation) {
- __SIMIX_host_create(name, workstation, NULL);
- }
+}
- return;
+void SIMIX_post_create_environment(void)
+{
+ surf_presolve();
}