From 87a727dd7f9ac99cc6ed62602c008d4249f938aa Mon Sep 17 00:00:00 2001 From: slembcke Date: Fri, 26 Nov 2021 16:49:39 -0600 Subject: [PATCH 1/2] Add fibers to TracyC.h --- TracyC.h | 13 +++++++++++++ client/TracyProfiler.cpp | 5 +++++ 2 files changed, 18 insertions(+) diff --git a/TracyC.h b/TracyC.h index 780a15c9..3576d56a 100644 --- a/TracyC.h +++ b/TracyC.h @@ -73,6 +73,11 @@ typedef const void* TracyCZoneCtx; #define TracyCMessageCS(x,y,z,w) #define TracyCMessageLCS(x,y,z) +#ifdef TRACY_FIBERS +# define TracyFiberEnter(fiber) +# define TracyFiberLeave +#endif + #else #ifndef TracyConcat @@ -292,6 +297,14 @@ TRACY_API void ___tracy_emit_message_appinfo( const char* txt, size_t size ); # define TracyCMessageLCS( txt, color, depth ) TracyCMessageLC( txt, color ) #endif +TRACY_API void ___tracy_fiber_enter( const char* fiber ); +TRACY_API void ___tracy_fiber_leave( void ); + +#ifdef TRACY_FIBERS +# define TracyFiberEnter( fiber ) ___tracy_fiber_enter( fiber ); +# define TracyFiberLeave ___tracy_fiber_leave(); +#endif + #endif #ifdef __cplusplus diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp index 5bcefd8b..6f6cd167 100644 --- a/client/TracyProfiler.cpp +++ b/client/TracyProfiler.cpp @@ -4157,6 +4157,11 @@ TRACY_API void ___tracy_emit_gpu_context_name_serial( const struct ___tracy_gpu_ tracy::Profiler::QueueSerialFinish(); } +#ifdef TRACY_FIBERS +TRACY_API void ___tracy_fiber_enter( const char* fiber ){ tracy::Profiler::EnterFiber( fiber ); } +TRACY_API void ___tracy_fiber_leave( void ){ tracy::Profiler::LeaveFiber(); } +#endif + # ifdef TRACY_MANUAL_LIFETIME TRACY_API void ___tracy_startup_profiler( void ) { From bfe94b921eae8eb02c78bbc047b753a83a78714d Mon Sep 17 00:00:00 2001 From: slembcke Date: Fri, 26 Nov 2021 17:00:22 -0600 Subject: [PATCH 2/2] Renaming to match convention. --- TracyC.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/TracyC.h b/TracyC.h index 3576d56a..bac66df3 100644 --- a/TracyC.h +++ b/TracyC.h @@ -74,8 +74,8 @@ typedef const void* TracyCZoneCtx; #define TracyCMessageLCS(x,y,z) #ifdef TRACY_FIBERS -# define TracyFiberEnter(fiber) -# define TracyFiberLeave +# define TracyCFiberEnter(fiber) +# define TracyCFiberLeave #endif #else @@ -301,8 +301,8 @@ TRACY_API void ___tracy_fiber_enter( const char* fiber ); TRACY_API void ___tracy_fiber_leave( void ); #ifdef TRACY_FIBERS -# define TracyFiberEnter( fiber ) ___tracy_fiber_enter( fiber ); -# define TracyFiberLeave ___tracy_fiber_leave(); +# define TracyCFiberEnter( fiber ) ___tracy_fiber_enter( fiber ); +# define TracyCFiberLeave ___tracy_fiber_leave(); #endif #endif