[WIP] Solving Issue #516 (#550)

* add multiple streamers per preset

Signed-off-by: Andrey Parfenov <a1994ndrey@gmail.com>
Co-authored-by: Romain Chaumontet <romain.chaumontet@unikie.com>
Co-authored-by: Andrey Parfenov <a1994ndrey@gmail.com>

.github/workflows/valgrind.yml

@@ -151,3 +151,7 @@ jobs:
       run: valgrind --error-exitcode=1 --track-origins=yes --leak-check=full $GITHUB_WORKSPACE/cpp_package/examples/signal_processing/build/band_power
       env:
         LD_LIBRARY_PATH: $GITHUB_WORKSPACE/installed/lib
+    - name: Multiple Streamers
+      run: valgrind --error-exitcode=1 --track-origins=yes --leak-check=full $GITHUB_WORKSPACE/cpp_package/examples/get_data/build/multiple_streamers
+      env:
+        LD_LIBRARY_PATH: $GITHUB_WORKSPACE/installed/lib

cpp_package/examples/get_data/CMakeLists.txt

@@ -124,4 +124,24 @@ target_link_libraries (
     ${MLModulePath}
     ${DataHandlerPath}
     ${BoardControllerPath}
-)
+)
+
+
+add_executable (
+    multiple_streamers
+    src/multiple_streamers.cpp
+)
+
+target_include_directories (
+    multiple_streamers PUBLIC
+    ${brainflow_INCLUDE_DIRS}
+)
+
+target_link_libraries (
+    multiple_streamers PUBLIC
+    # for some systems(ubuntu for example) order matters
+    ${BrainflowPath}
+    ${MLModulePath}
+    ${DataHandlerPath}
+    ${BoardControllerPath}
+)

cpp_package/examples/get_data/src/multiple_streamers.cpp

@@ -0,0 +1,57 @@
+#include <iostream>
+#include <stdlib.h>
+#include <string>
+
+#ifdef _WIN32
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+#include "board_shim.h"
+
+
+int main (int argc, char *argv[])
+{
+    BoardShim::enable_dev_board_logger ();
+
+    struct BrainFlowInputParams params;
+    int board_id = (int)BoardIds::SYNTHETIC_BOARD;
+    int res = 0;
+
+    BoardShim *board = new BoardShim (board_id, params);
+
+    try
+    {
+        board->prepare_session ();
+        board->add_streamer ("file://streamer_default_1.csv:w");
+        board->add_streamer ("file://streamer_default_2.csv:w");
+        board->add_streamer (
+            "file://streamer_aux_1.csv:w", (int)BrainFlowPresets::AUXILIARY_PRESET);
+        board->add_streamer (
+            "file://streamer_aux_2.csv:w", (int)BrainFlowPresets::AUXILIARY_PRESET);
+        board->start_stream ();
+
+#ifdef _WIN32
+        Sleep (5000);
+#else
+        sleep (5);
+#endif
+
+        board->stop_stream ();
+        board->release_session ();
+    }
+    catch (const BrainFlowException &err)
+    {
+        BoardShim::log_message ((int)LogLevels::LEVEL_ERROR, err.what ());
+        res = err.exit_code;
+        if (board->is_prepared ())
+        {
+            board->release_session ();
+        }
+    }
+
+    delete board;
+
+    return res;
+}

src/board_controller/board.cpp

@@ -189,7 +189,10 @@ void Board::push_package (double *package, int preset)
     }
     if (streamers.find (preset) != streamers.end ())
     {
-        streamers[preset]->stream_data (package);
+        for (auto &streamer : streamers[preset])
+        {
+            streamer->stream_data (package);
+        }
     }
     lock.unlock ();
 }
@@ -233,7 +236,10 @@ void Board::free_packages ()
     for (auto it = streamers.begin (), next_it = it; it != streamers.end (); it = next_it)
     {
         ++next_it;
-        delete it->second;
+        for (auto &streamer : it->second)
+        {
+            delete streamer;
+        }
         streamers.erase (it);
     }
 }
@@ -251,11 +257,7 @@ int Board::add_streamer (const char *streamer_params, int preset)
         safe_logger (spdlog::level::err, "invalid preset");
         return (int)BrainFlowExitCodes::INVALID_ARGUMENTS_ERROR;
     }
-    if (streamers.find (preset) != streamers.end ())
-    {
-        safe_logger (spdlog::level::err, "only one streamer per preset is currently supported");
-        return (int)BrainFlowExitCodes::STREAM_ALREADY_RUN_ERROR;
-    }
+
     int num_rows = (int)board_descr[preset_str]["num_rows"];
 
     Streamer *streamer = NULL;
@@ -317,7 +319,7 @@ int Board::add_streamer (const char *streamer_params, int preset)
     else
     {
         lock.lock ();
-        streamers[preset] = streamer;
+        streamers[preset].push_back (streamer);
         lock.unlock ();
     }
 

src/board_controller/inc/board.h

@@ -91,7 +91,7 @@ class Board
 
 protected:
     std::map<int, DataBuffer *> dbs;
-    std::map<int, Streamer *> streamers; // todo convert to map<int, vector>
+    std::map<int, std::vector<Streamer *>> streamers;
     bool skip_logs;
     int board_id;
     struct BrainFlowInputParams params;

src/board_controller/inc/streamer.h

@@ -8,6 +8,7 @@ class Streamer
     {
         this->len = len;
     }
+
     virtual ~Streamer ()
     {
     }