mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-30 04:43:53 +00:00
Code Issues Releases Wiki Activity

Merge pull request #36 from graydon/warning-fixes

Browse Source 
Warning fixes
This commit is contained in:
Bartosz Taudul 2020-06-04 11:35:59 +02:00 committed by GitHub
commit a33caaaaaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/TracyProfiler.cpp
View File

@ -173,6 +173,7 @@ struct ThreadHandleWrapper
#if defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64 #if defined __i386 || defined _M_IX86 || defined __x86_64__ || defined _M_X64
static inline void CpuId( uint32_t* regs, uint32_t leaf ) static inline void CpuId( uint32_t* regs, uint32_t leaf )
{ {
memset(regs, 0, sizeof(uint32_t) * 4);
#if defined _WIN32 || defined __CYGWIN__ #if defined _WIN32 || defined __CYGWIN__
__cpuidex( (int*)regs, leaf, 0 ); __cpuidex( (int*)regs, leaf, 0 );
#else #else

7
client/TracySysTime.cpp
View File

@ -47,9 +47,12 @@ void SysTime::ReadTimes()
FILE* f = fopen( "/proc/stat", "r" ); FILE* f = fopen( "/proc/stat", "r" );
if( f ) if( f )
{ {
fscanf( f, "cpu %" PRIu64 " %" PRIu64 " %" PRIu64" %" PRIu64, &user, &nice, &system, &idle ); int read = fscanf( f, "cpu %" PRIu64 " %" PRIu64 " %" PRIu64" %" PRIu64, &user, &nice, &system, &idle );
fclose( f ); fclose( f );
used = user + nice + system; if (read == 4)
{
used = user + nice + system;
}
} }
} }