move transaction counters to children classes

Author: frs69wq

include/dtlmod/Engine.hpp

@@ -55,16 +55,8 @@ class Engine {
   ActorRegistry subscribers_;
   std::string metadata_file_;
 
-protected:
   sg4::ActivitySet pub_transaction_;
-  sg4::ConditionVariablePtr pub_transaction_completed_ = sg4::ConditionVariable::create();
-  unsigned int current_pub_transaction_id_             = 0;
-  unsigned int completed_pub_transaction_id_           = 0;
-  bool pub_transaction_in_progress_                    = false;
-
   sg4::ActivitySet sub_transaction_;
-  unsigned int current_sub_transaction_id_ = 0;
-  bool sub_transaction_in_progress_        = false;
 
   void close_stream() const;
 
@@ -138,7 +130,7 @@ class Engine {
 
   /// @brief Get the id of the current transaction (on the Publish side).
   /// @return The id of the ongoing transaction.
-  [[nodiscard]] unsigned int get_current_transaction() const noexcept { return current_pub_transaction_id_; }
+  [[nodiscard]] virtual unsigned int get_current_transaction() const noexcept = 0;
 
   /// @brief Get the name of the file in which the engine stored metadata
   /// @return The name of the file.

include/dtlmod/FileEngine.hpp

@@ -34,6 +34,13 @@ class FileEngine : public Engine {
   sg4::ConditionVariablePtr pub_activities_completed_ = sg4::ConditionVariable::create();
   std::unordered_map<sg4::ActorPtr, sg4::ActivitySet> file_sub_transaction_;
   std::unordered_map<sg4::ActorPtr, sg4::ActivitySet> file_pub_transaction_;
+  unsigned int current_pub_transaction_id_             = 0;
+  unsigned int completed_pub_transaction_id_           = 0;
+  bool pub_transaction_in_progress_                    = false;
+  sg4::ConditionVariablePtr pub_transaction_completed_ = sg4::ConditionVariable::create();
+
+  unsigned int current_sub_transaction_id_ = 0;
+  bool sub_transaction_in_progress_        = false;
 
 protected:
   void create_transport(const Transport::Method& transport_method) override;
@@ -45,6 +52,7 @@ class FileEngine : public Engine {
   void begin_sub_transaction() override;
   void end_sub_transaction() override;
   void sub_close() override;
+  [[nodiscard]] unsigned int get_current_transaction() const noexcept override { return current_pub_transaction_id_; }
 
 public:
   explicit FileEngine(const std::string& fullpath, const std::shared_ptr<Stream>& stream);

include/dtlmod/StagingEngine.hpp

@@ -21,6 +21,13 @@ class StagingEngine : public Engine {
   std::atomic<unsigned int> num_subscribers_starting_{0};
   bool pub_closing_                                        = false;
   bool sub_closing_                                        = false;
+  unsigned int current_pub_transaction_id_                 = 0;
+  unsigned int completed_pub_transaction_id_               = 0;
+  bool pub_transaction_in_progress_                        = false;
+  sg4::ConditionVariablePtr pub_transaction_completed_     = sg4::ConditionVariable::create();
+
+  unsigned int current_sub_transaction_id_ = 0;
+  bool sub_transaction_in_progress_        = false;
 
 protected:
   void begin_pub_transaction() override;
@@ -29,6 +36,7 @@ class StagingEngine : public Engine {
   void begin_sub_transaction() override;
   void end_sub_transaction() override;
   void sub_close() override;
+  [[nodiscard]] unsigned int get_current_transaction() const noexcept override { return current_pub_transaction_id_; }
 
 public:
   explicit StagingEngine(const std::string& name, const std::shared_ptr<Stream>& stream)