Dphan/nats cpp

cpp/CMakeLists.txt

@@ -15,6 +15,7 @@ add_subdirectory(testApi)
 add_subdirectory(olink_tests/olink_core_only_tests)
 add_subdirectory(olink_tests/single_object_many_threads)
 add_subdirectory(mqtt_tests/single_object_many_threads)
+add_subdirectory(nats_tests/single_object_many_threads)
 if(MANY_OBJECT_TESTS)
 add_subdirectory(olink_tests/many_objects)
 add_subdirectory(mqtt_tests/many_objects)

cpp/olink_tests/helpers/latency_helpers.cpp → cpp/latency_helpers/latency_helpers.cpp

@@ -1,33 +1,33 @@
-#include "latency_helpers.h"
-#include <algorithm>
-#include <iostream>
-#include <iomanip>
-#include <numeric>
-#include <vector>
-
-void calculateAndPrintLatencyParameters (const std::vector<chrono_hr_timepoint>& startPoints,
-                                         const std::vector<chrono_hr_timepoint>& stopPoints)
-{
-    uint64_t sum = 0;
-    uint32_t min = std::chrono::duration_cast<std::chrono::microseconds>(stopPoints[0] - startPoints[0]).count();
-    uint32_t max = 0;
-    for (size_t i = 0; i < startPoints.size(); i++)
-    {
-        auto latency = std::chrono::duration_cast<std::chrono::microseconds>(stopPoints[i] - startPoints[i]).count();
-        sum = sum + latency;
-        if (min > latency) { min = latency; }
-        if (max < latency) { max = latency; }
-    }
-    auto mean = double(sum) / startPoints.size();
-
-    std::cout << "Latency[us]: mean " << std::fixed << std::setprecision(2) << mean << " max " <<max << " min " << min << std::endl;
-}
-
-void calculateAndPrintLatencyParameters(const std::vector<uint32_t>& intervalsInMicroseconds)
-{
-    auto sum = std::accumulate(intervalsInMicroseconds.cbegin(), intervalsInMicroseconds.cend(), 0);
-    double mean = double(sum) / intervalsInMicroseconds.size();
-    const auto min_max  = std::minmax_element(intervalsInMicroseconds.begin(), intervalsInMicroseconds.end());
-    std::cout << "Latency[us]: mean " << std::fixed << std::setprecision(2) << mean << " max " << *(min_max.second) << " min " << *(min_max.first) << std::endl;
-}
-
+#include "latency_helpers.h"
+#include <algorithm>
+#include <iostream>
+#include <iomanip>
+#include <numeric>
+#include <vector>
+
+void calculateAndPrintLatencyParameters (const std::vector<chrono_hr_timepoint>& startPoints,
+                                         const std::vector<chrono_hr_timepoint>& stopPoints)
+{
+    uint64_t sum = 0;
+    uint32_t min = std::chrono::duration_cast<std::chrono::microseconds>(stopPoints[0] - startPoints[0]).count();
+    uint32_t max = 0;
+    for (size_t i = 0; i < startPoints.size(); i++)
+    {
+        auto latency = std::chrono::duration_cast<std::chrono::microseconds>(stopPoints[i] - startPoints[i]).count();
+        sum = sum + latency;
+        if (min > latency) { min = latency; }
+        if (max < latency) { max = latency; }
+    }
+    auto mean = double(sum) / startPoints.size();
+
+    std::cout << "Latency[us]: mean " << std::fixed << std::setprecision(2) << mean << " max " <<max << " min " << min << std::endl;
+}
+
+void calculateAndPrintLatencyParameters(const std::vector<uint32_t>& intervalsInMicroseconds)
+{
+    auto sum = std::accumulate(intervalsInMicroseconds.cbegin(), intervalsInMicroseconds.cend(), 0);
+    double mean = double(sum) / intervalsInMicroseconds.size();
+    const auto min_max  = std::minmax_element(intervalsInMicroseconds.begin(), intervalsInMicroseconds.end());
+    std::cout << "Latency[us]: mean " << std::fixed << std::setprecision(2) << mean << " max " << *(min_max.second) << " min " << *(min_max.first) << std::endl;
+}
+

cpp/olink_tests/helpers/latency_helpers.h → cpp/latency_helpers/latency_helpers.h

@@ -1,23 +1,23 @@
-#pragma once
-
-#include <memory>
-#include <vector>
-#include <chrono>
-
-using chrono_hr_timepoint = std::chrono::time_point<std::chrono::high_resolution_clock>;
-
-/**
- * Calculates mean, min and max parameters for events duration described in two vectors, one with events start timepoint and one with events stop timepoints.
- * Assumes that the position in a vector identifies the event. For an event A position of start in startPoints must be same as its stop in stopPoints
- * @param startPoints timepoints for start of events
- * @param stopPoints timepoints for stop of events
-*/
-void calculateAndPrintLatencyParameters (const std::vector<chrono_hr_timepoint>& startPoints,
-                                         const std::vector<chrono_hr_timepoint>& stopPoints);
-
-
-/**
- * Calculates mean, min and max parameters for a vector
- * @param intervalsInMicroseconds an interval time in microseconds.
-*/
-void calculateAndPrintLatencyParameters(const std::vector<uint32_t>& intervalsInMicroseconds);
+#pragma once
+
+#include <memory>
+#include <vector>
+#include <chrono>
+
+using chrono_hr_timepoint = std::chrono::time_point<std::chrono::high_resolution_clock>;
+
+/**
+ * Calculates mean, min and max parameters for events duration described in two vectors, one with events start timepoint and one with events stop timepoints.
+ * Assumes that the position in a vector identifies the event. For an event A position of start in startPoints must be same as its stop in stopPoints
+ * @param startPoints timepoints for start of events
+ * @param stopPoints timepoints for stop of events
+*/
+void calculateAndPrintLatencyParameters (const std::vector<chrono_hr_timepoint>& startPoints,
+                                         const std::vector<chrono_hr_timepoint>& stopPoints);
+
+
+/**
+ * Calculates mean, min and max parameters for a vector
+ * @param intervalsInMicroseconds an interval time in microseconds.
+*/
+void calculateAndPrintLatencyParameters(const std::vector<uint32_t>& intervalsInMicroseconds);

cpp/mqtt_tests/many_objects/CMakeLists.txt

@@ -13,7 +13,7 @@ set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 add_executable(mqtt_multi_client_setIntProperty "client_setIntProperty.cpp")
 add_executable(mqtt_multi_client_setFloatProperty "client_setFloatProperty.cpp")
 add_executable(mqtt_multi_client_setStringProperty "client_setStringProperty.cpp")
-add_executable(mqtt_multi_service "server.cpp" "../helpers/prepare_test_services.cpp" )
+add_executable(mqtt_multi_service "server.cpp" "helpers/prepare_test_services.cpp" )
 
 target_link_libraries(mqtt_multi_client_setIntProperty api::api-mqtt)
 target_link_libraries(mqtt_multi_client_setFloatProperty api::api-mqtt)

cpp/mqtt_tests/many_objects/client_setFloatProperty.cpp

@@ -1,7 +1,7 @@
 #include "../../scenario_templates/many_objects/executeTestFunction.h"
-#include "../helpers/mqtt_network_protocol_handler_for_test.hpp"
-#include "../helpers/itestsink.h"
-#include "../helpers/prepare_test_data.h"
+#include "../mqtt_network_protocol_handler_for_test.hpp"
+#include "helpers/itestsink.h"
+#include "helpers/prepare_test_data.h"
 #include <memory>
 
 struct PropertyFloatTestData

cpp/mqtt_tests/many_objects/client_setIntProperty.cpp

@@ -1,7 +1,7 @@
 #include "../../scenario_templates/many_objects/executeTestFunction.h"
-#include "../helpers/mqtt_network_protocol_handler_for_test.hpp"
-#include "../helpers/itestsink.h"
-#include "../helpers/prepare_test_data.h"
+#include "../mqtt_network_protocol_handler_for_test.hpp"
+#include "helpers/itestsink.h"
+#include "helpers/prepare_test_data.h"
 #include <memory>
 
 struct PropertyIntTestData

cpp/mqtt_tests/many_objects/client_setStringProperty.cpp

@@ -1,7 +1,7 @@
 #include "../../scenario_templates/many_objects/executeTestFunction.h"
-#include "../helpers/mqtt_network_protocol_handler_for_test.hpp"
-#include "../helpers/itestsink.h"
-#include "../helpers/prepare_test_data.h"
+#include "../mqtt_network_protocol_handler_for_test.hpp"
+#include "helpers/itestsink.h"
+#include "helpers/prepare_test_data.h"
 
 #include <memory>
 

cpp/mqtt_tests/helpers/itestsink.h → cpp/mqtt_tests/many_objects/helpers/itestsink.h

@@ -1,57 +1,57 @@
-#pragma once
-
-#include <apigear/mqtt/mqttclient.h>
-
-class ITestSink
-{
-public:
-    virtual bool isReady() const = 0;
-    virtual uint32_t receivedMessages() const = 0;
-};
-
-
-template <class BaseMqttTestApi>
-class TestSink : public ITestSink, public BaseMqttTestApi
-{
-public:
-    TestSink(std::shared_ptr<ApiGear::MQTT::Client> client)
-        :BaseMqttTestApi(client)
-    {
-        idPropInt = BaseMqttTestApi::_getPublisher().subscribeToPropIntChanged([this](auto value) {
-            msgReceived++; 
-            });
-        idPropFloat = BaseMqttTestApi::_getPublisher().subscribeToPropFloatChanged([this](auto value) {msgReceived++; });
-        idPropString = BaseMqttTestApi::_getPublisher().subscribeToPropStringChanged([this](auto value) {msgReceived++; });
-        idSigInt = BaseMqttTestApi::_getPublisher().subscribeToSigInt([this](auto value) {msgReceived++; });
-        idSigFloat = BaseMqttTestApi::_getPublisher().subscribeToSigFloat([this](auto value) {msgReceived++; });
-        idSigString = BaseMqttTestApi::_getPublisher().subscribeToSigString([this](auto value) {msgReceived++; });
-    }
-
-    ~TestSink()
-    {
-        BaseMqttTestApi::_getPublisher().unsubscribeFromPropIntChanged(idPropInt);
-        BaseMqttTestApi::_getPublisher().unsubscribeFromPropFloatChanged(idPropFloat);
-        BaseMqttTestApi::_getPublisher().unsubscribeFromPropStringChanged(idPropString);
-        BaseMqttTestApi::_getPublisher().unsubscribeFromSigInt(idSigInt);
-        BaseMqttTestApi::_getPublisher().unsubscribeFromSigFloat(idSigFloat);
-        BaseMqttTestApi::_getPublisher().unsubscribeFromSigString(idSigString);
-    }
-
-    bool isReady() const override
-    {
-        return BaseMqttTestApi::isReady();
-    }
-
-    uint32_t receivedMessages() const override
-    {
-        return msgReceived;
-    }
-private:
-    long idPropInt;
-    long idPropFloat;
-    long idPropString;
-    long idSigInt;
-    long idSigFloat;
-    long idSigString;
-    uint32_t msgReceived = 0;
-};
+#pragma once
+
+#include <apigear/mqtt/mqttclient.h>
+
+class ITestSink
+{
+public:
+    virtual bool isReady() const = 0;
+    virtual uint32_t receivedMessages() const = 0;
+};
+
+
+template <class BaseMqttTestApi>
+class TestSink : public ITestSink, public BaseMqttTestApi
+{
+public:
+    TestSink(std::shared_ptr<ApiGear::MQTT::Client> client)
+        :BaseMqttTestApi(client)
+    {
+        idPropInt = BaseMqttTestApi::_getPublisher().subscribeToPropIntChanged([this](auto value) {
+            msgReceived++; 
+            });
+        idPropFloat = BaseMqttTestApi::_getPublisher().subscribeToPropFloatChanged([this](auto value) {msgReceived++; });
+        idPropString = BaseMqttTestApi::_getPublisher().subscribeToPropStringChanged([this](auto value) {msgReceived++; });
+        idSigInt = BaseMqttTestApi::_getPublisher().subscribeToSigInt([this](auto value) {msgReceived++; });
+        idSigFloat = BaseMqttTestApi::_getPublisher().subscribeToSigFloat([this](auto value) {msgReceived++; });
+        idSigString = BaseMqttTestApi::_getPublisher().subscribeToSigString([this](auto value) {msgReceived++; });
+    }
+
+    ~TestSink()
+    {
+        BaseMqttTestApi::_getPublisher().unsubscribeFromPropIntChanged(idPropInt);
+        BaseMqttTestApi::_getPublisher().unsubscribeFromPropFloatChanged(idPropFloat);
+        BaseMqttTestApi::_getPublisher().unsubscribeFromPropStringChanged(idPropString);
+        BaseMqttTestApi::_getPublisher().unsubscribeFromSigInt(idSigInt);
+        BaseMqttTestApi::_getPublisher().unsubscribeFromSigFloat(idSigFloat);
+        BaseMqttTestApi::_getPublisher().unsubscribeFromSigString(idSigString);
+    }
+
+    bool isReady() const override
+    {
+        return BaseMqttTestApi::isReady();
+    }
+
+    uint32_t receivedMessages() const override
+    {
+        return msgReceived;
+    }
+private:
+    long idPropInt;
+    long idPropFloat;
+    long idPropString;
+    long idSigInt;
+    long idSigFloat;
+    long idSigString;
+    uint32_t msgReceived = 0;
+};