X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/kernel/actor/SimcallObserver.hpp

diff --git a/src/kernel/actor/SimcallObserver.hpp b/src/kernel/actor/SimcallObserver.hpp
index 6f0e143a74..95f6e25036 100644
--- a/src/kernel/actor/SimcallObserver.hpp
+++ b/src/kernel/actor/SimcallObserver.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-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. */
@@ -7,6 +7,8 @@
 #define SIMGRID_MC_SIMCALL_OBSERVER_HPP
 
 #include "simgrid/forward.h"
+#include "xbt/asserts.h"
+#include "xbt/utility.hpp"
 
 #include <string>
 
@@ -18,6 +20,8 @@ class SimcallObserver {
   ActorImpl* const issuer_;
 
 public:
+  XBT_DECLARE_ENUM_CLASS(Simcall, UNKNOWN, RANDOM, ISEND, IRECV, COMM_WAIT, COMM_TEST);
+
   explicit SimcallObserver(ActorImpl* issuer) : issuer_(issuer) {}
   ActorImpl* get_issuer() const { return issuer_; }
   /** Whether this transition can currently be taken without blocking.
@@ -55,18 +59,21 @@ public:
   /** Computes the dependency relation */
   virtual bool depends(SimcallObserver* other);
 
+  /** Serialize to the given buffer */
+  virtual void serialize(Simcall& type, char* buffer) { type = Simcall::UNKNOWN; }
+
   /** Some simcalls may only be observable under some conditions.
    * Most simcalls are not visible from the MC because they don't have an observer at all. */
   virtual bool is_visible() const { return true; }
-  virtual std::string to_string(int times_considered) const = 0;
-  virtual std::string dot_label() const                     = 0;
+  virtual std::string dot_label(int times_considered) const = 0;
 };
 
 template <class T> class ResultingSimcall : public SimcallObserver {
   T result_;
 
 public:
-  ResultingSimcall(smx_actor_t actor, T default_result) : SimcallObserver(actor), result_(default_result) {}
+  ResultingSimcall() = default;
+  ResultingSimcall(ActorImpl* actor, T default_result) : SimcallObserver(actor), result_(default_result) {}
   void set_result(T res) { result_ = res; }
   T get_result() const { return result_; }
 };
@@ -77,17 +84,20 @@ class RandomSimcall : public SimcallObserver {
   int next_value_ = 0;
 
 public:
-  RandomSimcall(smx_actor_t actor, int min, int max) : SimcallObserver(actor), min_(min), max_(max) {}
+  RandomSimcall(ActorImpl* actor, int min, int max) : SimcallObserver(actor), min_(min), max_(max)
+  {
+    xbt_assert(min < max);
+  }
   SimcallObserver* clone() override
   {
     auto res         = new RandomSimcall(get_issuer(), min_, max_);
     res->next_value_ = next_value_;
     return res;
   }
+  void serialize(Simcall& type, char* buffer) override;
   int get_max_consider() const override;
   void prepare(int times_considered) override;
-  std::string to_string(int times_considered) const override;
-  std::string dot_label() const override;
+  std::string dot_label(int times_considered) const override;
   int get_value() const { return next_value_; }
   bool depends(SimcallObserver* other) override;
 };
@@ -96,7 +106,7 @@ class MutexSimcall : public SimcallObserver {
   activity::MutexImpl* const mutex_;
 
 public:
-  MutexSimcall(smx_actor_t actor, activity::MutexImpl* mutex) : SimcallObserver(actor), mutex_(mutex) {}
+  MutexSimcall(ActorImpl* actor, activity::MutexImpl* mutex) : SimcallObserver(actor), mutex_(mutex) {}
   activity::MutexImpl* get_mutex() const { return mutex_; }
   bool depends(SimcallObserver* other) override;
 };
@@ -106,22 +116,20 @@ class MutexUnlockSimcall : public MutexSimcall {
 
 public:
   SimcallObserver* clone() override { return new MutexUnlockSimcall(get_issuer(), get_mutex()); }
-  std::string to_string(int times_considered) const override;
-  std::string dot_label() const override;
+  std::string dot_label(int times_considered) const override;
 };
 
 class MutexLockSimcall : public MutexSimcall {
   const bool blocking_;
 
 public:
-  MutexLockSimcall(smx_actor_t actor, activity::MutexImpl* mutex, bool blocking = true)
+  MutexLockSimcall(ActorImpl* actor, activity::MutexImpl* mutex, bool blocking = true)
       : MutexSimcall(actor, mutex), blocking_(blocking)
   {
   }
   SimcallObserver* clone() override { return new MutexLockSimcall(get_issuer(), get_mutex(), blocking_); }
   bool is_enabled() const override;
-  std::string to_string(int times_considered) const override;
-  std::string dot_label() const override;
+  std::string dot_label(int times_considered) const override;
 };
 
 class ConditionWaitSimcall : public ResultingSimcall<bool> {
@@ -130,7 +138,7 @@ class ConditionWaitSimcall : public ResultingSimcall<bool> {
   const double timeout_;
 
 public:
-  ConditionWaitSimcall(smx_actor_t actor, activity::ConditionVariableImpl* cond, activity::MutexImpl* mutex,
+  ConditionWaitSimcall(ActorImpl* actor, activity::ConditionVariableImpl* cond, activity::MutexImpl* mutex,
                        double timeout = -1.0)
       : ResultingSimcall(actor, false), cond_(cond), mutex_(mutex), timeout_(timeout)
   {
@@ -138,8 +146,7 @@ public:
   SimcallObserver* clone() override { return new ConditionWaitSimcall(get_issuer(), cond_, mutex_, timeout_); }
   bool is_enabled() const override;
   bool is_visible() const override { return false; }
-  std::string to_string(int times_considered) const override;
-  std::string dot_label() const override;
+  std::string dot_label(int times_considered) const override;
   activity::ConditionVariableImpl* get_cond() const { return cond_; }
   activity::MutexImpl* get_mutex() const { return mutex_; }
   double get_timeout() const { return timeout_; }
@@ -150,69 +157,185 @@ class SemAcquireSimcall : public ResultingSimcall<bool> {
   const double timeout_;
 
 public:
-  SemAcquireSimcall(smx_actor_t actor, activity::SemaphoreImpl* sem, double timeout = -1.0)
+  SemAcquireSimcall(ActorImpl* actor, activity::SemaphoreImpl* sem, double timeout = -1.0)
       : ResultingSimcall(actor, false), sem_(sem), timeout_(timeout)
   {
   }
   SimcallObserver* clone() override { return new SemAcquireSimcall(get_issuer(), sem_, timeout_); }
   bool is_enabled() const override;
   bool is_visible() const override { return false; }
-  std::string to_string(int times_considered) const override;
-  std::string dot_label() const override;
+  std::string dot_label(int times_considered) const override;
   activity::SemaphoreImpl* get_sem() const { return sem_; }
   double get_timeout() const { return timeout_; }
 };
 
-class ActivityWaitSimcall : public ResultingSimcall<bool> {
+class ActivityTestSimcall : public ResultingSimcall<bool> {
   activity::ActivityImpl* const activity_;
+
+public:
+  ActivityTestSimcall(ActorImpl* actor, activity::ActivityImpl* activity)
+      : ResultingSimcall(actor, true), activity_(activity)
+  {
+  }
+  SimcallObserver* clone() override { return new ActivityTestSimcall(get_issuer(), activity_); }
+  bool is_visible() const override { return true; }
+  bool depends(SimcallObserver* other) override;
+  std::string dot_label(int times_considered) const override;
+  activity::ActivityImpl* get_activity() const { return activity_; }
+};
+
+class ActivityTestanySimcall : public ResultingSimcall<ssize_t> {
+  const std::vector<activity::ActivityImpl*>& activities_;
+  int next_value_ = 0;
+
+public:
+  ActivityTestanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities)
+      : ResultingSimcall(actor, -1), activities_(activities)
+  {
+  }
+  SimcallObserver* clone() override { return new ActivityTestanySimcall(get_issuer(), activities_); }
+  bool is_visible() const override { return true; }
+  int get_max_consider() const override;
+  void prepare(int times_considered) override;
+  std::string dot_label(int times_considered) const override;
+  const std::vector<activity::ActivityImpl*>& get_activities() const { return activities_; }
+  int get_value() const { return next_value_; }
+};
+
+class ActivityWaitSimcall : public ResultingSimcall<bool> {
+  activity::ActivityImpl* activity_;
   const double timeout_;
 
 public:
-  ActivityWaitSimcall(smx_actor_t actor, activity::ActivityImpl* activity, double timeout)
+  ActivityWaitSimcall(ActorImpl* actor, activity::ActivityImpl* activity, double timeout)
       : ResultingSimcall(actor, false), activity_(activity), timeout_(timeout)
   {
   }
   SimcallObserver* clone() override { return new ActivityWaitSimcall(get_issuer(), activity_, timeout_); }
-  bool is_visible() const override { return false; }
-  std::string to_string(int times_considered) const override { return SimcallObserver::to_string(times_considered); }
-  std::string dot_label() const override { return SimcallObserver::dot_label(); }
+  void serialize(Simcall& type, char* buffer) override;
+  bool is_visible() const override { return true; }
+  bool is_enabled() const override;
+  std::string dot_label(int times_considered) const override;
   activity::ActivityImpl* get_activity() const { return activity_; }
+  void set_activity(activity::ActivityImpl* activity) { activity_ = activity; }
   double get_timeout() const { return timeout_; }
 };
 
-class ExecutionWaitanySimcall : public ResultingSimcall<ssize_t> {
-  const std::vector<activity::ExecImpl*>& execs_;
+class ActivityWaitanySimcall : public ResultingSimcall<ssize_t> {
+  const std::vector<activity::ActivityImpl*>& activities_;
   const double timeout_;
+  int next_value_ = 0;
 
 public:
-  ExecutionWaitanySimcall(smx_actor_t actor, const std::vector<activity::ExecImpl*>& execs, double timeout)
-      : ResultingSimcall(actor, -1), execs_(execs), timeout_(timeout)
+  ActivityWaitanySimcall(ActorImpl* actor, const std::vector<activity::ActivityImpl*>& activities, double timeout)
+      : ResultingSimcall(actor, -1), activities_(activities), timeout_(timeout)
   {
   }
-  SimcallObserver* clone() override { return new ExecutionWaitanySimcall(get_issuer(), execs_, timeout_); }
-  bool is_visible() const override { return false; }
-  std::string to_string(int times_considered) const override;
-  std::string dot_label() const override;
-  const std::vector<activity::ExecImpl*>& get_execs() const { return execs_; }
+  SimcallObserver* clone() override { return new ActivityWaitanySimcall(get_issuer(), activities_, timeout_); }
+  bool is_enabled() const override;
+  bool is_visible() const override { return true; }
+  void prepare(int times_considered) override;
+  int get_max_consider() const override;
+  std::string dot_label(int times_considered) const override;
+  const std::vector<activity::ActivityImpl*>& get_activities() const { return activities_; }
   double get_timeout() const { return timeout_; }
+  int get_value() const { return next_value_; }
 };
 
-class IoWaitanySimcall : public ResultingSimcall<ssize_t> {
-  const std::vector<activity::IoImpl*>& ios_;
-  const double timeout_;
+class CommIsendSimcall : public SimcallObserver {
+  activity::MailboxImpl* mbox_;
+  double payload_size_;
+  double rate_;
+  unsigned char* src_buff_;
+  size_t src_buff_size_;
+  void* payload_;
+  bool detached_;
 
 public:
-  IoWaitanySimcall(smx_actor_t actor, const std::vector<activity::IoImpl*>& ios, double timeout)
-      : ResultingSimcall(actor, -1), ios_(ios), timeout_(timeout)
+  bool (*match_fun_)(void*, void*, activity::CommImpl*);
+  void (*clean_fun_)(void*); // used to free the synchro in case of problem after a detached send
+  void (*copy_data_fun_)(activity::CommImpl*, void*, size_t); // used to copy data if not default one
+
+  CommIsendSimcall(ActorImpl* actor, activity::MailboxImpl* mbox, double payload_size, double rate,
+                   unsigned char* src_buff, size_t src_buff_size, bool (*match_fun)(void*, void*, activity::CommImpl*),
+                   void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send
+                   void (*copy_data_fun)(activity::CommImpl*, void*, size_t), // used to copy data if not default one
+                   void* payload, bool detached)
+      : SimcallObserver(actor)
+      , mbox_(mbox)
+      , payload_size_(payload_size)
+      , rate_(rate)
+      , src_buff_(src_buff)
+      , src_buff_size_(src_buff_size)
+      , payload_(payload)
+      , detached_(detached)
+      , match_fun_(match_fun)
+      , clean_fun_(clean_fun)
+      , copy_data_fun_(copy_data_fun)
   {
   }
-  SimcallObserver* clone() override { return new IoWaitanySimcall(get_issuer(), ios_, timeout_); }
-  bool is_visible() const override { return false; }
-  std::string to_string(int times_considered) const override;
-  std::string dot_label() const override;
-  const std::vector<activity::IoImpl*>& get_ios() const { return ios_; }
-  double get_timeout() const { return timeout_; }
+  void serialize(Simcall& type, char* buffer) override;
+  CommIsendSimcall* clone() override
+  {
+    return new CommIsendSimcall(get_issuer(), mbox_, payload_size_, rate_, src_buff_, src_buff_size_, match_fun_,
+                                clean_fun_, copy_data_fun_, payload_, detached_);
+  }
+  bool is_visible() const override { return true; }
+  std::string dot_label(int times_considered) const override
+  {
+    return SimcallObserver::dot_label(times_considered) + "iSend";
+  }
+  activity::MailboxImpl* get_mailbox() const { return mbox_; }
+  double get_payload_size() const { return payload_size_; }
+  double get_rate() const { return rate_; }
+  unsigned char* get_src_buff() const { return src_buff_; }
+  size_t get_src_buff_size() const { return src_buff_size_; }
+  void* get_payload() const { return payload_; }
+  bool is_detached() const { return detached_; }
+};
+
+class CommIrecvSimcall : public SimcallObserver {
+  activity::MailboxImpl* mbox_;
+  unsigned char* dst_buff_;
+  size_t* dst_buff_size_;
+  void* payload_;
+  double rate_;
+
+public:
+  bool (*match_fun_)(void*, void*, activity::CommImpl*);
+  void (*copy_data_fun_)(activity::CommImpl*, void*, size_t); // used to copy data if not default one
+
+  CommIrecvSimcall(ActorImpl* actor, activity::MailboxImpl* mbox, unsigned char* dst_buff, size_t* dst_buff_size,
+                   bool (*match_fun)(void*, void*, activity::CommImpl*),
+                   void (*copy_data_fun)(activity::CommImpl*, void*, size_t), void* payload, double rate)
+      : SimcallObserver(actor)
+      , mbox_(mbox)
+      , dst_buff_(dst_buff)
+      , dst_buff_size_(dst_buff_size)
+      , payload_(payload)
+      , rate_(rate)
+      , match_fun_(match_fun)
+      , copy_data_fun_(copy_data_fun)
+  {
+  }
+  CommIrecvSimcall* clone() override
+  {
+    return new CommIrecvSimcall(get_issuer(), mbox_, dst_buff_, dst_buff_size_, match_fun_, copy_data_fun_, payload_,
+                                rate_);
+  }
+  void serialize(Simcall& type, char* buffer) override;
+  bool is_visible() const override { return true; }
+  std::string dot_label(int times_considered) const override
+  {
+    return SimcallObserver::dot_label(times_considered) + "iRecv";
+  }
+  activity::MailboxImpl* get_mailbox() const { return mbox_; }
+  double get_rate() const { return rate_; }
+  unsigned char* get_dst_buff() const { return dst_buff_; }
+  size_t* get_dst_buff_size() const { return dst_buff_size_; }
+  void* get_payload() const { return payload_; }
 };
+
 } // namespace actor
 } // namespace kernel
 } // namespace simgrid