Optimized access to sparse multiports in the C++ target

lib/scripts/launch.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/lfc
 
 #============================================================================
 # Description:      Run the Lingua Franca compiler.

org.lflang/src/org/lflang/generator/cpp/CppAssembleMethodGenerator.kt

@@ -201,4 +201,4 @@ class CppAssembleMethodGenerator(private val reactor: Reactor) {
             |}
         """.trimMargin()
     }
-}
+}

org.lflang/src/org/lflang/generator/cpp/CppPortGenerator.kt

@@ -53,7 +53,7 @@ class CppPortGenerator(private val reactor: Reactor) {
 
             val dataType = inferredType.cppType
             return if (isMultiport) {
-                "std::vector<$portType<$dataType>>"
+                "reactor::Multiport<$portType<$dataType>>"
             } else {
                 "$portType<$dataType>"
             }
@@ -66,7 +66,7 @@ class CppPortGenerator(private val reactor: Reactor) {
             ${name}.reserve($width);
             for (size_t __lf_idx = 0; __lf_idx < $width; __lf_idx++) {
               std::string __lf_port_name = "${name}_" + std::to_string(__lf_idx);
-              ${name}.emplace_back(__lf_port_name, this);
+              ${name}.emplace_back(__lf_port_name, this, ${name}.get_active_ports(), __lf_idx);
             }
         """.trimIndent()
     }

org.lflang/src/org/lflang/generator/cpp/CppReactionGenerator.kt

@@ -82,7 +82,7 @@ class CppReactionGenerator(
                 allUncontainedSources.map { "const ${it.cppType}& ${it.name}" } +
                 allUncontainedEffects.map { "${it.cppType}& ${it.name}" } +
                 allReferencedContainers.map {
-                    if (it.isBank) "const std::vector<${getViewClassName(it)}>& ${it.name}"
+                    if (it.isBank) "const reactor::Multiport<${getViewClassName(it)}>& ${it.name}"
                     else "${getViewClassName(it)}& ${it.name}"
                 }
 
@@ -176,7 +176,7 @@ class CppReactionGenerator(
         val initializers = variables.map { "${it.variable.name}(reactor->${it.variable.name})" }
 
         val viewDeclaration =
-            if (container.isBank) "std::vector<$viewClass> $viewInstance;"
+            if (container.isBank) "reactor::Multiport<$viewClass> $viewInstance;"
             else "$viewClass $viewInstance;"
 
         return with(PrependOperator) {
@@ -247,4 +247,4 @@ class CppReactionGenerator(
     /** Get all definitions of deadline handlers. */
     fun generateDeadlineHandlerDefinitions() =
         reactionsWithDeadlines.joinToString(separator = "\n", postfix = "\n") { generateDeadlineHandlerDefinition(it) }
-}
+}

org.lflang/src/org/lflang/generator/cpp/CppReactorGenerator.kt

@@ -21,7 +21,6 @@
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ***************/
-
 package org.lflang.generator.cpp
 
 import org.lflang.ErrorReporter

org.lflang/src/org/lflang/generator/rust/RustFileConfig.kt

@@ -38,7 +38,7 @@ class RustFileConfig(resource: Resource, srcGenBasePath: Path, useHierarchicalBi
     FileConfig(resource, srcGenBasePath, useHierarchicalBin) {
 
     /**
-     * Clean any artifacts produced by the C++ code generator.
+     * Clean any artifacts produced by the Rust code generator.
      */
     @Throws(IOException::class)
     override fun doClean() {

test/Cpp/src/multiport/BankSelfBroadcast.lf

@@ -18,8 +18,6 @@ reactor A(bank_index: size_t(0)) {
     reaction(in) {=
         for (size_t i = 0; i < in.size(); i++) {
             if (in[i].is_present()) {
-                std::cout << "Reactor " << bank_index << " received "
-                          << *in[i].get() << " on channel " << i << '\n';
                 if (*in[i].get() != i) {
                     std::cerr << "ERROR: Expected " << i << '\n';
                     exit(1);

test/Cpp/src/multiport/BankToBankMultiport.lf

@@ -22,9 +22,11 @@ reactor Destination(width: size_t(1)) {
 
     reaction(in) {=
         int sum = 0;
-        for (size_t i = 0; i < in.size(); i++) {
-            if (in[i].is_present()) sum += *in[i].get();
+
+        for (auto i : in.get_present_port_indices()) {
+            sum += *in[i].get();
         }
+
         std::cout << "Sum of received: " << sum << ".\n";
         if (sum != s) {
             std::cerr << "ERROR: Expected " << s << ".\n";

test/Cpp/src/multiport/BankToBankMultiportAfter.lf

@@ -31,9 +31,10 @@ reactor Destination(width: size_t(1)) {
         }
 
         int sum = 0;
-        for (size_t i = 0; i < in.size(); i++) {
-            if (in[i].is_present()) sum += *in[i].get();
+        for (auto i : in.get_present_port_indices()) {
+            sum += *in[i].get();
         }
+
         std::cout << "Sum of received: " << sum << '\n';
         if (sum != s) {
             std::cerr << "ERROR: Expected " << s << '\n';

test/Cpp/src/multiport/CallbackMultiport.lf

@@ -0,0 +1,61 @@
+// Test bank of reactors to multiport input with id parameter in the bank.
+target Cpp;
+
+reactor Test {
+    input[3000] sink: void;
+    output[3000] source: void;
+
+
+    reaction (sink) -> source {=
+        for (auto i: sink.get_present_port_indices()) {
+            source[i].set();
+        }
+    =}
+}
+
+main reactor CallbackMultiport {
+    test = new Test();
+    state received:bool(false);
+
+    reaction (startup) -> test.sink {=
+        for (auto i = 0; i < 30; i++) {
+            auto semi_random_index = (i * 100) % 3000;
+            test.sink[semi_random_index].set();
+        }
+    =}
+
+    reaction (test.source) {=
+        received = true;
+        std::vector<std::size_t> positions;
+
+        for (auto i = 0; i < 30; i++) {
+            auto semi_random_index = (i * 100) % 3000;
+            positions.push_back(semi_random_index);
+        }
+
+        auto received_indices = test.source.get_present_port_indices();
+
+        if (positions.size() != received_indices.size()) {
+            std::cerr << "positions size:" << positions.size() 
+                      << " indices size:" << received_indices.size() << std::endl;
+            throw std::runtime_error("not matching sizes");
+        }
+
+        for (auto i = 0; i < positions.size(); i++) {
+            if (positions[i] != received_indices[i]) {
+                std::cout << "mismatching:" << positions[i] << "|" << received_indices[i] << std::endl;
+                throw std::runtime_error("indices do not match");
+            }
+        }
+
+        std::cout << "[SUCCESS] all indices match" << std::endl;
+    =}
+
+    reaction (shutdown) {=
+        if (!received) {
+            std::cerr << "Error: received no input!\n";
+            exit(2);
+        }
+    =}
+}
+

test/Cpp/src/multiport/FullyConnected.lf

@@ -16,12 +16,11 @@ reactor Node(bank_index: size_t(0), num_nodes: size_t(4)) {
         std::cout << "Node " << bank_index << " received messages from ";
         received = true;
         size_t count{0};
-        for (auto& port : in) {
-            if (port.is_present()) {
-                count++;
-                std::cout << *port.get() << ", ";
-            }
+        for (auto i: in.get_present_port_indices()) {
+            count++;
+            std::cout << *in[i].get() << ", ";
         }
+
         std::cout << '\n';
         if (count != num_nodes) {
             std::cerr << "ERROR: received less messages than expected!";

test/Cpp/src/multiport/FullyConnectedAddressable.lf

@@ -18,13 +18,12 @@ reactor Node(bank_index: size_t(0), num_nodes: size_t(4)) {
         received = true;
         size_t count{0};
         size_t result{0};
-        for (auto& port : in) {
-            if (port.is_present()) {
-                count++;
-                result = *port.get();
-                std::cout << result << ", ";
-            }
+        for (auto i : in.get_present_port_indices()) {
+            count++;
+            result = *in[i].get();
+            std::cout << result << ", ";
         }
+
         std::cout << '\n';
 
         size_t expected = bank_index == 0 ? num_nodes - 1 : bank_index - 1;

test/Cpp/src/multiport/MultiportFromHierarchy.lf

@@ -22,10 +22,12 @@ reactor Destination {
     input[4] in: int
 
     reaction(in) {=
+
         int sum = 0;
-        for (int i = 0; i < in.size(); i++) {
-            if (in[i].is_present()) sum += *in[i].get();
+        for (auto i : in.get_present_port_indices()) {
+            sum += *in[i].get();
         }
+
         std::cout << "Sum of received: " << sum << ".\n";
         if (sum != s) {
             std::cerr << "ERROR: Expected " << s << ".\n";

test/Cpp/src/multiport/MultiportOut.lf

@@ -36,8 +36,8 @@ reactor Destination {
 
     reaction(in) {=
         int sum = 0;
-        for (int i = 0; i < in.size(); i++) {
-            if (in[i].is_present()) sum += *in[i].get();
+        for (auto i : in.get_present_port_indices()) {
+            sum += *in[i].get();
         }
         std::cout << "Sum of received: " << sum << ".\n";
         if (sum != s) {

test/Cpp/src/multiport/MultiportToHierarchy.lf

@@ -24,9 +24,10 @@ reactor Destination(width: size_t(4)) {
 
     reaction(in) {=
         int sum = 0;
-        for (size_t i = 0; i < in.size(); i++) {
-            if (in[i].is_present()) sum += *in[i].get();
+        for (auto i : in.get_present_port_indices()) {
+            sum += *in[i].get();
         }
+
         std::cout << "Sum of received: " << sum << ".\n";
         if (sum != s) {
             std::cerr << "ERROR: Expected " << s << ".\n";

test/Cpp/src/multiport/MultiportToMultiport2.lf

@@ -11,20 +11,17 @@ reactor Source(width: size_t(2)) {
     =}
 }
 
-reactor Destination(width: size_t(2)) {
-    input[width] in: size_t
-
-    reaction(in) {=
-        for (size_t i = 0; i < in.size(); i++) {
-            if (in[i].is_present()) {
-                size_t value = *in[i].get();
-                std::cout << "Received on channel " << i << ": " << value << '\n';
-                // NOTE: For testing purposes, this assumes the specific
-                // widths instantiated below.
-                if (value != i % 3) {
-                    std::cerr << "ERROR: expected " << i % 3 << '\n';
-                    exit(1);
-                }
+reactor Destination(width:size_t(2)) {
+    input[width] in:size_t;
+    reaction (in) {=
+        for (auto i: in.get_present_port_indices()) {
+            size_t value = *in[i].get();
+            std::cout << "Received on channel " << i << ": " << value << '\n';
+            // NOTE: For testing purposes, this assumes the specific
+            // widths instantiated below.
+            if (value != i % 3) {
+                std::cerr << "ERROR: expected " << i % 3 << '\n';
+                exit(1);
             }
         }
     =}

test/Cpp/src/multiport/MultiportToMultiportArray.lf

@@ -30,12 +30,10 @@ reactor Destination {
 
     reaction(in) {=
         int sum = 0;
-        for (size_t i = 0; i < in.size(); i++) {
-            if (in[i].is_present()) {
-                const auto& a = *in[i].get();
-                for (int j = 0; j < a.size(); j++) {
-                    sum += a[j];
-                }
+        for (auto i : in.get_present_port_indices()) {
+            const auto& a = *in[i].get();
+            for (int j = 0; j < a.size(); j++) {
+                sum += a[j];
             }
         }
         std::cout << "Sum of received: " << sum << '\n';