X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/937e99e97563706a2a6a0aff46e1d1dfb35a4547..7a5cd0c637286493293fa236b002fb3ce03e1469:/src/surf/surf_interface.cpp diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp index 595cdf47f4..766f547117 100644 --- a/src/surf/surf_interface.cpp +++ b/src/surf/surf_interface.cpp @@ -1,19 +1,17 @@ -/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2022. 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 "surf_interface.hpp" +#include +#include + #include "mc/mc.h" -#include "simgrid/s4u/Engine.hpp" #include "simgrid/sg_config.hpp" #include "src/kernel/resource/profile/FutureEvtSet.hpp" #include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/HostImpl.hpp" -#include "src/surf/xml/platf.hpp" -#include "surf/surf.hpp" -#include "xbt/module.h" -#include "xbt/xbt_modinter.h" /* whether initialization was already done */ +#include "src/surf/surf_interface.hpp" #include #include @@ -32,7 +30,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (ke simgrid::kernel::profile::FutureEvtSet future_evt_set; std::vector surf_path; -/* Don't forget to update the option description in smx_config when you change this */ const std::vector surf_network_model_description = { {"LV08", "Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; " @@ -99,13 +96,6 @@ const std::vector surf_disk_model_description = { {"default", "Simplistic disk model.", &surf_disk_model_init_default}, }; -double NOW = 0; - -double surf_get_clock() -{ - return NOW; -} - /* returns whether #file_path is an absolute file path. Surprising, isn't it ? */ static bool is_absolute_file_path(const std::string& file_path) { @@ -188,13 +178,3 @@ const surf_model_description_t* find_model_description(const std::vector 0) - return; - - xbt_init(argc, argv); - - sg_config_init(argc, argv); -}