clang tidy

Author: tanneberger

examples/count/main.cc

@@ -5,7 +5,7 @@
 using namespace reactor;
 using namespace std::chrono_literals;
 
-class Count : public Reactor {
+class Count final : public Reactor {
 private:
   // actions
   Timer timer{"timer", this};

examples/hello/main.cc

@@ -6,7 +6,7 @@
 using namespace reactor;
 using namespace std::chrono_literals;
 
-class Hello : public Reactor {
+class Hello final : public Reactor {
 private:
   // actions
   Timer timer{"timer", this, 1s, 2s};

examples/multiport_mutation/consumer.hh

@@ -6,8 +6,8 @@
  *   Tassilo Tanneberger
  */
 
-#ifndef CONSUMER_HH // NOLINT
-#define CONSUMER_HH // NOLINT
+#ifndef MULTIPORT_MUTATION_CONSUMER_HH
+#define MULTIPORT_MUTATION_CONSUMER_HH
 
 #include <reactor-cpp/reactor-cpp.hh>
 #include <reactor-cpp/scopes.hh>
@@ -45,4 +45,4 @@ public:
   void assemble() override { handle.declare_trigger(&in); }
 };
 
-#endif // CONSUMER_HH
+#endif // MULTIPORT_MUTATION_CONSUMER_HH

examples/multiport_mutation/load_balancer.hh

@@ -6,8 +6,8 @@
  *   Tassilo Tanneberger
  */
 
-#ifndef MULTIPORT_MUTATION_LOAD_BALANCER_HH // NOLINT
-#define MULTIPORT_MUTATION_LOAD_BALANCER_HH // NOLINT
+#ifndef MULTIPORT_MUTATION_LOAD_BALANCER_HH
+#define MULTIPORT_MUTATION_LOAD_BALANCER_HH
 
 #include <reactor-cpp/mutations/multiport.hh>
 #include <reactor-cpp/reactor-cpp.hh>

examples/multiport_mutation/main.cc

@@ -29,20 +29,20 @@ class Deployment final : public Reactor { // NOLINT
     int state = 0;
 
   public:
-    Inner(Reactor* reactor)
+    explicit Inner(Reactor* reactor)
         : MutableScope(reactor) {}
     void reaction_1(const Input<unsigned>& scale, std::vector<std::unique_ptr<Consumer>>& reactor_bank,
                     ModifableMultiport<Output<unsigned>>& load_balancer) {
       std::size_t new_size = *scale.get();
-      std::size_t old_size = reactor_bank.size();
+
       std::function lambda = [](Environment* env, std::size_t index) {
         std::string _lf_inst_name = "consumer_" + std::to_string(index);
         return std::make_unique<Consumer>(_lf_inst_name, env, index);
       };
 
       std::function get_input_port = [](const std::unique_ptr<Consumer>& consumer) { return &consumer->in; };
-      auto rescale = std::make_shared<ResizeMultiportToBank<unsigned, Consumer>>(&load_balancer, &reactor_bank,
-                                                                                 get_input_port, lambda, new_size);
+      const auto rescale = std::make_shared<ResizeMultiportToBank<unsigned, Consumer>>(
+          &load_balancer, &reactor_bank, get_input_port, lambda, new_size);
 
       add_to_transaction(rescale);
 

examples/multiport_mutation/producer.hh

@@ -6,8 +6,8 @@
  *   Tassilo Tanneberger
  */
 
-#ifndef MULTIPORT_MUTATION_PRODUCER_HH // NOLINT
-#define MULTIPORT_MUTATION_PRODUCER_HH // NOLINT
+#ifndef MULTIPORT_MUTATION_PRODUCER_HH
+#define MULTIPORT_MUTATION_PRODUCER_HH
 
 #include <reactor-cpp/reactor-cpp.hh>
 

examples/ports/main.cc

@@ -5,13 +5,13 @@
 using namespace reactor;
 using namespace std::chrono_literals;
 
-class Trigger : public Reactor {
+class Trigger final : public Reactor {
 private:
   Timer timer;
   Reaction r_timer{"r_timer", 1, this, [this]() { on_timer(); }};
 
 public:
-  Trigger(const std::string& name, Environment* env, Duration period)
+  Trigger(const std::string& name, Environment* env, const Duration period)
       : Reactor(name, env)
       , timer{"timer", this, period, Duration::zero()} {}
 
@@ -25,7 +25,7 @@ class Trigger : public Reactor {
   void on_timer() { trigger.set(); }
 };
 
-class Counter : public Reactor {
+class Counter final : public Reactor {
 private:
   int value_{0};
   Reaction r_trigger{"r_trigger", 1, this, [this]() { on_trigger(); }};
@@ -49,7 +49,7 @@ class Counter : public Reactor {
   }
 };
 
-class Printer : public Reactor {
+class Printer final : public Reactor {
 private:
   Reaction r_value{"r_value", 1, this, [this]() { on_value(); }};
 
@@ -64,10 +64,10 @@ class Printer : public Reactor {
     r_value.declare_trigger(&value);
   }
 
-  void on_value() { std::cout << this->name() << ": " << *value.get() << '\n'; }
+  void on_value() const { std::cout << this->name() << ": " << *value.get() << '\n'; }
 };
 
-class Adder : public Reactor {
+class Adder final : public Reactor {
 private:
   Reaction r_add{"r_add", 1, this, [this]() { add(); }};
 

examples/power_train/main.cc

@@ -1,10 +1,8 @@
-#include <iostream>
-
 #include "reactor-cpp/reactor-cpp.hh"
 
 using namespace reactor;
 
-class LeftPedal : public Reactor {
+class LeftPedal final : public Reactor {
 public:
   // ports
   Output<void> angle{"angle", this};   // NOLINT
@@ -30,7 +28,7 @@ class LeftPedal : public Reactor {
   }
 };
 
-class RightPedal : public Reactor {
+class RightPedal final : public Reactor {
 public:
   // ports
   Output<void> angle{"angle", this}; // NOLINT
@@ -60,7 +58,7 @@ class RightPedal : public Reactor {
   }
 };
 
-class BrakeControl : public Reactor {
+class BrakeControl final : public Reactor {
 public:
   // ports
   Input<void> angle{"angle", this};  // NOLINT
@@ -81,7 +79,7 @@ class BrakeControl : public Reactor {
   }
 };
 
-class EngineControl : public Reactor {
+class EngineControl final : public Reactor {
 public:
   // ports
   Input<void> angle{"angle", this};    // NOLINT
@@ -118,7 +116,7 @@ class EngineControl : public Reactor {
   }
 };
 
-class Brake : public Reactor {
+class Brake final : public Reactor {
 public:
   // ports
   Input<void> force{"force", this}; // NOLINT
@@ -136,7 +134,7 @@ class Brake : public Reactor {
   void assemble() override { r1.declare_trigger(&force); }
 };
 
-class Engine : public Reactor {
+class Engine final : public Reactor {
 public:
   // ports
   Input<void> torque{"torque", this}; // NOLINT

include/reactor-cpp/assert.hh

@@ -13,7 +13,6 @@
 #include "reactor-cpp/fwd.hh"
 
 #include <cassert>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 
@@ -71,7 +70,7 @@ public:
       : std::runtime_error(build_message(msg)) {}
 };
 
-constexpr void validate([[maybe_unused]] bool condition, [[maybe_unused]] const std::string_view message) {
+constexpr void validate([[maybe_unused]] const bool condition, [[maybe_unused]] const std::string_view message) {
   if constexpr (runtime_validation) {
     if (!condition) {
       print_backtrace();
@@ -80,8 +79,8 @@ constexpr void validate([[maybe_unused]] bool condition, [[maybe_unused]] const
   }
 }
 
-template <typename E> constexpr auto extract_value(E enum_value) -> typename std::underlying_type_t<E> {
-  return static_cast<typename std::underlying_type_t<E>>(enum_value);
+template <typename E> constexpr auto extract_value(E enum_value) -> std::underlying_type_t<E> {
+  return static_cast<std::underlying_type_t<E>>(enum_value);
 }
 
 void assert_phase([[maybe_unused]] const ReactorElement* ptr, [[maybe_unused]] Phase phase);

include/reactor-cpp/connection.hh

@@ -17,7 +17,6 @@
 #include "logical_time.hh"
 #include "port.hh"
 #include "reaction.hh"
-#include "reactor.hh"
 #include "time.hh"
 #include "time_barrier.hh"
 
@@ -69,7 +68,7 @@ protected:
     return [this](const BasePort& port) {
       // We know that port must be of type Port<T>
       auto& typed_port = reinterpret_cast<const Port<T>&>(port); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
-      if constexpr (std::is_same<T, void>::value) {
+      if constexpr (std::is_same_v<T, void>) {
         this->schedule();
       } else {
         this->schedule(std::move(typed_port.get()));
@@ -81,7 +80,7 @@ public:
   void setup() noexcept override {
     Action<T>::setup();
 
-    if constexpr (std::is_same<T, void>::value) {
+    if constexpr (std::is_same_v<T, void>) {
       for (auto port : this->downstream_ports()) {
         port->set();
       }
@@ -134,7 +133,7 @@ public:
       // without locking.
       auto tag = Tag::from_logical_time(scheduler->logical_time());
       [[maybe_unused]] bool result{false};
-      if constexpr (std::is_same<T, void>::value) {
+      if constexpr (std::is_same_v<T, void>) {
         result = this->schedule_at(tag);
       } else {
         result = this->schedule_at(std::move(typed_port.get()), tag);

include/reactor-cpp/environment.hh

@@ -76,7 +76,7 @@ private:
   Graph<BasePort*, ConnectionProperties> graph_{};
   Graph<BasePort*, ConnectionProperties> optimized_graph_{};
 
-  void build_dependency_graph(Reactor* reactor);
+  void build_dependency_graph(const Reactor* reactor);
   void calculate_indexes();
 
   std::mutex shutdown_mutex_{};

include/reactor-cpp/graph.hh

@@ -123,22 +123,8 @@ public:
 
     if (conns != std::end(graph_[source])) {
       graph_[source].erase(conns);
-    } else {
-      std::cout << "for some reason nothing got deleted! WARNING" << std::endl;
     }
   }
-  /*
-  [[nodiscard]] auto get_destinations(E source) const noexcept -> std::vector<std::pair<P, E>> {
-    return graph_[source];
-  }
-
-  [[nodiscard]] auto get_upstream(E vertex) const noexcept -> std::optional<E> {
-    for (const auto& [source, sinks] : graph_) {
-      if (sinks.second.contains(vertex)) {
-        return source;
-      }
-    }
-  }*/
 
   friend auto operator<<(std::ostream& outstream, const Graph& graph) -> std::ostream& {
     for (auto const& [source, destinations] : graph.graph_) {

include/reactor-cpp/logging.hh

@@ -10,13 +10,11 @@
 #define REACTOR_CPP_LOGGING_HH
 
 #include "reactor-cpp/config.hh"
-#include "reactor-cpp/time.hh"
-#include <chrono>
+
 #include <iostream>
 #include <memory>
 #include <mutex>
 #include <string>
-#include <utility>
 
 namespace reactor::log {
 

include/reactor-cpp/multiport.hh

@@ -24,8 +24,8 @@ namespace reactor {
 
 class BaseMultiport { // NOLINT cppcoreguidelines-special-member-functions,-warnings-as-errors
 protected:
-  std::atomic<std::size_t> size_{0};
-  std::vector<std::size_t> present_ports_{};
+  std::atomic<std::size_t> size_{0};         // NOLINT cppcoreguidelines-non-private-member-variables-in-classes
+  std::vector<std::size_t> present_ports_{}; // NOLINT cppcoreguidelines-non-private-member-variables-in-classes
 
 private:
   std::string name_{};
@@ -53,11 +53,11 @@ protected:
 public:
   BaseMultiport(std::string name, Reactor* container)
       : name_(std::move(name))
-      , container_(container) {};
+      , container_(container) {}
   ~BaseMultiport() = default;
 
   [[nodiscard]] auto name() const noexcept -> const std::string& { return name_; }
-  auto container() const noexcept -> Reactor* { return container_; }
+  [[nodiscard]] auto container() const noexcept -> Reactor* { return container_; }
 };
 
 template <class T, class A = std::allocator<T>>
@@ -79,7 +79,7 @@ public:
   using const_iterator = typename std::vector<T>::const_iterator;
 
   Multiport(const std::string& name, Reactor* container) noexcept
-      : BaseMultiport(name, container) {};
+      : BaseMultiport(name, container) {}
   ~Multiport() noexcept = default;
 
   auto operator==(const Multiport& other) const noexcept -> bool {

include/reactor-cpp/mutations/multiport.hh

@@ -9,8 +9,6 @@
 #ifndef REACTOR_CPP_MUTATIONS_MULTIPORT_HH
 #define REACTOR_CPP_MUTATIONS_MULTIPORT_HH
 
-#include <vector>
-
 #include "../multiport.hh"
 #include "../mutations.hh"
 #include "../port.hh"

include/reactor-cpp/reaction.hh

@@ -61,7 +61,7 @@ public:
 
   void startup() final {}
   void shutdown() final {}
-  void trigger();
+  void trigger() const;
   void set_index(unsigned index);
 
   template <class Dur> void set_deadline(Dur deadline, const std::function<void(void)>& handler) {

include/reactor-cpp/reactor.hh

@@ -10,7 +10,6 @@
 #define REACTOR_CPP_REACTOR_HH
 
 #include <set>
-#include <sstream>
 #include <string>
 
 #include "action.hh"

include/reactor-cpp/reactor_element.hh

@@ -11,8 +11,6 @@
 #define REACTOR_CPP_REACTOR_ELEMENT_HH
 
 #include <cstdint>
-#include <memory>
-#include <set>
 #include <sstream>
 #include <string>
 

include/reactor-cpp/semaphore.hh

@@ -9,7 +9,6 @@
 #ifndef REACTOR_CPP_SEMAPHORE_HH
 #define REACTOR_CPP_SEMAPHORE_HH
 
-#include <atomic>
 #include <condition_variable>
 #include <mutex>
 

include/reactor-cpp/statistics.hh

@@ -11,7 +11,6 @@
 
 #include <atomic>
 
-#include "reactor-cpp/config.hh"
 #include "reactor-cpp/logging.hh"
 
 namespace reactor {
@@ -23,7 +22,7 @@ private:
 #else
   constexpr static bool enabled_{false};
 #endif
-  // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
+  // NOLINT BEGIN(cppcoreguidelines-avoid-non-const-global-variables)
   inline static std::atomic_size_t reactor_instances_{0};
   inline static std::atomic_size_t connections_{0};
   inline static std::atomic_size_t reactions_{0};
@@ -34,7 +33,7 @@ private:
   inline static std::atomic_size_t triggered_actions_{0};
   inline static std::atomic_size_t set_ports_{0};
   inline static std::atomic_size_t scheduled_actions_{0};
-  // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
+  // NOLINT END(cppcoreguidelines-avoid-non-const-global-variables)
 
   static void increment(std::atomic_size_t& counter) {
     if constexpr (enabled_) {