From 2b9cd2d15254810adc42afc439fa861cb342a5c5 Mon Sep 17 00:00:00 2001
From: fusiled <fusiled@gmail.com>
Date: Fri, 5 Jun 2026 15:40:35 -0500
Subject: [PATCH] Add example to docs

---
 .github/workflows/verify.yml                  |   2 +
 .gitignore                                    |   1 +
 CMakeLists.txt                                |  56 ++++++--
 README.md                                     |   9 +-
 docs/README.md                                |   2 +-
 .../1_FirstModule_and_SimoSim/CMakeLists.txt  |  41 ++++++
 .../1_FirstModule_and_SimoSim/FirstModule.cc  | 121 ++++++++++++++++++
 .../1_FirstModule_and_SimoSim/README.md       |  76 +++++++++++
 .../1_FirstModule_and_SimoSim/flake.lock      |  82 ++++++++++++
 .../1_FirstModule_and_SimoSim/flake.nix       |  34 +++++
 .../system_config.yaml                        |  31 +++++
 docs/tutorial/README.md                       |   3 -
 flake.lock                                    |   8 +-
 flake.nix                                     |   4 +-
 include/Simo/core/Log.h                       |   8 +-
 include/Simo/core/Time.h                      |   4 +-
 include/Simo/module/Module.h                  |  11 +-
 sgconfig.yml                                  |   6 +
 src/SimoSim/SimoSim.cc                        |  11 ++
 src/core/Context.cc                           |   2 +-
 src/core/Log.cc                               |   6 +-
 src/module/Module.cc                          |   6 +
 support/ast-grep/.gitkeep                     |   0
 support/ast-grep/no-default-arguments.yaml    |  15 +++
 support/cmake/SimoConfig.cmake                |   4 +
 support/scripts/run-ast-grep.sh               |  30 +++++
 tests/Simo/SimulationContextTest.cc           |  35 +++++
 tests/collection/PingPongCollection.cc        |  56 +++-----
 tests/module/ModuleTest.cc                    |  14 +-
 29 files changed, 605 insertions(+), 73 deletions(-)
 create mode 100644 docs/guided_examples/1_FirstModule_and_SimoSim/CMakeLists.txt
 create mode 100644 docs/guided_examples/1_FirstModule_and_SimoSim/FirstModule.cc
 create mode 100644 docs/guided_examples/1_FirstModule_and_SimoSim/README.md
 create mode 100644 docs/guided_examples/1_FirstModule_and_SimoSim/flake.lock
 create mode 100644 docs/guided_examples/1_FirstModule_and_SimoSim/flake.nix
 create mode 100644 docs/guided_examples/1_FirstModule_and_SimoSim/system_config.yaml
 delete mode 100644 docs/tutorial/README.md
 create mode 100644 sgconfig.yml
 create mode 100644 support/ast-grep/.gitkeep
 create mode 100644 support/ast-grep/no-default-arguments.yaml
 create mode 100644 support/cmake/SimoConfig.cmake
 create mode 100755 support/scripts/run-ast-grep.sh

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index 43633e4..1cc88f3 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -30,6 +30,8 @@ jobs:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
       - name: clang-format
         run: nix develop --command  ${{github.workspace}}/support/scripts/cpp-check-format.sh
+      - name: ast-grep
+        run: nix develop --command  ${{github.workspace}}/support/scripts/run-ast-grep.sh
   Configure-Build-and-Unit-Tests:
     strategy:
       matrix:
diff --git a/.gitignore b/.gitignore
index e198963..faf5f38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.idea
 /cmake-build-*
+/docs/tutorial/build*
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e15b34d..5c828aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,14 +102,51 @@ target_include_directories(Simo
 )
 target_include_directories(Simo PRIVATE src)
 
+# Simo_includes_only is a header-only target
+add_library(Simo_includes_only INTERFACE)
+target_include_directories(Simo_includes_only
+        INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+)
+target_link_libraries(Simo_includes_only INTERFACE glaze::glaze)
+target_compile_options(Simo_includes_only INTERFACE -fno-rtti)
+# Avoid linking against Simo
+if (APPLE)
+  target_link_options(Simo_includes_only INTERFACE
+          "LINKER:-undefined,dynamic_lookup"
+  )
+else()
+  target_link_options(Simo_includes_only INTERFACE
+          "LINKER:--allow-shlib-undefined"
+  )
+endif()
+
 
 add_executable(SimoSim src/SimoSim/SimoSim.cc)
 target_link_libraries(SimoSim PRIVATE Simo)
 
-install(TARGETS Simo SimoSim)
+install(TARGETS Simo SimoSim Simo_includes_only
+  EXPORT SimoTargets
+)
 install(DIRECTORY include/
         DESTINATION include
 )
+install(EXPORT SimoTargets
+        FILE SimoTargets.cmake
+        NAMESPACE Simo::
+        DESTINATION lib/cmake/Simo
+)
+
+# Generate the Package Configuration
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+        "cmake/Simo/SimoConfigVersion.cmake"
+        VERSION ${PROJECT_VERSION}
+        COMPATIBILITY AnyNewerVersion)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/support/cmake/SimoConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/cmake/Simo/SimoConfigVersion.cmake"
+        DESTINATION lib/cmake/Simo)
+
 
 
 ## Unit tests
@@ -171,19 +208,14 @@ target_link_libraries(test_Module PRIVATE Simo)
 add_library(SimoTestPingPongCollection SHARED
         tests/collection/PingPongCollection.cc
 )
+set_target_properties(SimoTestPingPongCollection PROPERTIES
+        CXX_VISIBILITY_PRESET hidden
+        VISIBILITY_INLINES_HIDDEN 1
+)
 target_compile_options(SimoTestPingPongCollection PRIVATE -fno-exceptions)
 # Compile only with includes. Do not link against libraries
-target_link_libraries(SimoTestPingPongCollection PRIVATE $<COMPILE_ONLY:Simo>)
-# Avoid linking against Simo
-if (APPLE)
-  target_link_options(SimoTestPingPongCollection PRIVATE
-            "LINKER:-undefined,dynamic_lookup"
-    )
-else ()
-  target_link_options(SimoTestPingPongCollection PRIVATE
-            "LINKER:--allow-shlib-undefined"
-    )
-endif ()
+target_link_libraries(SimoTestPingPongCollection PRIVATE Simo_includes_only)
+
 
 # Make this custom command to trigger re-build for targets that uses SimoTestPingPongCollection libraries indirectly (like
 # test_Collection)
diff --git a/README.md b/README.md
index 711c819..51590fb 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ Guides (Markdown files inside `docs` folder) and Doxygen built from the main bra
 ```bash
 git clone https://github.com/fusiled/Simo
 cd Simo
-git submodule update --init
 ```
 
 ## Build
@@ -41,6 +40,10 @@ The [nix](https://nixos.org/learn/) flake simplifies the setup of the dependenci
 - Run `nix develop` to enter a virtual environment with all the required tools installed.
 The GitHub actions run entering the virtual environment of `nix develop`.
 
+## First Steps
+
+Look inside [docs/tutorial](./docs/tutorial) .
+
 ## Features
 
 - Loading components from shared objects at runtime ([examples](./tests/collection/CollectionTest.cc))
@@ -65,7 +68,5 @@ This can be achieved with:
 
 ## To Do
 - Create a collector with periodic window collection functionality
-- Create logging system for components 
-- More documentation and examples  
-- Error config in Simo::Context 
+- More documentation and examples
 - Benchmark Simo against Gem5 and SystemC
diff --git a/docs/README.md b/docs/README.md
index 45f3c72..abac076 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,4 +1,4 @@
-Find the tutorial in [tutorial folder](./tutorial)
+Find the tutorial in [guided_examples folder](./guided_examples)
 
 ## Motivations
 
diff --git a/docs/guided_examples/1_FirstModule_and_SimoSim/CMakeLists.txt b/docs/guided_examples/1_FirstModule_and_SimoSim/CMakeLists.txt
new file mode 100644
index 0000000..cedd6b9
--- /dev/null
+++ b/docs/guided_examples/1_FirstModule_and_SimoSim/CMakeLists.txt
@@ -0,0 +1,41 @@
+# Copyright 2026 Matteo Fusi and Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cmake_minimum_required(VERSION 3.31.0)
+project(SimoTutorial VERSION 0.0.1)
+
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+
+# Look for Simo package
+find_package(Simo REQUIRED)
+get_filename_component(SIMO_PACKAGE_PREFIX "${Simo_DIR}/../../.." ABSOLUTE)
+
+
+# Create you collection of modules
+add_library(TutorialCollection SHARED
+        FirstModule.cc
+)
+# Hide symbols by default
+set_target_properties(TutorialCollection PROPERTIES
+        CXX_VISIBILITY_PRESET hidden
+        VISIBILITY_INLINES_HIDDEN 1
+)
+
+# Use Simo::Simo_includes_only to only use the include files and avoid direct linking to Simo
+target_link_libraries(TutorialCollection PRIVATE Simo::Simo_includes_only)
+target_include_directories(TutorialCollection PRIVATE
+        "${SIMO_PACKAGE_PREFIX}/include"
+)
diff --git a/docs/guided_examples/1_FirstModule_and_SimoSim/FirstModule.cc b/docs/guided_examples/1_FirstModule_and_SimoSim/FirstModule.cc
new file mode 100644
index 0000000..a685923
--- /dev/null
+++ b/docs/guided_examples/1_FirstModule_and_SimoSim/FirstModule.cc
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2026 Matteo Fusi and Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Note 0: this is the general include for Simo
+#include <Simo/Simo.h>
+
+namespace Simo::Examples {
+
+/// Log periodically a message and count the number of time the log took place
+class SIMO_PUBLIC FirstModule : public Module {
+ public:
+  // Note 1
+  // Module initialization takes place here
+  InitializationStatus initialize(Context& sim_ctx_p,
+                                  const Parameters& parameters) override {
+    // Call initialization of subclass
+    if (const auto status = Module::initialize(sim_ctx_p, parameters);
+        !status.success()) {
+      // Fail if something bad happened
+      return status;
+    }
+    // Initialize variables from parameters
+    period = parameters.get<Time>("period")->value();
+
+    // Allocate statistics
+    num_events = &create_statistic<Statistics::Count>("num_events");
+
+    // Setup logging
+    if (const auto status = log_setup("tutorial_module.log");
+        !status.success()) {
+      return status;
+    }
+    populate_default_log_levels();
+    log_level(parameters.get<std::string>("log_level")->value());
+
+    // Start scheduling events
+    // schedule_at schedule at the specified time
+    sim_ctx().schedule_at(Time::zero, [this]() { log_event(); });
+    return InitializationStatus::ok(this);
+  }
+
+  void log_event() {
+    // schedule_in schedule and event at current_time + period
+    ++(*num_events);
+    log(Log::LogLevel::INFO, [this]() {
+      return std::format("{}, Hello from TestModule!", num_events->value());
+    });
+    sim_ctx().schedule_in(period, [this]() { log_event(); });
+  }
+
+ protected:
+  // Remember the period to use to schedule events
+  Time period;
+  // Pointer to a statistic of the class
+  Statistics::Count* num_events = nullptr;
+};
+
+/// Parameters for TestModule
+class SIMO_PUBLIC FirstModuleParameters : public Parameters {
+ public:
+  // Note 2
+  // Parameters describe inputs of a Module.
+  // Parameters with a default value are added with `trie.add<>`
+  // and without a default with `trie.add_unset<>`
+  FirstModuleParameters() {
+    // validator method is used to verify if a parameter is valid
+    trie.add_unset<Time>("period").validator(
+        [](const auto& t) { return t > Time::one; });
+    trie.add<std::string>("log_level", "WARNING");
+  }
+};
+
+}  // namespace Simo::Examples
+
+// Note 3 : SimoSim can dynamically load components through collections with
+// the logic below.
+// A collection is a list of factories.
+// A factory tells how to instantiate a Module and an associated parameter
+extern "C" {
+constexpr Simo::Collections::SimoCollectionVersion VERSION{
+    .major = 0, .minor = 0, .patch = 1};
+
+constexpr Simo::Collections::Factory TUTORIAL_FACTORY{
+    .name = "TestModule",
+    .get_module_function =
+        [] {
+          return static_cast<Simo::Module*>(new Simo::Examples::FirstModule());
+        },
+    .get_parameters_function =
+        [] {
+          return static_cast<Simo::Parameters*>(
+              new Simo::Examples::FirstModuleParameters());
+        }};
+
+const char* collection_name = "TestCollection";
+constexpr std::array FACTORY_LIST{TUTORIAL_FACTORY};
+static Simo::Collections::SimoCollection collection{
+    .name = collection_name,
+    .version = VERSION,
+    .factory_list = FACTORY_LIST.data(),
+    .factory_list_size = FACTORY_LIST.size(),
+};
+
+// This exposes the collection
+SIMO_PUBLIC const Simo::Collections::SimoCollection* simo_get_collection() {
+  return &collection;
+}
+}
diff --git a/docs/guided_examples/1_FirstModule_and_SimoSim/README.md b/docs/guided_examples/1_FirstModule_and_SimoSim/README.md
new file mode 100644
index 0000000..450daa0
--- /dev/null
+++ b/docs/guided_examples/1_FirstModule_and_SimoSim/README.md
@@ -0,0 +1,76 @@
+# FirstModule SimoSim 
+
+## Introduction
+The documents highlights some location in the source of [FirstModule.cc](./FirstModule.cc)
+to better understand how to write your own `Module` class and how to use it
+in `SimoSim`, a general purpose executable to run simulations.
+
+
+### You first module
+
+Modules are the basic block of the simulation. They have the ability to
+schedule events in the simulation loop. To create a new module, it is
+enough to inherit from `Simo::Module` class. 
+
+
+#### Module initialization
+All the classed are declared in the
+include `Simo/Simo.h` and they are contained in the `Simo` namespace.
+
+```cpp
+#include <Simo/Simo.h>
+// ...
+class SIMO_PUBLIC FirstModule : public Module {
+public:
+    InitializationStatus initialize(Context& sim_ctx_p,
+                                  const Parameters& parameters) override {
+       // Initialization
+    }
+    // ...
+};
+```
+
+The `initialize` method allows to initialize a module with the initial state of
+the simulation.
+
+`Context& sim_ctx_p` is a data-structure that represents the 
+global state of the simulation. Events are scheduled using this class. It is good
+practice to call the method of the inherited class `Module::initialize` to start
+the initialization. This will set the simulation context and do checks on the 
+parameters.
+
+`const Parameters& parameters` stores a set of parameters that the class can query
+and use. In the example, the period is fetched and set:
+
+```cpp
+period = parameters.get<Time>("period")->value();
+```
+
+In the initialization, a first event is scheduled at time zero to call the `log_event` method:
+
+```cpp
+sim_ctx().schedule_at(Time::zero, [this]() { log_event(); });
+```
+
+Other interesting content in the `initialize` method:
+- a new statistic is created with `create_statistic` method.
+- logging is set up to save the log at `tutorial_module.log`
+
+#### Module event
+
+`event_log` runs first at time zero, and it re-schedules itself every `period` time units
+using the simulation context. Look for `Simo/core/Context.h` for the difference between
+`schedule_at` and `schedule_in` of .
+Source of the method:
+
+
+```cpp
+void log_event() {
+// schedule_in schedule and event at current_time + period
+++(*num_events);
+log(Log::LogLevel::INFO, [this]() {
+  return std::format("{}, Hello from TestModule!", num_events->value());
+});
+sim_ctx().schedule_in(period, [this]() { log_event(); });
+}
+```
diff --git a/docs/guided_examples/1_FirstModule_and_SimoSim/flake.lock b/docs/guided_examples/1_FirstModule_and_SimoSim/flake.lock
new file mode 100644
index 0000000..ab1807c
--- /dev/null
+++ b/docs/guided_examples/1_FirstModule_and_SimoSim/flake.lock
@@ -0,0 +1,82 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1780453794,
+        "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-26.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs",
+        "simo": "simo"
+      }
+    },
+    "simo": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 0,
+        "narHash": "sha256-pUFqt49aZiACnO3URWRxz9u/6Y2QocjEoVpZs76EGh4=",
+        "path": "/nix/store/w020f55jag8hz9hx2vpgcv08qj9kla9r-source",
+        "type": "path"
+      },
+      "original": {
+        "path": "/nix/store/w020f55jag8hz9hx2vpgcv08qj9kla9r-source",
+        "type": "path"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/docs/guided_examples/1_FirstModule_and_SimoSim/flake.nix b/docs/guided_examples/1_FirstModule_and_SimoSim/flake.nix
new file mode 100644
index 0000000..17e6aaa
--- /dev/null
+++ b/docs/guided_examples/1_FirstModule_and_SimoSim/flake.nix
@@ -0,0 +1,34 @@
+{
+  description = "Dev shell with Simo available";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
+    flake-utils.url = "github:numtide/flake-utils";
+
+    simo.url = "../../..";
+    simo.inputs.nixpkgs.follows = "nixpkgs";
+    simo.inputs.flake-utils.follows = "flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, simo }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs { inherit system; };
+      in
+      {
+        devShells.default = pkgs.mkShell.override {
+          stdenv = pkgs.clangStdenv;
+        } {
+          packages = with pkgs; [
+            boost
+            cmake
+            ninja
+            llvm
+            glaze
+            doxygen
+
+            simo.packages.${system}.default
+          ];
+        };
+      });
+}
\ No newline at end of file
diff --git a/docs/guided_examples/1_FirstModule_and_SimoSim/system_config.yaml b/docs/guided_examples/1_FirstModule_and_SimoSim/system_config.yaml
new file mode 100644
index 0000000..5a0e806
--- /dev/null
+++ b/docs/guided_examples/1_FirstModule_and_SimoSim/system_config.yaml
@@ -0,0 +1,31 @@
+# List all modules in the modules section
+modules:
+  # This is the module of the tutorial
+  - name: my_first_module
+    type: TestModule
+    parameters:
+      - name: period
+        value:
+          time: 10
+          unit: NS
+      - name: log_level
+        value: VERBOSE
+  # Collector is a module bundles with Simo to collect statistics between start_time and end_time.
+  - name: collector
+    type: collector
+    parameters:
+      - name: start_time
+        value:
+          time: 0
+          unit: NS
+      - name: end_time
+        value:
+          time: 50
+          unit: NS
+# connections section allow to connect modules using ports. In this tutorial, there are no connections
+connections: []
+# Additional simulation information. In this example, specify how long the simulation will run
+simulation:
+  time:
+    time: 50
+    unit: NS
diff --git a/docs/tutorial/README.md b/docs/tutorial/README.md
deleted file mode 100644
index aed2dc8..0000000
--- a/docs/tutorial/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Tutorial
-
-TODO...
diff --git a/flake.lock b/flake.lock
index 03cb250..ad4683c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1775036866,
-        "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
+        "lastModified": 1780453794,
+        "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
+        "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 51df3f9..6865649 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
   description = "Nix flake for building and testing the CMake-based Simo project";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
@@ -31,6 +31,7 @@
           nativeBuildInputs = with pkgs; [
             cmake
             ninja
+            doxygen
           ];
 
           buildInputs = with pkgs; [
@@ -64,6 +65,7 @@
             llvm
             glaze
             doxygen
+            ast-grep
           ];
         };
       }
diff --git a/include/Simo/core/Log.h b/include/Simo/core/Log.h
index cbd724c..747d2d2 100644
--- a/include/Simo/core/Log.h
+++ b/include/Simo/core/Log.h
@@ -21,6 +21,7 @@
 #include <filesystem>
 #include <format>
 #include <fstream>
+#include <ostream>
 #include <vector>
 
 #include "InitializationStatus.h"
@@ -52,7 +53,7 @@ class SIMO_PUBLIC Logger {
   /// Setup log level from string. Do nothing is string is not recognized
   Logger& log_level(std::string_view level_name);
 
-  size_t log_level() const;
+  [[nodiscard]] size_t log_level() const;
 
   /// Enable/disable logger
   Logger& enabled(bool new_enabled_value);
@@ -94,7 +95,8 @@ class SIMO_PUBLIC Logger {
 
  protected:
   std::filesystem::path sink_path;
-  std::ofstream* sink = nullptr;
+  std::ostream* sink = nullptr;
+  bool tracked_sink = false;
   bool is_enabled = false;
   size_t current_log_level = 0;
   std::vector<std::string> level_map;
@@ -102,4 +104,4 @@ class SIMO_PUBLIC Logger {
 
 }  // namespace Simo::Log
 
-#endif  // SIMO_LOG_HH
\ No newline at end of file
+#endif  // SIMO_LOG_HH
diff --git a/include/Simo/core/Time.h b/include/Simo/core/Time.h
index 3f4b225..2e6ed7e 100644
--- a/include/Simo/core/Time.h
+++ b/include/Simo/core/Time.h
@@ -41,7 +41,7 @@ class SIMO_PUBLIC Time final {
  public:
   enum struct Unit : std::uint8_t { PS, NS, US, MS, S };
 
-  explicit constexpr Time(const uint64_t time, const Unit unit = Unit::PS) {
+  explicit constexpr Time(const uint64_t time, const Unit unit) {
     switch (unit) {
       case Unit::PS:
         picoseconds = time;
@@ -61,6 +61,8 @@ class SIMO_PUBLIC Time final {
     }
   }
 
+  explicit constexpr Time(const uint64_t ps_time) : Time(ps_time, Unit::PS) {}
+
   constexpr Time() : Time(0) {}
 
   constexpr Time operator+(const Time& t) const {
diff --git a/include/Simo/module/Module.h b/include/Simo/module/Module.h
index 59ffab6..8560252 100644
--- a/include/Simo/module/Module.h
+++ b/include/Simo/module/Module.h
@@ -124,8 +124,9 @@ class SIMO_PUBLIC Module {
   ///
   /// Enable log by default when the operation succeeds. Calling this function
   /// will re-initialize the log even if the same out_file is passed
-  virtual InitializationStatus log_setup(
-      const std::filesystem::path& out_file = "simo.log");
+  virtual InitializationStatus log_setup(const std::filesystem::path& out_file);
+  /// Default log_setup with default path set to Simo.log
+  InitializationStatus log_setup();
 
   /// Enable/disable logging for the component
   void log_enable(bool new_value);
@@ -139,11 +140,11 @@ class SIMO_PUBLIC Module {
   /// The callable is evaluated only when the log is enabled and the log level
   /// is satisfied
   template <typename Callable>
-  void log(size_t level, Callable&& callable, bool print_level = false) {
+  void log(size_t level, Callable&& callable) {
     auto f = [this, callable]() {
       return std::format("[{}] [{}] {}\n", current_time(), name(), callable());
     };
-    log_raw_callable(level, print_level, f);
+    log_raw_callable(level, true, f);
   }
 
   /// Log a message with the given level without adding timestamp
@@ -152,6 +153,8 @@ class SIMO_PUBLIC Module {
     logger.log_callable(level, print_level, std::forward<Callable>(callable));
   }
 
+  void populate_default_log_levels();
+
   Log::Logger& get_logger() { return logger; }
 
  protected:
diff --git a/sgconfig.yml b/sgconfig.yml
new file mode 100644
index 0000000..8e35259
--- /dev/null
+++ b/sgconfig.yml
@@ -0,0 +1,6 @@
+ruleDirs:
+- support/ast-grep
+
+languageGlobs:
+  cpp:
+    - "**/*.h"
diff --git a/src/SimoSim/SimoSim.cc b/src/SimoSim/SimoSim.cc
index 7b16460..50cbd00 100644
--- a/src/SimoSim/SimoSim.cc
+++ b/src/SimoSim/SimoSim.cc
@@ -73,6 +73,7 @@ std::optional<ModulePortName> parse_module_port_name(
 int main(const int argc, char* argv[]) {
   std::filesystem::path config_path;
   std::vector<std::string> collection_search_paths;
+  int verbosity = 0;
 
   CLI::App app{"Simulation with Simo"};
 
@@ -84,6 +85,8 @@ int main(const int argc, char* argv[]) {
          "--search-path", collection_search_paths,
          "directory where to look for shared object containing collections")
       ->check(CLI::ExistingDirectory);
+  app.add_flag("-v,--verbose", verbosity,
+               "Increase verbosity level (e.g., -v, -vv, -vvv)");
 
   CLI11_PARSE(app, argc, argv);
 
@@ -122,6 +125,13 @@ int main(const int argc, char* argv[]) {
     return DUPLICATE_TYPES;
   }
 
+  if (verbosity >= 3) {
+    std::cout << "Detected modules:\n";
+    for (const auto& type : factory_map | std::views::keys) {
+      std::cerr << type << "\n";
+    }
+  }
+
   SimoSim::Config::Config cfg;
   if (auto ec = glz::read_file_yaml(cfg, config_path.c_str())) {
     std::cerr << "Error during YAML config parsing of file " << config_path
@@ -224,6 +234,7 @@ int main(const int argc, char* argv[]) {
   }
 
   ctx.run_at(cfg.simulation.time);
+  Simo::Log::Logger::flush_all_sinks();
 
   return SUCCESS;
 }
diff --git a/src/core/Context.cc b/src/core/Context.cc
index f01f480..07ae9eb 100644
--- a/src/core/Context.cc
+++ b/src/core/Context.cc
@@ -63,11 +63,11 @@ std::expected<Context::RunStatus, InitializationStatus> Context::run_at(
     }
     // Advance time to next tick
     currentTime = Time(next_tick);
-    nextTickHeap->pop();
     for (const auto& task : scheduledTasks[currentTime]) {
       task(currentTime);
     }
     scheduledTasks[currentTime].clear();
+    nextTickHeap->pop();
   }
   state = State::STOPPED;
   return RunStatus::STOPPED;
diff --git a/src/core/Log.cc b/src/core/Log.cc
index 144a0f5..84265ea 100644
--- a/src/core/Log.cc
+++ b/src/core/Log.cc
@@ -46,7 +46,7 @@ InitializationStatus Logger::initialize(
     return InitializationStatus(
         nullptr, {"Failed to open log file: " + sink_path.string()});
   }
-  sink_tracker[sink_path] = {std::move(new_sink), 1};
+  sink_tracker[sink_path] = {.sink = std::move(new_sink), .ref_count = 1};
   sink = &sink_tracker[sink_path].sink;
   is_enabled = true;
   return InitializationStatus::ok(nullptr);
@@ -99,9 +99,13 @@ Logger& Logger::enabled(const bool new_enabled_value) {
 bool Logger::enabled() const { return is_enabled; }
 
 Logger::~Logger() {
+  if (!sink_tracker.contains(sink_path)) {
+    return;
+  }
   int& ref_count = sink_tracker[sink_path].ref_count;
   ref_count--;
   if (ref_count <= 0) {
+    sink_tracker[sink_path].sink.flush();
     sink_tracker[sink_path].sink.close();
     sink_tracker.erase(sink_path);
   }
diff --git a/src/module/Module.cc b/src/module/Module.cc
index a56b800..4cb50c4 100644
--- a/src/module/Module.cc
+++ b/src/module/Module.cc
@@ -73,6 +73,8 @@ InitializationStatus Module::log_setup(const std::filesystem::path& out_file) {
   return logger.initialize(out_file);
 }
 
+InitializationStatus Module::log_setup() { return log_setup("Simo.log"); }
+
 void Module::log_enable(const bool new_value) { logger.enabled(new_value); }
 
 void Module::log_level(const size_t level) { logger.log_level(level); }
@@ -81,4 +83,8 @@ void Module::log_level(const std::string_view level_name) {
   logger.log_level(level_name);
 }
 
+void Module::populate_default_log_levels() {
+  logger.populate_default_log_levels();
+}
+
 }  // namespace Simo
\ No newline at end of file
diff --git a/support/ast-grep/.gitkeep b/support/ast-grep/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/support/ast-grep/no-default-arguments.yaml b/support/ast-grep/no-default-arguments.yaml
new file mode 100644
index 0000000..2e639a9
--- /dev/null
+++ b/support/ast-grep/no-default-arguments.yaml
@@ -0,0 +1,15 @@
+id: no-default-parameter
+language: Cpp
+severity: error
+message: Do not use default parameters in C++.
+note: Default parameters in headers may require re-compilation even when the header does not change
+rule:
+  kind: optional_parameter_declaration
+  pattern: $PARAM
+transform:
+  PARAM_NO_DEFAULT:
+    replace:
+      source: $PARAM
+      replace: '\s*=\s*.*$'
+      by: ''
+fix: $PARAM_NO_DEFAULT
\ No newline at end of file
diff --git a/support/cmake/SimoConfig.cmake b/support/cmake/SimoConfig.cmake
new file mode 100644
index 0000000..bd2ed64
--- /dev/null
+++ b/support/cmake/SimoConfig.cmake
@@ -0,0 +1,4 @@
+include(CMakeFindDependencyMacro)
+
+find_package(glaze REQUIRED)
+include(${CMAKE_CURRENT_LIST_DIR}/SimoTargets.cmake)
\ No newline at end of file
diff --git a/support/scripts/run-ast-grep.sh b/support/scripts/run-ast-grep.sh
new file mode 100755
index 0000000..9ae3a3b
--- /dev/null
+++ b/support/scripts/run-ast-grep.sh
@@ -0,0 +1,30 @@
+#! /usr/bin/env bash
+#
+# Copyright 2026 Matteo Fusi and Contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Does checks with ast-grep to avoid some pitfalls.
+# Run this script from root of the repo to have sgconfig.yaml available
+ast-grep scan include
+success="$?"
+
+if [ "$success" -ne 0 ]; then
+    echo "ast-grep checks failed. Fix the issues above. If you are confident with auto-fixes, \
+run 'ast-grep scan include --update-all' or 'ast-grep scan include --update-all' and verify your change."
+    exit 1
+else
+    echo "ast-grep checks passed successfully."
+fi
+
diff --git a/tests/Simo/SimulationContextTest.cc b/tests/Simo/SimulationContextTest.cc
index dd29450..bb2dc09 100644
--- a/tests/Simo/SimulationContextTest.cc
+++ b/tests/Simo/SimulationContextTest.cc
@@ -17,7 +17,9 @@
 #include <boost/test/unit_test.hpp>
 #include <cstddef>
 #include <cstdint>
+#include <functional>
 #include <string>
+#include <vector>
 
 class InitTrackingModule final : public Simo::Module {
  public:
@@ -195,6 +197,39 @@ BOOST_AUTO_TEST_CASE(ContextSchedulesRepeatedFutureTickWhileRunning) {
   BOOST_CHECK_EQUAL(calls_at_five, 2U);
 }
 
+BOOST_AUTO_TEST_CASE(ContextSchedulesEarlierFutureTickWhileLaterTickQueued) {
+  using Simo::Context;
+  using Simo::Time;
+
+  Context sim_ctx;
+  std::vector<uint64_t> periodic_call_times;
+  bool final_event_called = false;
+
+  sim_ctx.schedule_at(Time(50), [&](const Time t) {
+    BOOST_CHECK_EQUAL(t.to_picoseconds(), 50U);
+    final_event_called = true;
+  });
+
+  std::function<void()> periodic_event;
+  periodic_event = [&] {
+    periodic_call_times.push_back(sim_ctx.current_time().to_picoseconds());
+    if (periodic_call_times.size() < 5) {
+      sim_ctx.schedule_in(Time(10), periodic_event);
+    }
+  };
+
+  sim_ctx.schedule_at(Time::zero, periodic_event);
+  sim_ctx.run_at(Time(50));
+
+  BOOST_REQUIRE_EQUAL(periodic_call_times.size(), 5U);
+  BOOST_CHECK_EQUAL(periodic_call_times[0], 0U);
+  BOOST_CHECK_EQUAL(periodic_call_times[1], 10U);
+  BOOST_CHECK_EQUAL(periodic_call_times[2], 20U);
+  BOOST_CHECK_EQUAL(periodic_call_times[3], 30U);
+  BOOST_CHECK_EQUAL(periodic_call_times[4], 40U);
+  BOOST_CHECK_EQUAL(final_event_called, true);
+}
+
 BOOST_AUTO_TEST_CASE(ContextAddParameterTemplateInstantiations) {
   using Simo::Context;
   using Simo::Time;
diff --git a/tests/collection/PingPongCollection.cc b/tests/collection/PingPongCollection.cc
index 529844e..ef0bc49 100644
--- a/tests/collection/PingPongCollection.cc
+++ b/tests/collection/PingPongCollection.cc
@@ -45,7 +45,7 @@ class PingPongParameters : public Simo::Parameters {
   }
 };
 
-class PingModule : public Simo::Module {
+class PingPongBaseModule : public Simo::Module {
  public:
   Simo::InitializationStatus initialize(
       Simo::Context& sim_ctx_p, const Simo::Parameters& parameters) override {
@@ -54,6 +54,7 @@ class PingModule : public Simo::Module {
       return status;
     }
     log_setup(parameters.get<std::filesystem::path>("log_file")->value());
+    populate_default_log_levels();
     log_level(parameters.get<std::string>("log_level")->value());
     period = parameters.get<Simo::Time>("period")->value();
     port =
@@ -65,7 +66,20 @@ class PingModule : public Simo::Module {
     return Simo::InitializationStatus::ok(this);
   }
 
-  void update_state() {
+  virtual void update_state() = 0;
+
+  virtual void try_send() = 0;
+
+ protected:
+  Simo::Ports::BidirectionalPort<PingPongMessage>* port = nullptr;
+  Simo::Statistics::Count* num_msg_sent = nullptr;
+  bool send_message = false;
+  Simo::Time period = Simo::Time::zero;
+};
+
+class PingModule final : public PingPongBaseModule {
+ public:
+  void update_state() override {
     sim_ctx().schedule_in(period, [this]() { update_state(); });
     send_message = start_send;
     if (const auto* const val = port->peek_in();
@@ -75,7 +89,7 @@ class PingModule : public Simo::Module {
     }
   }
 
-  void try_send() {
+  void try_send() override {
     sim_ctx().schedule_in(period, [this]() { try_send(); });
     if (send_message) {
       log(Simo::Log::LogLevel::INFO, []() { return "Send PING"; });
@@ -86,34 +100,12 @@ class PingModule : public Simo::Module {
   }
 
  protected:
-  Simo::Ports::BidirectionalPort<PingPongMessage>* port = nullptr;
-  Simo::Statistics::Count* num_msg_sent = nullptr;
-  bool send_message = false;
   bool start_send = true;
-  Simo::Time period = Simo::Time::zero;
 };
 
-class PongModule : public Simo::Module {
+class PongModule final : public PingPongBaseModule {
  public:
-  Simo::InitializationStatus initialize(
-      Simo::Context& sim_ctx_v, const Simo::Parameters& parameters) override {
-    if (const auto status = Module::initialize(sim_ctx_v, parameters);
-        !status.success()) {
-      return status;
-    }
-    period = parameters.get<Simo::Time>("period")->value();
-    log_setup(parameters.get<std::filesystem::path>("log_file")->value());
-    log_level(parameters.get<std::string>("log_level")->value());
-    port =
-        &create_port<Simo::Ports::BidirectionalPort<PingPongMessage>>("port");
-    num_msg_sent = &create_statistic<Simo::Statistics::Count>("num_msg_sent");
-    sim_ctx().schedule_at(Simo::Time::zero, [this]() { update_state(); });
-    sim_ctx().schedule_at(period / 2, [this]() { try_send(); });
-
-    return Simo::InitializationStatus::ok(this);
-  }
-
-  void update_state() {
+  void update_state() override {
     sim_ctx().schedule_in(period, [this]() { update_state(); });
     send_message = false;
     if (const auto val = port->peek_in();
@@ -123,7 +115,7 @@ class PongModule : public Simo::Module {
     }
   }
 
-  void try_send() {
+  void try_send() override {
     sim_ctx().schedule_in(period, [this]() { try_send(); });
     if (send_message) {
       log(Simo::Log::LogLevel::INFO, []() { return "Send PONG"; });
@@ -131,12 +123,6 @@ class PongModule : public Simo::Module {
       ++(*num_msg_sent);
     }
   }
-
- protected:
-  Simo::Ports::BidirectionalPort<PingPongMessage>* port = nullptr;
-  Simo::Statistics::Count* num_msg_sent = nullptr;
-  Simo::Time period = Simo::Time::zero;
-  bool send_message = false;
 };
 
 constexpr Simo::Collections::SimoCollectionVersion VERSION{
@@ -169,7 +155,7 @@ static Simo::Collections::SimoCollection collection{
     .factory_list_size = FACTORY_LIST.size(),
 };
 
-const Simo::Collections::SimoCollection* simo_get_collection() {
+SIMO_PUBLIC const Simo::Collections::SimoCollection* simo_get_collection() {
   return &collection;
 }
 }
\ No newline at end of file
diff --git a/tests/module/ModuleTest.cc b/tests/module/ModuleTest.cc
index 435c8d5..26ad084 100644
--- a/tests/module/ModuleTest.cc
+++ b/tests/module/ModuleTest.cc
@@ -42,7 +42,7 @@ struct Fixture {
     BOOST_CHECK(status.success());
 
     const fs::path temp_dir = fs::temp_directory_path();
-    temp_file = temp_dir / "simo.log";
+    temp_file = temp_dir / "Simo.log";
     std::filesystem::remove(temp_file);
     m.log_setup(temp_file);
     logger = &m.get_logger();
@@ -62,7 +62,7 @@ BOOST_FIXTURE_TEST_CASE(EnableLog, Fixture) {
   std::string message = "This is a log message";
   const std::string out_message =
       std::format("[WARNING] [0 ps] [test_module] {}\n", message);
-  m.log(3, [&message]() { return message; }, true);
+  m.log(3, [&message]() { return message; });
   flush_log();
   const std::string log_content = read_file_contents(temp_file);
   BOOST_CHECK_EQUAL(log_content, out_message);
@@ -72,7 +72,7 @@ BOOST_FIXTURE_TEST_CASE(LogDisabled, Fixture) {
   logger->populate_default_log_levels();
   m.log_enable(false);
   std::string message = "This is a log message";
-  m.log(3, [&message]() { return message; }, true);
+  m.log(3, [&message]() { return message; });
   flush_log();
   const std::string log_content = read_file_contents(temp_file);
   BOOST_CHECK_EQUAL(log_content, "");
@@ -97,3 +97,11 @@ BOOST_FIXTURE_TEST_CASE(SkipLogDueToLevel, Fixture) {
   const std::string log_content = read_file_contents(temp_file);
   BOOST_CHECK_EQUAL(log_content, "");
 }
+
+BOOST_AUTO_TEST_CASE(StdoutLogSetupEnablesLogger) {
+  Simo::Log::Logger logger;
+  const auto status = logger.initialize("/dev/stdout");
+
+  BOOST_CHECK(status.success());
+  BOOST_CHECK_EQUAL(logger.enabled(), true);
+}