Rename mc::CheckerAlgorithm to mc::ExplorationAlgorithm, because that's what it is

[simgrid.git] / src / simgrid / sg_config.cpp

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index d7e6bdb895b9b59e04adfbca1b1c29427fc388f4..2ce0de033ace58a2da24605ae9eec83f36e0a705 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -1,22 +1,23 @@
-/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-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. */
 
 /* sg_config: configuration infrastructure for the simulation world         */
 
+#include <simgrid/instr.h>
+#include <simgrid/version.h>
+#include <xbt/config.hpp>
+
 #include "simgrid/sg_config.hpp"
-#include "simgrid/instr.h"
-#include "simgrid/version.h"
 #include "src/instr/instr_private.hpp"
 #include "src/internal_config.h"
+#include "src/kernel/context/Context.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/smpi/include/smpi_config.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
-#include "xbt/config.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid");
 
@@ -201,11 +202,11 @@ static void _sg_cfg_cb__network_model(const std::string& value)
 static void _sg_cfg_cb_contexts_parallel_mode(const std::string& mode_name)
 {
   if (mode_name == "posix") {
-    SIMIX_context_set_parallel_mode(XBT_PARMAP_POSIX);
+    simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_POSIX);
   } else if (mode_name == "futex") {
-    SIMIX_context_set_parallel_mode(XBT_PARMAP_FUTEX);
+    simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_FUTEX);
   } else if (mode_name == "busy_wait") {
-    SIMIX_context_set_parallel_mode(XBT_PARMAP_BUSY_WAIT);
+    simgrid::kernel::context::set_parallel_mode(XBT_PARMAP_BUSY_WAIT);
   } else {
     xbt_die("Command line setting of the parallel synchronization mode should "
             "be one of \"posix\", \"futex\" or \"busy_wait\"");
@@ -265,6 +266,14 @@ void sg_config_init(int *argc, char **argv)
                              "Maximum number of concurrent variables in the maxmim system. Also limits the number of "
                              "processes on each host, at higher level. (default: -1 means no such limitation)");
 
+  simgrid::config::bind_flag(sg_bmf_max_iterations, "bmf/max-iterations",
+                             "Maximum number of steps to be performed while searching for a BMF allocation");
+
+  simgrid::config::declare_flag<bool>("bmf/selective-update",
+                                      "Update the constraint set propagating recursively to others constraints "
+                                      "(off by default)",
+                                      false);
+
   /* The parameters of network models */
 
   sg_latency_factor = 13.01; // comes from the default LV08 network model
@@ -308,7 +317,7 @@ void sg_config_init(int *argc, char **argv)
                                       "no");
 
   simgrid::config::declare_flag<int>("contexts/stack-size", "Stack size of contexts in KiB (not with threads)",
-                                     8 * 1024, [](int value) { smx_context_stack_size = value * 1024; });
+                                     8 * 1024, [](int value) { simgrid::kernel::context::stack_size = value * 1024; });
 
   /* guard size for contexts stacks in memory pages */
 #if defined(_WIN32) || (PTH_STACKGROWTH != -1)
@@ -318,9 +327,9 @@ void sg_config_init(int *argc, char **argv)
 #endif
   simgrid::config::declare_flag<int>("contexts/guard-size", "Guard size for contexts stacks in memory pages",
                                      default_guard_size,
-                                     [](int value) { smx_context_guard_size = value * xbt_pagesize; });
+                                     [](int value) { simgrid::kernel::context::guard_size = value * xbt_pagesize; });
   simgrid::config::declare_flag<int>("contexts/nthreads", "Number of parallel threads used to execute user contexts", 1,
-                                     &SIMIX_context_set_nthreads);
+                                     &simgrid::kernel::context::set_nthreads);
 
   /* synchronization mode for parallel user contexts */
 #if HAVE_FUTEX_H
@@ -360,7 +369,7 @@ void sg_config_init(int *argc, char **argv)
 
   sg_config_cmd_line(argc, argv);
 
-  xbt_mallocator_initialization_is_done(SIMIX_context_is_parallel());
+  xbt_mallocator_initialization_is_done(simgrid::kernel::context::is_parallel());
 }
 
 void sg_config_finalize()