Make SimcallInspector::dot_label and to_string pure virtual again.

It was wronly removed in commit 99b0a6c6788a22a446be3519233dd524a44f1ffd.

diff --git a/src/mc/checker/SimcallInspector.cpp b/src/mc/checker/SimcallInspector.cpp
index ff08bc9..4f46a34 100644 (file)
--- a/src/mc/checker/SimcallInspector.cpp
+++ b/src/mc/checker/SimcallInspector.cpp
@@ -14,25 +14,25 @@ namespace mc {
 
 std::string SimcallInspector::to_string(int /*time_considered*/) const
 {
-  return simgrid::xbt::string_printf("[(%ld)%s (%s)] ", get_issuer()->get_pid(), issuer_->get_host()->get_cname(),
+  return simgrid::xbt::string_printf("[(%ld)%s (%s)] ", issuer_->get_pid(), issuer_->get_host()->get_cname(),
                                      issuer_->get_cname());
 }
 
-std::string RandomSimcall::to_string(int time_considered) const
+std::string SimcallInspector::dot_label() const
 {
-  return SimcallInspector::to_string(time_considered) + "MC_RANDOM(" + std::to_string(time_considered) + ")";
+  if (issuer_->get_host())
+    return xbt::string_printf("[(%ld)%s] ", issuer_->get_pid(), issuer_->get_cname());
+  return xbt::string_printf("[(%ld)] ", issuer_->get_pid());
 }
 
-std::string SimcallInspector::dot_label() const
+std::string RandomSimcall::to_string(int time_considered) const
 {
-  if (issuer_->get_host())
-    return xbt::string_printf("[(%ld)%s]", issuer_->get_pid(), issuer_->get_cname());
-  return xbt::string_printf("[(%ld)]", issuer_->get_pid());
+  return SimcallInspector::to_string(time_considered) + "MC_RANDOM(" + std::to_string(time_considered) + ")";
 }
 
 std::string RandomSimcall::dot_label() const
 {
-  return SimcallInspector::dot_label() + " MC_RANDOM (" + std::to_string(next_value_) + ")";
+  return SimcallInspector::dot_label() + "MC_RANDOM(" + std::to_string(next_value_) + ")";
 }
 
 void RandomSimcall::prepare(int times_considered)

diff --git a/src/mc/checker/SimcallInspector.hpp b/src/mc/checker/SimcallInspector.hpp
index a2687c4..fccf60b 100644 (file)
--- a/src/mc/checker/SimcallInspector.hpp
+++ b/src/mc/checker/SimcallInspector.hpp
@@ -48,8 +48,8 @@ public:
   /** Some simcalls may only be observable under some circumstances.
    * Most simcalls are not visible from the MC because they don't have an inspector at all. */
   virtual bool is_visible() const { return true; }
-  virtual std::string to_string(int times_considered) const;
-  virtual std::string dot_label() const;
+  virtual std::string to_string(int times_considered) const = 0;
+  virtual std::string dot_label() const                     = 0;
 };
 
 class RandomSimcall : public SimcallInspector {

diff --git a/src/simix/simcalls.in b/src/simix/simcalls.in
index 3213a56..31eee3f 100644 (file)
--- a/src/simix/simcalls.in
+++ b/src/simix/simcalls.in
@@ -56,7 +56,5 @@ int        cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout)
 void      sem_acquire(smx_sem_t sem) [[block]];
 int       sem_acquire_timeout(smx_sem_t sem, double timeout) [[block]];
 
-#int        mc_random(int min, int max);
-
 void       run_kernel(std::function<void()> const* code) [[nohandler]];
 void       run_blocking(std::function<void()> const* code) [[block,nohandler]];