X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1555ef43eee251e5892a2f7fd49bc96e99d68fef..c1194401ce4a41ff54a7591f4cf33c9ce2756978:/src/simix/smx_environment.cpp diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp index eb362756b0..e7f2c291f5 100644 --- a/src/simix/smx_environment.cpp +++ b/src/simix/smx_environment.cpp @@ -1,53 +1,12 @@ -/* Copyright (c) 2007-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2019. 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 "smx_private.h" -#include -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "xbt/xbt_os_time.h" -#include "xbt/config.h" +#include +#include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix, - "Logging specific to SIMIX (environment)"); - -/********************************* SIMIX **************************************/ - -/** - * \brief A platform constructor. - * - * Creates a new platform, including hosts, links and the - * routing_table. - * \param file a filename of a xml description of a platform. This file - * follows this DTD : - * - * \include surfxml.dtd - * - * Here is a small example of such a platform - * - * \include small_platform.xml - * - */ -void SIMIX_create_environment(const char *file) -{ - double start = 0, end = 0; - if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug)) - start = xbt_os_time(); - try { - parse_platform_file(file); - } - catch (xbt_ex& e) { - xbt_die("Error while loading %s: %s", file, e.what()); - } - 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 SIMIX_create_environment(const char* file) // XBT_ATTRIB_DEPRECATED_v324 { - surf_presolve(); + simgrid_load_platform(file); }