Replace another handmade binary search.

[simgrid.git] / src / mc / ModelChecker.cpp

diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp
index f4de7fefead5b231bf1c5818149bf50ceabf51d1..30e20e665a555e3329950703a09b2bbc70e64d70 100644 (file)
--- a/src/mc/ModelChecker.cpp
+++ b/src/mc/ModelChecker.cpp
@@ -84,19 +84,18 @@ void ModelChecker::start()
 #endif
 }
 
-static const std::pair<const char*, const char*> ignored_local_variables[] = {
-  std::pair<const char*, const char*>{  "e", "*" },
-  std::pair<const char*, const char*>{ "_log_ev", "*" },
+static constexpr auto ignored_local_variables = {
+    std::make_pair("e", "*"),
+    std::make_pair("_log_ev", "*"),
 
-  /* Ignore local variable about time used for tracing */
-  std::pair<const char*, const char*>{ "start_time", "*" },
+    /* Ignore local variable about time used for tracing */
+    std::make_pair("start_time", "*"),
 };
 
 void ModelChecker::setup_ignore()
 {
-  RemoteSimulation& process = this->get_remote_simulation();
-  for (std::pair<const char*, const char*> const& var :
-      ignored_local_variables)
+  const RemoteSimulation& process = this->get_remote_simulation();
+  for (auto const& var : ignored_local_variables)
     process.ignore_local_variable(var.first, var.second);
 
   /* Static variable used for tracing */
@@ -105,7 +104,7 @@ void ModelChecker::setup_ignore()
 
 void ModelChecker::shutdown()
 {
-  XBT_DEBUG("Shuting down model-checker");
+  XBT_DEBUG("Shutting down model-checker");
 
   RemoteSimulation* process = &this->get_remote_simulation();
   if (process->running()) {
@@ -169,7 +168,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size)
   case MC_MESSAGE_IGNORE_HEAP:
     {
     s_mc_message_ignore_heap_t message;
-    xbt_assert(size == sizeof(message), "Broken messsage");
+    xbt_assert(size == sizeof(message), "Broken message");
     memcpy(&message, buffer, sizeof(message));
 
     IgnoredHeapRegion region;
@@ -184,7 +183,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size)
   case MC_MESSAGE_UNIGNORE_HEAP:
     {
     s_mc_message_ignore_memory_t message;
-    xbt_assert(size == sizeof(message), "Broken messsage");
+    xbt_assert(size == sizeof(message), "Broken message");
     memcpy(&message, buffer, sizeof(message));
     get_remote_simulation().unignore_heap((void*)(std::uintptr_t)message.addr, message.size);
     break;
@@ -193,7 +192,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size)
   case MC_MESSAGE_IGNORE_MEMORY:
     {
     s_mc_message_ignore_memory_t message;
-    xbt_assert(size == sizeof(message), "Broken messsage");
+    xbt_assert(size == sizeof(message), "Broken message");
     memcpy(&message, buffer, sizeof(message));
     this->get_remote_simulation().ignore_region(message.addr, message.size);
     break;
@@ -202,7 +201,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size)
   case MC_MESSAGE_STACK_REGION:
     {
     s_mc_message_stack_region_t message;
-    xbt_assert(size == sizeof(message), "Broken messsage");
+    xbt_assert(size == sizeof(message), "Broken message");
     memcpy(&message, buffer, sizeof(message));
     this->get_remote_simulation().stack_areas().push_back(message.stack_region);
     }
@@ -219,7 +218,7 @@ bool ModelChecker::handle_message(const char* buffer, ssize_t size)
     if (property_automaton == nullptr)
       property_automaton = xbt_automaton_new();
 
-    RemoteSimulation* process = &this->get_remote_simulation();
+    const RemoteSimulation* process = &this->get_remote_simulation();
     RemotePtr<int> address = remote((int*)message.data);
     xbt::add_proposition(property_automaton, message.name, [process, address]() { return process->read(address); });