actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use RunningUnderValgrind()

Browse Source
This commit is contained in:
Glenn Maynard
2004-09-06 08:32:25 +00:00
parent 55fe932dbb
commit 5403b135b7
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Threads/Threads_Pthreads.cpp
+3 -19
View File
@@ -6,6 +6,7 @@
#if defined(LINUX) #if defined(LINUX)
#include "archutils/Unix/LinuxThreadHelpers.h" #include "archutils/Unix/LinuxThreadHelpers.h"
#include "archutils/Unix/RunningUnderValgrind.h"
#endif #endif
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) && defined(CRASH_HANDLER) #if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) && defined(CRASH_HANDLER)
@@ -138,26 +139,9 @@ MutexImpl_Pthreads::~MutexImpl_Pthreads()
#if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) && defined(CRASH_HANDLER) #if defined(HAVE_PTHREAD_MUTEX_TIMEDLOCK) && defined(CRASH_HANDLER)
static bool UseTimedlock() static bool UseTimedlock()
{ {
#if defined(CPU_X86) && defined(__GNUC__) #if defined(LINUX)
/* Valgrind crashes and burns on pthread_mutex_timedlock. */ /* Valgrind crashes and burns on pthread_mutex_timedlock. */
static int under_valgrind = -1; if( RunningUnderValgrind() )
if( under_valgrind == -1 )
{
unsigned int magic[8] = { 0x00001001, 0, 0, 0, 0, 0, 0, 0 };
asm(
"mov %1, %%eax\n"
"mov $0, %%edx\n"
"rol $29, %%eax\n"
"rol $3, %%eax\n"
"ror $27, %%eax\n"
"ror $5, %%eax\n"
"rol $13, %%eax\n"
"rol $19, %%eax\n"
"mov %%edx, %0\t"
: "=r" (under_valgrind): "r" (magic): "eax", "edx" );
}
if( under_valgrind )
return false; return false;
#endif #endif