-/* Copyright (c) 2004-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2023. 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 <simgrid/s4u/Engine.hpp>
+#include <xbt/module.h>
+
#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 <fstream>
#include <string>
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
XBT_LOG_NEW_CATEGORY(surf, "All SURF categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)");
simgrid::kernel::profile::FutureEvtSet future_evt_set;
std::vector<std::string> surf_path;
-/* Don't forget to update the option description in smx_config when you change this */
const std::vector<surf_model_description_t> surf_network_model_description = {
{"LV08",
"Realistic network analytic model (slow-start modeled by multiplying latency by 13.01, bandwidth by .97; "
};
#if !HAVE_SMPI
-void surf_network_model_init_SMPI()
-{
- xbt_die("Please activate SMPI support in cmake to use the SMPI network model.");
-}
void surf_network_model_init_IB()
{
xbt_die("Please activate SMPI support in cmake to use the IB network model.");
{"Cas01", "Simplistic CPU model (time=size/speed).", &surf_cpu_model_init_Cas01},
};
+const std::vector<surf_model_description_t> surf_disk_model_description = {
+ {"S19", "Simplistic disk model.", &surf_disk_model_init_S19},
+};
+
const std::vector<surf_model_description_t> surf_host_model_description = {
- {"default", "Default host model. Currently, CPU:Cas01 and network:LV08 (with cross traffic enabled)",
+ {"default", "Default host model. Currently, CPU:Cas01, network:LV08 (with cross traffic enabled), and disk:S19",
&surf_host_model_init_current_default},
- {"compound", "Host model that is automatically chosen if you change the network and CPU models",
+ {"compound", "Host model that is automatically chosen if you change the CPU, network, and disk models",
&surf_host_model_init_compound},
- {"ptask_L07", "Host model somehow similar to Cas01+CM02 but allowing parallel tasks",
+ {"ptask_L07", "Host model somehow similar to Cas01+CM02+S19 but allowing parallel tasks",
&surf_host_model_init_ptask_L07},
};
{"Full", "Full update of remaining and variables. Slow but may be useful when debugging.", nullptr},
};
-const std::vector<surf_model_description_t> 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)
{
-#ifdef _WIN32
- WIN32_FIND_DATA wfd = {0};
- HANDLE hFile = FindFirstFile(file_path.c_str(), &wfd);
-
- if (INVALID_HANDLE_VALUE == hFile)
- return false;
-
- FindClose(hFile);
- return true;
-#else
return (file_path.c_str()[0] == '/');
-#endif
}
std::ifstream* surf_ifsopen(const std::string& name)
const surf_model_description_t* find_model_description(const std::vector<surf_model_description_t>& table,
const std::string& name)
{
- auto pos = std::find_if(table.begin(), table.end(),
- [&name](const surf_model_description_t& item) { return item.name == name; });
- if (pos != table.end())
+ if (auto pos = std::find_if(table.begin(), table.end(),
+ [&name](const surf_model_description_t& item) { return item.name == name; });
+ pos != table.end())
return &*pos;
std::string sep;
}
xbt_die("Model '%s' is invalid! Valid models are: %s.", name.c_str(), name_list.c_str());
}
-
-void surf_init(int* argc, char** argv)
-{
- if (xbt_initialized > 0)
- return;
-
- xbt_init(argc, argv);
-
- sg_config_init(argc, argv);
-}
-
-void surf_exit()
-{
- simgrid::s4u::Engine::shutdown();
-
- tmgr_finalize();
- sg_platf_exit();
-
- NOW = 0; /* Just in case the user plans to restart the simulation afterward */
-}
