mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-30 01:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Partial header inclusion cleanup.

Browse Source
This commit is contained in:
Bartosz Taudul 2019-11-05 20:09:40 +01:00
parent 25c39a3311
commit 6bbf273581
6 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/TracyCallstack.cpp
View File

@ -1,5 +1,5 @@
#include <algorithm>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "TracyCallstack.hpp" #include "TracyCallstack.hpp"
#ifdef TRACY_HAS_CALLSTACK #ifdef TRACY_HAS_CALLSTACK
@ -89,7 +89,8 @@ CallstackEntryData DecodeCallstackPtr( uint64_t ptr )
int write; int write;
const auto proc = GetCurrentProcess(); const auto proc = GetCurrentProcess();
#ifndef __CYGWIN__ #ifndef __CYGWIN__
const auto inlineNum = std::min<DWORD>( MaxCbTrace - 1, SymAddrIncludeInlineTrace( proc, ptr ) ); DWORD inlineNum = SymAddrIncludeInlineTrace( proc, ptr );
if( inlineNum > MaxCbTrace - 1 ) inlineNum = MaxCbTrace - 1;
DWORD ctx = 0; DWORD ctx = 0;
DWORD idx; DWORD idx;
BOOL doInline = FALSE; BOOL doInline = FALSE;

1
client/TracyCallstack.hpp
View File

@ -20,7 +20,6 @@ extern "C"
#include <assert.h> #include <assert.h>
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include "../common/TracyAlloc.hpp" #include "../common/TracyAlloc.hpp"
#include "../common/TracyForceInline.hpp" #include "../common/TracyForceInline.hpp"

7
client/TracyProfiler.hpp
View File

@ -3,20 +3,17 @@
#include <assert.h> #include <assert.h>
#include <atomic> #include <atomic>
#include <chrono>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "tracy_concurrentqueue.h" #include "tracy_concurrentqueue.h"
#include "TracyCallstack.hpp" #include "TracyCallstack.hpp"
#include "TracySysTime.hpp" #include "TracySysTime.hpp"
#include "TracySysTrace.hpp"
#include "TracyFastVector.hpp" #include "TracyFastVector.hpp"
#include "../common/TracyQueue.hpp" #include "../common/TracyQueue.hpp"
#include "../common/TracyAlign.hpp" #include "../common/TracyAlign.hpp"
#include "../common/TracyAlloc.hpp" #include "../common/TracyAlloc.hpp"
#include "../common/TracyMutex.hpp" #include "../common/TracyMutex.hpp"
#include "../common/TracySystem.hpp"
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32 || defined __CYGWIN__
# include <intrin.h> # include <intrin.h>
@ -30,6 +27,10 @@
# define TRACY_HW_TIMER # define TRACY_HW_TIMER
#endif #endif
#if !defined TRACY_HW_TIMER || ( __ARM_ARCH >= 6 && !defined CLOCK_MONOTONIC_RAW )
#include <chrono>
#endif
#ifndef TracyConcat #ifndef TracyConcat
# define TracyConcat(x,y) TracyConcatIndirect(x,y) # define TracyConcat(x,y) TracyConcatIndirect(x,y)
#endif #endif

1
client/TracySysTime.cpp
View File

@ -5,7 +5,6 @@
# if defined _WIN32 || defined __CYGWIN__ # if defined _WIN32 || defined __CYGWIN__
# include <windows.h> # include <windows.h>
# elif defined __linux__ # elif defined __linux__
# include <assert.h>
# include <stdio.h> # include <stdio.h>
# include <inttypes.h> # include <inttypes.h>
# elif defined __APPLE__ # elif defined __APPLE__

3
common/TracySocket.cpp
View File

@ -1,4 +1,3 @@
#include <algorithm>
#include <assert.h> #include <assert.h>
#include <new> #include <new>
#include <stdio.h> #include <stdio.h>
@ -192,7 +191,7 @@ int Socket::RecvBuffered( void* buf, int len, int timeout )
m_bufLeft = Recv( m_buf, BufSize, timeout ); m_bufLeft = Recv( m_buf, BufSize, timeout );
if( m_bufLeft <= 0 ) return m_bufLeft; if( m_bufLeft <= 0 ) return m_bufLeft;
const auto sz = std::min( len, m_bufLeft ); const auto sz = len < m_bufLeft ? len : m_bufLeft;
memcpy( buf, m_buf, sz ); memcpy( buf, m_buf, sz );
m_bufPtr = m_buf + sz; m_bufPtr = m_buf + sz;
m_bufLeft -= sz; m_bufLeft -= sz;

2
common/TracySystem.hpp
View File

@ -5,7 +5,7 @@
# ifndef _WINDOWS_ # ifndef _WINDOWS_
extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(void); extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(void);
# endif # endif
#else #elif defined __APPLE__ || ( !defined __ANDROID__ && !defined __linux__ )
# include <pthread.h> # include <pthread.h>
#endif #endif