From 982afc34947b0714d26bbaf6e7831bd0461bdeb3 Mon Sep 17 00:00:00 2001
From: Alexei Bakanov <alexei.bakanov@bridgetech.tv>
Date: Wed, 9 Jan 2019 22:47:42 +0100
Subject: [PATCH] In the example node app when looping through the staged
 resources, connection_resource iterator gets modified by
 nmos::modify_resource() while iterating. That results in an unpredictable
 behaviour when bulk-staging several activations and not all changes get
 activated. This is only triggered when several receivers(possibly senders
 too) are registered within the node.

This fix proposes copying iterator elements into a separate vector beforehand.

Reproducable by leaving out iterator-copying and running AMWA's nmos-testing IS05, test_41 (separate pull request in progress there).
---
 .../nmos-cpp-node/node_implementation.cpp     | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/Development/nmos-cpp-node/node_implementation.cpp b/Development/nmos-cpp-node/node_implementation.cpp
index 3368c374..667a4e49 100644
--- a/Development/nmos-cpp-node/node_implementation.cpp
+++ b/Development/nmos-cpp-node/node_implementation.cpp
@@ -30,7 +30,8 @@ void node_implementation_thread(nmos::node_model& model, slog::base_gate& gate)
     auto source_id = nmos::make_repeatable_id(seed_id, U("/x-nmos/node/source/0"));
     auto flow_id = nmos::make_repeatable_id(seed_id, U("/x-nmos/node/flow/0"));
     auto sender_id = nmos::make_repeatable_id(seed_id, U("/x-nmos/node/sender/0"));
-    auto receiver_id = nmos::make_repeatable_id(seed_id, U("/x-nmos/node/receiver/0"));
+    auto receiver_id1 = nmos::make_repeatable_id(seed_id, U("/x-nmos/node/receiver/1"));
+    auto receiver_id2 = nmos::make_repeatable_id(seed_id, U("/x-nmos/node/receiver/2"));
 
     auto lock = model.write_lock(); // in order to update the resources
 
@@ -86,7 +87,7 @@ void node_implementation_thread(nmos::node_model& model, slog::base_gate& gate)
     }
 
     // example device
-    insert_resource_after(delay_millis, model.node_resources, nmos::make_device(device_id, node_id, { sender_id }, { receiver_id }, model.settings), gate);
+    insert_resource_after(delay_millis, model.node_resources, nmos::make_device(device_id, node_id, { sender_id }, { receiver_id1, receiver_id2 }, model.settings), gate);
 
     // example source, flow and sender
     nmos::sdp_parameters sdp_params;
@@ -112,14 +113,28 @@ void node_implementation_thread(nmos::node_model& model, slog::base_gate& gate)
         insert_resource_after(delay_millis, model.connection_resources, std::move(connection_sender), gate);
     }
 
-    // example receiver
+    // example receiver 1
     {
         // add example network interface binding for both primary and secondary
-        auto receiver = nmos::make_video_receiver(receiver_id, device_id, nmos::transports::rtp_mcast, { U("example"), U("example") }, model.settings);
+        auto receiver = nmos::make_video_receiver(receiver_id1, device_id, nmos::transports::rtp_mcast, { U("example"), U("example") }, model.settings);
         // add example "natural grouping" hint
         web::json::push_back(receiver.data[U("tags")][nmos::fields::group_hint], nmos::make_group_hint({ U("example"), U("receiver 0") }));
 
-        auto connection_receiver = nmos::make_connection_receiver(receiver_id, true);
+        auto connection_receiver = nmos::make_connection_receiver(receiver_id1, true);
+        resolve_auto(connection_receiver.type, connection_receiver.data[nmos::fields::endpoint_active]);
+
+        insert_resource_after(delay_millis, model.node_resources, std::move(receiver), gate);
+        insert_resource_after(delay_millis, model.connection_resources, std::move(connection_receiver), gate);
+    }
+
+    // example receiver 2
+    {
+        // add example network interface binding for both primary and secondary
+        auto receiver = nmos::make_video_receiver(receiver_id2, device_id, nmos::transports::rtp_mcast, { U("example"), U("example") }, model.settings);
+        // add example "natural grouping" hint
+        web::json::push_back(receiver.data[U("tags")][nmos::fields::group_hint], nmos::make_group_hint({ U("example"), U("receiver 0") }));
+
+        auto connection_receiver = nmos::make_connection_receiver(receiver_id2, true);
         resolve_auto(connection_receiver.type, connection_receiver.data[nmos::fields::endpoint_active]);
 
         insert_resource_after(delay_millis, model.node_resources, std::move(receiver), gate);
@@ -150,7 +165,13 @@ void node_implementation_thread(nmos::node_model& model, slog::base_gate& gate)
 
         bool notify = false;
 
+        std::vector<nmos::resource> by_updated_copy;
         for (const auto& resource : by_updated | boost::adaptors::reversed)
+        {
+            by_updated_copy.push_back(resource);
+        }
+
+        for (const auto& resource : by_updated_copy)
         {
             if (!resource.has_data()) continue;