Merge pull request #2431 from lf-lang/cpp_fqn_fix

API for getting fully-qualified name in Cpp target
lf-lang · Oct 31, 2024 · d65750a · d65750a
2 parents daaea1b + d8c12f9
commit d65750a
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 1 deletion.
diff --git a/core/src/main/resources/lib/cpp/lfutil.hh b/core/src/main/resources/lib/cpp/lfutil.hh
@@ -60,6 +60,8 @@ public:
   reactor::Duration get_elapsed_logical_time() const { return reactor->get_elapsed_logical_time(); }
   reactor::Duration get_elapsed_physical_time() const { return reactor->get_elapsed_physical_time(); }
   reactor::Environment* environment() const { return reactor->environment(); }
+  const std::string& fqn() const { return reactor->fqn(); }
+  const std::string& name() const { return reactor->name(); }
   void request_stop() const { return environment()->sync_shutdown(); }
 };
 

diff --git a/core/src/main/resources/lib/cpp/reactor-cpp b/core/src/main/resources/lib/cpp/reactor-cpp
diff --git a/test/Cpp/src/FqnTest.lf b/test/Cpp/src/FqnTest.lf
@@ -0,0 +1,77 @@
+target Cpp {
+  workers: 1
+}
+
+public preamble {=
+  inline bool name_validation (const std::string& fqn, const std::string& name) {
+      if (fqn.empty() || name.empty()) {
+        return false;
+      }
+      size_t last_dot = fqn.find_last_of('.');
+      return (last_dot == std::string::npos) ? (name == fqn) : (name == fqn.substr(last_dot + 1));
+  }
+=}
+
+reactor A(bank_index: size_t = 0) {
+  reaction(startup) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Started\n";
+    assert (name_validation(fqn(), name()));
+  =}
+
+  reaction(shutdown) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Terminated\n";
+  =}
+}
+
+reactor B(bank_index: size_t = 0) {
+  a = new[3] A()
+
+  reaction(startup) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Started\n";
+    assert (name_validation(fqn(), name()));
+  =}
+
+  reaction(shutdown) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Terminated\n";
+  =}
+}
+
+reactor C(bank_index: size_t = 0) {
+  b = new[2] B()
+
+  reaction(startup) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Started\n";
+    assert (name_validation(fqn(), name()));
+  =}
+
+  reaction(shutdown) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Terminated\n";
+  =}
+}
+
+reactor D(bank_index: size_t = 0) {
+  a = new[2] A()
+
+  reaction(startup) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Started\n";
+    assert (name_validation(fqn(), name()));
+  =}
+
+  reaction(shutdown) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Terminated\n";
+  =}
+}
+
+main reactor {
+  c = new[2] C()
+  d = new[3] D()
+
+  reaction(startup) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Started\n";
+    assert (name_validation(fqn(), name()));
+  =}
+
+  reaction(shutdown) {=
+    std::cout << "fqn:" << fqn() << " name:" << name() << " Terminated\n";
+  =}
+}
+2 −196		.clang-tidy
+3 −7		.github/workflows/clang-format.yml
+20 −0		.github/workflows/clang-tidy.yml
+2 −7		.github/workflows/main.yaml
+7 −4		CMakeLists.txt
+1 −0		LICENSE.txt
+2 −2		examples/count/main.cc
+2 −2		examples/hello/main.cc
+6 −6		examples/ports/main.cc
+1 −1		examples/power_train/main.cc
+12 −12		include/reactor-cpp/action.hh
+7 −6		include/reactor-cpp/assert.hh
+21 −18		include/reactor-cpp/connection.hh
+11 −1		include/reactor-cpp/connection_properties.hh
+11 −11		include/reactor-cpp/environment.hh
+2 −1		include/reactor-cpp/fwd.hh
+6 −5		include/reactor-cpp/impl/port_impl.hh
+14 −10		include/reactor-cpp/logging.hh
+22 −26		include/reactor-cpp/multiport.hh
+25 −26		include/reactor-cpp/port.hh
+1 −1		include/reactor-cpp/reaction.hh
+8 −7		include/reactor-cpp/reactor.hh
+10 −9		include/reactor-cpp/reactor_element.hh
+21 −15		include/reactor-cpp/scheduler.hh
+24 −33		include/reactor-cpp/statistics.hh
+9 −8		include/reactor-cpp/time_barrier.hh
+23 −27		include/reactor-cpp/value_ptr.hh
+14 −11		lib/CMakeLists.txt
+1 −2		lib/assert.cc
+4 −134		lib/environment.cc
+4 −2		lib/port.cc
+13 −8		lib/reactor_element.cc
+10 −24		lib/scheduler.cc