mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-23 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed __ANDROID_API__ < 21 build and FD_SET usage.

Browse Source
This commit is contained in:
Till Rathmann 2018-08-01 19:18:40 +02:00
parent df09fe48cf
commit 3b302315f9
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/TracyProfiler.cpp
View File

@ -124,6 +124,7 @@ static int64_t SetupHwTimer()
static const char* GetProcessName() static const char* GetProcessName()
{ {
const char* processName = "unknown";
#if defined _MSC_VER #if defined _MSC_VER
static char buf[_MAX_PATH]; static char buf[_MAX_PATH];
GetModuleFileNameA( nullptr, buf, _MAX_PATH ); GetModuleFileNameA( nullptr, buf, _MAX_PATH );
@ -131,17 +132,16 @@ static const char* GetProcessName()
while( *ptr != '\0' ) ptr++; while( *ptr != '\0' ) ptr++;
while( ptr > buf && *ptr != '\\' && *ptr != '/' ) ptr--; while( ptr > buf && *ptr != '\\' && *ptr != '/' ) ptr--;
if( ptr > buf ) ptr++; if( ptr > buf ) ptr++;
return ptr; processName = ptr;
#elif defined __ANDROID__ #elif defined __ANDROID__
# if __ANDROID_API__ >= 21 # if __ANDROID_API__ >= 21
auto buf = getprogname(); auto buf = getprogname();
if( buf ) return buf; if( buf ) processName = buf;
# endif # endif
#elif defined _GNU_SOURCE || defined __CYGWIN__ #elif defined _GNU_SOURCE || defined __CYGWIN__
return program_invocation_short_name; processName = program_invocation_short_name;
#else
return "unknown";
#endif #endif
return processName;
} }
enum { QueuePrealloc = 256 * 1024 }; enum { QueuePrealloc = 256 * 1024 };

12
common/TracySocket.cpp
View File

@ -25,6 +25,12 @@
namespace tracy namespace tracy
{ {
#ifdef _MSC_VER
typedef SOCKET socket_t;
#else
typedef int socket_t;
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
struct __wsinit struct __wsinit
{ {
@ -174,7 +180,7 @@ int Socket::Recv( void* _buf, int len, const timeval* tv )
fd_set fds; fd_set fds;
FD_ZERO( &fds ); FD_ZERO( &fds );
FD_SET( static_cast<unsigned int>(m_sock), &fds ); FD_SET( static_cast<socket_t>(m_sock), &fds );
#ifndef _WIN32 #ifndef _WIN32
timeval _tv = *tv; timeval _tv = *tv;
@ -231,7 +237,7 @@ bool Socket::HasData()
fd_set fds; fd_set fds;
FD_ZERO( &fds ); FD_ZERO( &fds );
FD_SET( static_cast<unsigned int>(m_sock), &fds ); FD_SET( static_cast<socket_t>(m_sock), &fds );
return select( m_sock+1, &fds, nullptr, nullptr, &tv ) > 0; return select( m_sock+1, &fds, nullptr, nullptr, &tv ) > 0;
} }
@ -287,7 +293,7 @@ Socket* ListenSocket::Accept()
fd_set fds; fd_set fds;
FD_ZERO( &fds ); FD_ZERO( &fds );
FD_SET( static_cast<unsigned int>(m_sock), &fds ); FD_SET( static_cast<socket_t>(m_sock), &fds );
select( m_sock+1, &fds, nullptr, nullptr, &tv ); select( m_sock+1, &fds, nullptr, nullptr, &tv );
if( FD_ISSET( m_sock, &fds ) ) if( FD_ISSET( m_sock, &fds ) )