Merge branch 'HaxeFoundation:master' into patch-3

Author: MAJigsaw77

include/hx/TelemetryTracy.h

@@ -7,8 +7,8 @@
 
 #define TRACY_ENABLE
 #include <hxcpp.h>
-#include "../../project/thirdparty/tracy-0.11.1/tracy/TracyC.h"
-#include "../../project/thirdparty/tracy-0.11.1/tracy/Tracy.hpp"
+#include "../../project/thirdparty/tracy-0.12.0/tracy/TracyC.h"
+#include "../../project/thirdparty/tracy-0.12.0/tracy/Tracy.hpp"
 
 #ifdef HXCPP_TRACY_MEMORY
 	#ifdef HXCPP_GC_MOVING
@@ -30,7 +30,7 @@
 	::hx::strbuf TracyConcat(_hx_tracy_str_buffer, TracyLine); \
 	int TracyConcat(_hx_tracy_str_length, TracyLine); \
 	const char *TracyConcat(_hx_tracy_str_buffer_ptr, TracyLine) = name.utf8_str(&TracyConcat(_hx_tracy_str_buffer, TracyLine), false, &TracyConcat(_hx_tracy_str_length, TracyLine)); \
-	::tracy::ScopedZone TracyConcat(_hx_tracy_scoped_zone,TracyLine)(_hx_stackframe.lineNumber, _hx_stackframe.position->fileName, strlen(_hx_stackframe.position->fileName), _hx_stackframe.position->fullName, strlen(_hx_stackframe.position->fullName), TracyConcat(_hx_tracy_str_buffer_ptr, TracyLine), TracyConcat(_hx_tracy_str_length, TracyLine));
+	::tracy::ScopedZone TracyConcat(_hx_tracy_scoped_zone,TracyLine)(_hx_stackframe.lineNumber, _hx_stackframe.position->fileName, strlen(_hx_stackframe.position->fileName), _hx_stackframe.position->fullName, strlen(_hx_stackframe.position->fullName), TracyConcat(_hx_tracy_str_buffer_ptr, TracyLine), TracyConcat(_hx_tracy_str_length, TracyLine), -1);
 #endif
 
 void __hxcpp_tracy_framemark();

include/hx/Thread.h

@@ -86,6 +86,9 @@ inline bool HxCreateDetachedThread(DWORD (WINAPI *func)(void *), void *param)
 
 struct HxMutex
 {
+   bool mValid;
+   pthread_mutex_t *mMutex;
+
    HxMutex()
    {
       pthread_mutexattr_t mta;
@@ -96,9 +99,7 @@ struct HxMutex
    }
    ~HxMutex()
    {
-      if (mValid)
-         pthread_mutex_destroy(mMutex);
-      delete mMutex;
+      Clean();
    }
    void Lock() { pthread_mutex_lock(mMutex); }
    void Unlock() { pthread_mutex_unlock(mMutex); }
@@ -107,12 +108,16 @@ struct HxMutex
    void Clean()
    {
       if (mValid)
+      {
          pthread_mutex_destroy(mMutex);
-      mValid = 0;
+         mValid = false;
+      }
+      if (mMutex)
+      {
+         delete mMutex;
+         mMutex = nullptr;
+      }
    }
-
-   bool mValid;
-   pthread_mutex_t *mMutex;
 };
 
 #define THREAD_FUNC_TYPE void *
@@ -198,19 +203,20 @@ struct HxSemaphore
 
 struct HxSemaphore
 {
+   HxMutex         mMutex;
+   pthread_cond_t  *mCondition;
+   bool            mSet;
+
+
    HxSemaphore()
    {
       mSet = false;
-      mValid = true;
       mCondition = new pthread_cond_t();
       pthread_cond_init(mCondition,0);
    }
    ~HxSemaphore()
    {
-      if (mValid)
-      {
-         pthread_cond_destroy(mCondition);
-      }
+      Clean();
    }
    // For autolock
    inline operator HxMutex &() { return mMutex; }
@@ -294,19 +300,14 @@ struct HxSemaphore
    void Clean()
    {
       mMutex.Clean();
-      if (mValid)
+      if (mCondition)
       {
-         mValid = false;
          pthread_cond_destroy(mCondition);
+         delete mCondition;
+         mCondition = nullptr;
       }
-      delete mCondition;
    }
 
-
-   HxMutex         mMutex;
-   pthread_cond_t  *mCondition;
-   bool            mSet;
-   bool            mValid;
 };
 
 

project/thirdparty/tracy-0.11.1/tracy/Tracy.hpp

@@ -282,7 +282,12 @@ extern "C"
     t_SymFromInlineContext _SymFromInlineContext = 0;
     t_SymGetLineFromInlineContext _SymGetLineFromInlineContext = 0;
 
-    TRACY_API ___tracy_t_RtlWalkFrameChain ___tracy_RtlWalkFrameChain = 0;
+    typedef unsigned long (__stdcall *___tracy_t_RtlWalkFrameChain)( void**, unsigned long, unsigned long );
+    ___tracy_t_RtlWalkFrameChain ___tracy_RtlWalkFrameChainPtr = nullptr;
+    TRACY_API unsigned long ___tracy_RtlWalkFrameChain( void** callers, unsigned long count, unsigned long flags)
+    {
+        return ___tracy_RtlWalkFrameChainPtr(callers, count, flags);
+    }
 }
 
 struct ModuleCache
@@ -307,7 +312,7 @@ size_t s_krnlCacheCnt;
 
 void InitCallstackCritical()
 {
-    ___tracy_RtlWalkFrameChain = (___tracy_t_RtlWalkFrameChain)GetProcAddress( GetModuleHandleA( "ntdll.dll" ), "RtlWalkFrameChain" );
+    ___tracy_RtlWalkFrameChainPtr = (___tracy_t_RtlWalkFrameChain)GetProcAddress( GetModuleHandleA( "ntdll.dll" ), "RtlWalkFrameChain" );
 }
 
 void DbgHelpInit()

project/thirdparty/tracy-0.11.1/README.md project/thirdparty/tracy-0.12.0/README.mdproject/thirdparty/tracy-0.11.1/README.md renamed to project/thirdparty/tracy-0.12.0/README.md

@@ -9,7 +9,8 @@
 
 namespace tracy
 {
-static tracy_force_inline void* Callstack( int /*depth*/ ) { return nullptr; }
+static constexpr bool has_callstack() { return false; }
+static tracy_force_inline void* Callstack( int32_t /*depth*/ ) { return nullptr; }
 }
 
 #else
@@ -38,6 +39,8 @@ static tracy_force_inline void* Callstack( int /*depth*/ ) { return nullptr; }
 namespace tracy
 {
 
+static constexpr bool has_callstack() { return true; }
+
 struct CallstackSymbolData
 {
     const char* file;
@@ -79,11 +82,10 @@ debuginfod_client* GetDebuginfodClient();
 
 extern "C"
 {
-    typedef unsigned long (__stdcall *___tracy_t_RtlWalkFrameChain)( void**, unsigned long, unsigned long );
-    TRACY_API extern ___tracy_t_RtlWalkFrameChain ___tracy_RtlWalkFrameChain;
+    TRACY_API unsigned long ___tracy_RtlWalkFrameChain( void**, unsigned long, unsigned long );
 }
 
-static tracy_force_inline void* Callstack( int depth )
+static tracy_force_inline void* Callstack( int32_t depth )
 {
     assert( depth >= 1 && depth < 63 );
     auto trace = (uintptr_t*)tracy_malloc( ( 1 + depth ) * sizeof( uintptr_t ) );
@@ -112,7 +114,7 @@ static _Unwind_Reason_Code tracy_unwind_callback( struct _Unwind_Context* ctx, v
     return _URC_NO_REASON;
 }
 
-static tracy_force_inline void* Callstack( int depth )
+static tracy_force_inline void* Callstack( int32_t depth )
 {
     assert( depth >= 1 && depth < 63 );
 
@@ -127,7 +129,7 @@ static tracy_force_inline void* Callstack( int depth )
 
 #elif TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 4 || TRACY_HAS_CALLSTACK == 6
 
-static tracy_force_inline void* Callstack( int depth )
+static tracy_force_inline void* Callstack( int32_t depth )
 {
     assert( depth >= 1 );