v1.0.0-rc.136 (#45)

This is an UNSTABLE release. The release has significant modifications and bug fixes, if things go wrong, it is better to revert to 1.0.0-rc.132.

* jfjoch_broker: Improve logic regarding indexing architecture and thread pools (work in progress).

Reviewed-on: #45

tests/TCPImagePusherTest.cpp

@@ -24,14 +24,10 @@ TEST_CASE("TCPImageCommTest_2Writers_WithAck", "[TCP]") {
     std::vector<uint16_t> image1(x.GetPixelsNum() * nframes);
     for (auto &i: image1) i = dist(g1);
 
-    std::string addr = "tcp://127.0.0.1:19001";
-
+    TCPStreamPusher pusher("tcp://127.0.0.1:*", npullers);
     std::vector<std::unique_ptr<TCPImagePuller> > puller;
-    for (int i = 0; i < npullers; i++) {
-        puller.push_back(std::make_unique<TCPImagePuller>(addr, 64 * 1024 * 1024));
-    }
-
-    TCPStreamPusher pusher(addr, npullers);
+    for (int i = 0; i < npullers; i++)
+        puller.push_back(std::make_unique<TCPImagePuller>(pusher.GetAddress()[0], 64 * 1024 * 1024));
 
     // Wait for all pullers to connect before starting data collection
     for (int attempt = 0; attempt < 100 && pusher.GetConnectedWriters() < static_cast<size_t>(npullers); ++attempt)
@@ -171,13 +167,11 @@ TEST_CASE("TCPImageCommTest_DataFatalAck_PropagatesToPusher", "[TCP]") {
     std::vector<uint16_t> image1(x.GetPixelsNum() * nframes);
     for (auto &i: image1) i = dist(g1);
 
-    std::string addr = "tcp://127.0.0.1:19003";
-
+    TCPStreamPusher pusher("tcp://127.0.0.1:*", npullers);
     std::vector<std::unique_ptr<TCPImagePuller> > puller;
     for (int i = 0; i < npullers; i++)
-        puller.push_back(std::make_unique<TCPImagePuller>(addr, 64 * 1024 * 1024));
+        puller.push_back(std::make_unique<TCPImagePuller>(pusher.GetAddress()[0], 64 * 1024 * 1024));
 
-    TCPStreamPusher pusher(addr, npullers);
 
     // Wait for all pullers to connect before starting data collection
     for (int attempt = 0; attempt < 100 && pusher.GetConnectedWriters() < static_cast<size_t>(npullers); ++attempt)
@@ -302,13 +296,10 @@ TEST_CASE("TCPImageCommTest_GetAckProgress_Correct", "[TCP]") {
     std::vector<uint16_t> image1(x.GetPixelsNum() * nframes);
     for (auto &i: image1) i = dist(g1);
 
-    std::string addr = "tcp://127.0.0.1:19004";
-
+    TCPStreamPusher pusher("tcp://127.0.0.1:*", npullers);
     std::vector<std::unique_ptr<TCPImagePuller> > puller;
     for (int i = 0; i < npullers; i++)
-        puller.push_back(std::make_unique<TCPImagePuller>(addr, 64 * 1024 * 1024));
-
-    TCPStreamPusher pusher(addr, npullers);
+        puller.push_back(std::make_unique<TCPImagePuller>(pusher.GetAddress()[0], 64 * 1024 * 1024));
 
     // Wait for all pullers to connect before starting data collection
     for (int attempt = 0; attempt < 100 && pusher.GetConnectedWriters() < static_cast<size_t>(npullers); ++attempt)