Minor optimization to not get time 4 times in 1 loop

Also fixed tests under 20.04

Makefile

@@ -20,7 +20,7 @@ build-test-debug:
 	cmake --build build/test -j $$(nproc)
 
 test-debug: build-test-debug
-	ctest --test-dir build/test -V
+	cd build/test && ctest -V
 
 test: test-debug
 

docker/scripts/02-test.sh

@@ -2,4 +2,5 @@
 
 set -xe
 
-ctest -V --test-dir ${CACTUS_RT_BUILD_DIR}
+cd ${CACTUS_RT_BUILD_DIR}
+ctest -V

include/cactus_rt/tracing/thread_tracer.disabled.h

@@ -48,11 +48,11 @@ class ThreadTracer {
   ThreadTracer(ThreadTracer&&) = delete;
   ThreadTracer& operator=(ThreadTracer&&) = delete;
 
-  bool StartSpan(const char* /* name */, const char* /* category */ = nullptr) noexcept {
+  bool StartSpan(const char* /* name */, const char* /* category */ = nullptr, int64_t /* now */ = 0) noexcept {
     return false;
   }
 
-  bool EndSpan() noexcept {
+  bool EndSpan(int64_t /* now */ = 0) noexcept {
     return false;
   }
 
@@ -61,7 +61,7 @@ class ThreadTracer {
     return span;
   }
 
-  bool InstantEvent(const char* /* name */, const char* /* category */ = nullptr) noexcept {
+  bool InstantEvent(const char* /* name */, const char* /* category */ = nullptr, int64_t /* now */ = 0) noexcept {
     return false;
   }
 

include/cactus_rt/tracing/thread_tracer.h

@@ -60,10 +60,10 @@ class ThreadTracer {
   ThreadTracer(ThreadTracer&&) = delete;
   ThreadTracer& operator=(ThreadTracer&&) = delete;
 
-  bool      StartSpan(const char* name, const char* category = nullptr) noexcept;
-  bool      EndSpan() noexcept;
+  bool      StartSpan(const char* name, const char* category = nullptr, int64_t now = 0) noexcept;
+  bool      EndSpan(int64_t now = 0) noexcept;
   TraceSpan WithSpan(const char* name, const char* category = nullptr, bool enabled = true) noexcept;
-  bool      InstantEvent(const char* name, const char* category = nullptr) noexcept;
+  bool      InstantEvent(const char* name, const char* category = nullptr, int64_t now = 0) noexcept;
 
   inline EventCountData EventCount() const noexcept { return event_count_.Read(); }
   inline size_t         QueueCapacity() const noexcept { return queue_capacity_; }

src/cactus_rt/cyclic_thread.cc

@@ -18,12 +18,18 @@ void CyclicThread::Run() noexcept {
     wakeup_latency = loop_start - should_have_woken_up_at;
 
     bool should_stop;
-    {
-      auto span = Tracer().WithSpan("CyclicThread::Loop", "cactusrt", tracer_config.trace_loop);
-      should_stop = Loop(loop_start - Thread::StartMonotonicTimeNs());
+    if (tracer_config.trace_loop) {
+      Tracer().StartSpan("CyclicThread::Loop", "cactusrt", loop_start);
     }
 
+    should_stop = Loop(loop_start - Thread::StartMonotonicTimeNs());
+
     loop_end = NowNs();
+
+    if (tracer_config.trace_loop) {
+      Tracer().EndSpan(loop_end);
+    }
+
     loop_latency = loop_end - loop_start;
     TrackLatency(wakeup_latency, loop_latency);
 

src/cactus_rt/tracing/thread_tracer.cc

@@ -36,27 +36,34 @@ ThreadTracer::ThreadTracer(const char* name, uint32_t queue_capacity)
   queue_capacity_ = queue_.max_capacity();
 }
 
-bool ThreadTracer::StartSpan(const char* name, const char* category) noexcept {
+bool ThreadTracer::StartSpan(const char* name, const char* category, int64_t now) noexcept {
   if (IsTracingEnabled()) {
-    auto now = NowNs();
+    if (now == 0) {
+      now = NowNs();
+    }
     return Emit(now, TrackEvent_Type_TYPE_SLICE_BEGIN, name, category);
   }
 
   return false;
 }
 
-bool ThreadTracer::EndSpan() noexcept {
+bool ThreadTracer::EndSpan(int64_t now) noexcept {
   if (IsTracingEnabled()) {
-    auto now = NowNs();
+    if (now == 0) {
+      now = NowNs();
+    }
     return Emit(now, TrackEvent_Type_TYPE_SLICE_END);
   }
 
   return false;
 }
 
-bool ThreadTracer::InstantEvent(const char* name, const char* category) noexcept {
+bool ThreadTracer::InstantEvent(const char* name, const char* category, int64_t now) noexcept {
   if (IsTracingEnabled()) {
-    return Emit(NowNs(), TrackEvent_Type_TYPE_INSTANT, name, category);
+    if (now == 0) {
+      now = NowNs();
+    }
+    return Emit(now, TrackEvent_Type_TYPE_INSTANT, name, category);
   }
 
   return false;

tests/CMakeLists.txt

@@ -1,5 +1,7 @@
 find_package(GTest REQUIRED)
 
+enable_testing()
+
 add_executable(cactus_rt_tests
   utils_test.cc
 )