Use existing XBT macro to declare enum class Simcall.

diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp
index 74bf611..135fdcc 100644 (file)
--- a/src/simix/popping.cpp
+++ b/src/simix/popping.cpp
@@ -12,12 +12,6 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(simix, "transmuting from user request into kernel handlers");
 
-constexpr std::array<const char*, simgrid::simix::NUM_SIMCALLS> simcall_names{{
-    "Simcall::NONE",
-    "Simcall::RUN_ANSWERED",
-    "Simcall::RUN_BLOCKING",
-}};
-
 /** @private
  * @brief (in kernel mode) unpack the simcall and activate the handler
  *
@@ -49,6 +43,6 @@ const char* SIMIX_simcall_name(const s_smx_simcall& simcall)
       cname += 17; // strip prefix "simgrid::kernel::"
     return cname;
   } else {
-    return simcall_names.at(static_cast<int>(simcall.call_));
+    return to_c_str(simcall.call_);
   }
 }

diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp
index 308d3f3..3e574c9 100644 (file)
--- a/src/simix/popping_private.hpp
+++ b/src/simix/popping_private.hpp
@@ -16,12 +16,7 @@
 namespace simgrid {
 namespace simix {
 /** All possible simcalls. */
-enum class Simcall {
-  NONE,
-  RUN_ANSWERED,
-  RUN_BLOCKING,
-};
-constexpr int NUM_SIMCALLS = 3;
+XBT_DECLARE_ENUM_CLASS(Simcall, NONE, RUN_ANSWERED, RUN_BLOCKING);
 } // namespace simix
 } // namespace simgrid