From 85a2d6178a8e4d01c29ca738c7a73ecd58003f6c Mon Sep 17 00:00:00 2001
From: Ian McInerney <i.mcinerney17@imperial.ac.uk>
Date: Fri, 2 Feb 2024 11:00:08 +0000
Subject: [PATCH] Add coroutine stack size to trace output

---
 common/advanced_config.cpp | 4 +++-
 include/tool/coroutine.h   | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/advanced_config.cpp b/common/advanced_config.cpp
index ef2d56d0d6..5ffc731c09 100644
--- a/common/advanced_config.cpp
+++ b/common/advanced_config.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <advanced_config.h>
-
+#include <trace_helpers.h>
 #include <config_params.h>
 #include <paths.h>
 
@@ -466,6 +466,8 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
 
     for( PARAM_CFG* param : configParams )
         delete param;
+
+    wxLogTrace( kicadTraceCoroutineStack, wxT( "Using coroutine stack size %d" ), m_CoroutineStackSize );
 }
 
 
diff --git a/include/tool/coroutine.h b/include/tool/coroutine.h
index 449804e42b..64ac4d56c4 100644
--- a/include/tool/coroutine.h
+++ b/include/tool/coroutine.h
@@ -380,6 +380,8 @@ private:
         std::size_t stackSize = m_stacksize;
         void* sp = nullptr;
 
+        wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::doCall" ) );
+
 #ifndef LIBCONTEXT_HAS_OWN_STACK
         assert( !m_stack );
 
@@ -414,8 +416,6 @@ private:
         __tsan_set_fiber_name( m_callee.tsan_fiber, "Coroutine fiber" );
 #endif
 
-        wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::doCall" ) );
-
         m_callee.ctx = libcontext::make_fcontext( sp, stackSize, callerStub );
         m_running = true;
 
@@ -461,10 +461,12 @@ private:
     {
 #ifdef _WIN32
         void* mem = ::VirtualAlloc( 0, aAllocSize, MEM_COMMIT, PAGE_READWRITE );
+
         if( !mem )
             throw std::bad_alloc();
 #else
         void* mem = ::mmap( 0, aAllocSize, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0 );
+
         if( mem == (void*) -1 )
             throw std::bad_alloc();
 #endif
@@ -482,7 +484,7 @@ private:
         bool res = ( 0 == ::mprotect( aAddress, aGuardSize, PROT_NONE ) );
 #endif
         if( !res )
-            wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::GuardMemory has failes" ) );
+            wxLogTrace( kicadTraceCoroutineStack, wxT( "COROUTINE::GuardMemory has failed" ) );
     }
 #endif // LIBCONTEXT_HAS_OWN_STACK