wip: initial version refactoring #2

Author: Petr Matousek

src/api/qpid-proton/reactor/TxReceivingClient.cpp

@@ -339,6 +339,16 @@ int TxReceivingClient::run(int argc, char **argv) const
         enableTracing("aac3_receiver");
     }
 
+    string tx_action = "commit";
+    if (options.is_set("tx-action")) {
+        tx_action = options["tx-action"];
+    }
+
+    string tx_endloop_action = "commit";
+    if (options.is_set("tx-endloop-action")) {
+        tx_endloop_action = options["tx-endloop-action"];
+    }
+
     TxReceiverHandler handler = TxReceiverHandler(
         address,
         conn_urls,

src/api/qpid-proton/reactor/TxSendingClient.cpp

@@ -489,6 +489,16 @@ int TxSendingClient::run(int argc, char **argv) const
         enableTracing("aac3_sender");
     }
 
+    string tx_action = "commit";
+    if (options.is_set("tx-action")) {
+        tx_action = options["tx-action"];
+    }
+
+    string tx_endloop_action = "commit";
+    if (options.is_set("tx-endloop-action")) {
+        tx_endloop_action = options["tx-endloop-action"];
+    }
+
     message msg;
 
     setMessageOptions(setter, msg);
@@ -552,7 +562,9 @@ int TxSendingClient::run(int argc, char **argv) const
         conn_heartbeat,
         max_frame_size,
         conn_use_config_file,
-        log_msgs
+        log_msgs,
+        tx_action,
+        tx_endloop_action
     );
 
     handler.setMessage(msg);

src/api/qpid-proton/reactor/handler/TxReceiverHandler.cpp

@@ -4,10 +4,10 @@
  * and open the template in the editor.
  */
 
-/* 
+/*
  * File:   TxReceiverHandler.cpp
  * Author: pematous
- * 
+ *
  * Created on October 20, 2024
  */
 
@@ -132,7 +132,7 @@ void TxReceiverHandler::timerEvent() {
     } else {
         timer--;
         logger(debug) << "Waiting ...";
-        
+
         if (recv_listen != "true") {
             work_q->schedule(duration::SECOND, make_work(&TxReceiverHandler::timerEvent, this));
         } else {
@@ -204,7 +204,7 @@ void TxReceiverHandler::setSelector(string selector)
         << symbol("apache.org:selector-filter:string")
         << selector
         << finish();
-    
+
     fm.put(filter_key, filter_value);
 }
 
@@ -248,7 +248,7 @@ void TxReceiverHandler::on_container_start(container &c)
     logger(debug) << "Password: " << password;
     logger(debug) << "SASL mechanisms: " << sasl_mechanisms;
     logger(debug) << "SASL enabled: " << conn_sasl_enabled;
-    
+
     logger(debug) << "Maximum frame size: " << max_frame_size;
 
     logger(debug) << "Topic: " << is_topic;
@@ -290,7 +290,7 @@ void TxReceiverHandler::on_container_start(container &c)
 
     logger(debug) << "Setting a reconnect timer: " << conn_reconnect;
     logger(debug) << "Custom reconnect: " << conn_reconnect_custom;
-    
+
     configure_reconnect(conn_opts);
     configure_ssl(c);
 
@@ -513,7 +513,7 @@ void TxReceiverHandler::on_transport_close(transport &t) {
 
 void TxReceiverHandler::on_transport_error(transport &t) {
     logger(error) << "The connection with " << broker_url.getHost() << ":" << broker_url.getPort() << " was interrupted: " << t.error().what();
-    
+
     if (t.error().what().find("unauthorized") != string::npos) {
         exit(1);
     }

src/api/qpid-proton/reactor/handler/TxReceiverHandler.h

@@ -4,7 +4,7 @@
  * and open the template in the editor.
  */
 
-/* 
+/*
  * File:   TxReceiverHandler.h
  * Author: pematous
  *
@@ -64,7 +64,7 @@ using proton::transaction_handler;
 
 #ifdef PN_CPP_HAS_STD_FUNCTION
 #undef PN_CPP_HAS_STD_FUNCTION
-#endif 
+#endif
 
 namespace dtests {
 namespace proton {
@@ -162,7 +162,7 @@ class TxReceiverHandler : public CommonHandler, transaction_handler {
         int recv_credit_window = -1,
         bool recv_drain_after_credit_window = false
     );
-    
+
     virtual ~TxReceiverHandler();
 
     void timerEvent();
@@ -185,7 +185,7 @@ class TxReceiverHandler : public CommonHandler, transaction_handler {
      * Gets the transaction batch size
      * @return the transaction batch size
      */
-    int getBatchSize() const;    
+    int getBatchSize() const;
 
     transaction_handler th;
 
@@ -206,11 +206,11 @@ class TxReceiverHandler : public CommonHandler, transaction_handler {
     listener lsnr;
     container *cont;
     double ts;
-    
+
     struct timer_event_t : public void_function0 {
         TxReceiverHandler &parent;
         timer_event_t(TxReceiverHandler &handler): parent(handler) { }
-        void operator()() { 
+        void operator()() {
             parent.timerEvent();
         }
     };
@@ -247,7 +247,6 @@ class TxReceiverHandler : public CommonHandler, transaction_handler {
     int current_batch = 0;
     int committed = 0;
     int confirmed = 0;
-    int total = 0;
 
     transaction *tx;
 };