Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Commit 8911ef3c authored by MOMMESSIN Clement's avatar MOMMESSIN Clement
Browse files

[code] Replace list into vector for list of SG options

parent ee3f16bb
......@@ -536,17 +536,8 @@ Other options:
main_args.program_type = ProgramType::BATSIM;
}
vector<string> sg_cfg_list = args["--sg-cfg"].asStringList();
for (string cfg_string : sg_cfg_list)
{
main_args.simgrid_config.push_back(cfg_string);
}
vector<string> sg_log_list = args["--sg-log"].asStringList();
for (string log_string : sg_log_list)
{
main_args.simgrid_logging.push_back(log_string);
}
main_args.simgrid_config = args["--sg-cfg"].asStringList();
main_args.simgrid_config = args["--sg-log"].asStringList();
run_simulation = !error;
}
......@@ -759,21 +750,15 @@ int main(int argc, char * argv[])
simgrid::s4u::Engine engine(&argc, argv);
// Setting SimGrid configuration options, if any
if (main_args.simgrid_config.size() > 0)
for (const string & cfg_string : main_args.simgrid_config)
{
for (string cfg_string : main_args.simgrid_config)
{
engine.set_config(cfg_string);
}
engine.set_config(cfg_string);
}
// Setting SimGrid logging options, if any
if (main_args.simgrid_logging.size() > 0)
for (const string & log_string : main_args.simgrid_logging)
{
for (string log_string : main_args.simgrid_logging)
{
xbt_log_control_set(log_string.c_str());
}
xbt_log_control_set(log_string.c_str());
}
// Let's create the BatsimContext, which stores information about the current instance
......
......@@ -3,6 +3,7 @@
#include <string>
#include <list>
#include <map>
#include <vector>
#include <rapidjson/document.h>
......@@ -99,8 +100,8 @@ struct MainArguments
bool terminate_with_last_workflow = false; //!< If true, allows to ignore the jobs submitted after the last workflow termination
// Other
std::list<std::string> simgrid_config; //!< The list of configuration options to pass to SimGrid.
std::list<std::string> simgrid_logging; //!< The list of simulation logging options to pass to SimGrid.
std::vector<std::string> simgrid_config; //!< The list of configuration options to pass to SimGrid.
std::vector<std::string> simgrid_logging; //!< The list of simulation logging options to pass to SimGrid.
bool dump_execution_context = false; //!< Instead of running the simulation, print the execution context as JSON on the standard output.
bool allow_time_sharing_on_compute = false; //!< Allows/forbids time sharing on compute machines. Two jobs can run on the same machine if and only if time sharing is allowed.
bool allow_time_sharing_on_storage = false; //!< Allows/forbids time sharing on storage machines. Two jobs can run on the same machine if and only if time sharing is allowed.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment