start time with scope time (#29)

.github/workflows/build_nix.yml

@@ -1,6 +1,10 @@
 
 name: Build on Ubuntu
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
 
@@ -13,8 +17,7 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        python-version: ['3.8', '3.9','3.10', '3.11']
-        os: [ubuntu-20.04] #, macos-latest
+        python-version: ['3.11','3.12']
 
     steps:
     - uses: actions/checkout@v4

inc/phlop/timing/scope_timer.hpp

@@ -1,11 +1,8 @@
 #ifndef _PHLOP_TIMING_SCOPE_TIMER_HPP_
 #define _PHLOP_TIMING_SCOPE_TIMER_HPP_
 
-
-#include <array>
 #include <chrono>
 #include <memory>
-#include <thread>
 #include <vector>
 #include <cassert>
 #include <cstdint>
@@ -93,9 +90,11 @@ struct ScopeTimerMan
 
 struct RunTimerReportSnapshot
 {
-    RunTimerReportSnapshot(RunTimerReport* s, RunTimerReport* p, std::uint64_t const& t)
+    RunTimerReportSnapshot(RunTimerReport* s, RunTimerReport* p, std::uint64_t const& st,
+                           std::uint64_t const& t)
         : self{s}
         , parent{p}
+        , start{st}
         , time{t}
     {
         childs.reserve(2);
@@ -104,6 +103,7 @@ struct RunTimerReportSnapshot
     RunTimerReport const* const self;
     RunTimerReport const* const parent;
 
+    std::uint64_t const start;
     std::uint64_t const time;
     std::vector<RunTimerReportSnapshot*> childs;
 };
@@ -167,13 +167,16 @@ struct scope_timer
 
 struct BinaryTimerFileNode
 {
-    BinaryTimerFileNode(std::uint16_t _fn_id, std::uint64_t _time)
+    BinaryTimerFileNode(std::uint16_t const& _fn_id, std::uint64_t const& _start,
+                        std::uint64_t const& _time)
         : fn_id{_fn_id}
+        , start{_start}
         , time{_time}
     {
     }
 
     std::uint16_t fn_id;
+    std::uint64_t start;
     std::uint64_t time;
 
     std::vector<BinaryTimerFileNode> kinder{};
@@ -188,8 +191,9 @@ struct BinaryTimerFile
             for (auto const& trace : ScopeTimerMan::INSTANCE().traces)
                 recurse_traces_for_keys(trace);
             for (auto const& trace : ScopeTimerMan::INSTANCE().traces)
-                recurse_traces_for_nodes(
-                    trace, roots.emplace_back(key_ids[std::string{trace->self->k}], trace->time));
+                recurse_traces_for_nodes(trace,
+                                         roots.emplace_back(key_ids[std::string{trace->self->k}],
+                                                            trace->start, trace->time));
         }
     }
 
@@ -200,7 +204,7 @@ struct BinaryTimerFile
         for (std::size_t i = 0; i < c->childs.size(); ++i)
             recurse_traces_for_nodes(
                 c->childs[i], node.kinder.emplace_back(key_ids[std::string{c->childs[i]->self->k}],
-                                                       c->childs[i]->time));
+                                                       c->childs[i]->start, c->childs[i]->time));
     }
 
     template<typename Trace>
@@ -270,7 +274,7 @@ struct BinaryTimerFile
     {
         for (std::size_t ti = 0; ti < tabs; ++ti)
             file << " ";
-        file << node.fn_id << " " << node.time << std::endl;
+        file << node.fn_id << " " << node.start << ":" << node.time << std::endl;
         for (auto const& n : node.kinder)
             _write(file, n, tabs + 1);
     }

phlop/timing/scope_timer.py

@@ -8,9 +8,28 @@
 @dataclass
 class RunTimerNode:
     k: int
+    s: int
     t: int
     c: list = field(default_factory=lambda: [])
 
+    @staticmethod
+    def from_scope_timer(line):
+        key, start_and_run_time = line.split(" ")
+        start_time, run_time = start_and_run_time.split(":")
+        return RunTimerNode(*[int(e) for e in (key, start_time, run_time)])
+
+    @property
+    def key(self) -> int:
+        return self.k
+
+    @property
+    def start_time(self) -> int:
+        return self.s
+
+    @property
+    def run_time(self) -> int:
+        return self.t
+
 
 @dataclass
 class ScopeTimerFile:
@@ -53,8 +72,7 @@ def _parent():
             if not stripped_line:  # last line might be blank
                 continue
             idx = len(line) - len(stripped_line)  # how many space indents from left
-            bits = stripped_line.split(" ")
-            node = RunTimerNode(*[int(b) for b in bits])
+            node = RunTimerNode.from_scope_timer(stripped_line)
             if idx == 0:  # is root node
                 stack[0] = len(roots)
                 roots.append(node)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "phlop"
-version = "0.0.25"
+version = "0.0.26"
 
 dependencies = [
 

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="phlop",
-    version="0.0.25",
+    version="0.0.26",
     cmdclass={},
     classifiers=[],
     include_package_data=True,

src/phlop/timing/scope_timer.cpp

@@ -38,7 +38,7 @@ scope_timer::~scope_timer()
         detail::_current_scope_timer = this->pscope;
 
         auto& s = *r.snapshots.emplace_back( // allocated in construtor
-            std::make_shared<RunTimerReportSnapshot>(&r, parent, now() - start));
+            std::make_shared<RunTimerReportSnapshot>(&r, parent, start, now() - start));
 
         if (this->pscope)
             pscope->childs.emplace_back(&s);

tests/timing/test_scope_timer.cpp

@@ -1,6 +1,8 @@
 
 #include "phlop/timing/scope_timer.hpp"
 
+#include <thread>
+
 using namespace std::chrono_literals;
 
 void fny()