Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix OSX Multithreading test

Browse Source
This commit is contained in:
Erwin Coumans
2013-07-18 21:21:10 -07:00
parent 2f0fd80c9c
commit 415c6cd24d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
btgui/MultiThreading/b3PosixThreadSupport.cpp
View File

@@ -322,14 +322,14 @@ public:
#if defined(_POSIX_BARRIERS) && (_POSIX_BARRIERS - 20012L) >= 0 #if defined(_POSIX_BARRIERS) && (_POSIX_BARRIERS - 20012L) >= 0
/* OK to use barriers on this platform */ /* OK to use barriers on this platform */
class PosixBarrier : public b3Barrier class b3PosixBarrier : public b3Barrier
{ {
pthread_barrier_t m_barr; pthread_barrier_t m_barr;
int m_numThreads; int m_numThreads;
public: public:
PosixBarrier() b3PosixBarrier()
:m_numThreads(0) { } :m_numThreads(0) { }
virtual ~PosixBarrier() { virtual ~b3PosixBarrier() {
pthread_barrier_destroy(&m_barr); pthread_barrier_destroy(&m_barr);
} }
@@ -355,7 +355,7 @@ public:
}; };
#else #else
/* Not OK to use barriers on this platform - insert alternate code here */ /* Not OK to use barriers on this platform - insert alternate code here */
class PosixBarrier : public btBarrier class b3PosixBarrier : public b3Barrier
{ {
pthread_mutex_t m_mutex; pthread_mutex_t m_mutex;
pthread_cond_t m_cond; pthread_cond_t m_cond;
@@ -364,11 +364,11 @@ class PosixBarrier : public btBarrier
int m_called; int m_called;
public: public:
PosixBarrier() b3PosixBarrier()
:m_numThreads(0) :m_numThreads(0)
{ {
} }
virtual ~PosixBarrier() virtual ~b3PosixBarrier()
{ {
if (m_numThreads>0) if (m_numThreads>0)
{ {
@@ -414,7 +414,7 @@ public:
b3Barrier* b3PosixThreadSupport::createBarrier() b3Barrier* b3PosixThreadSupport::createBarrier()
{ {
PosixBarrier* barrier = new PosixBarrier(); b3PosixBarrier* barrier = new b3PosixBarrier();
barrier->setMaxCount(getNumTasks()); barrier->setMaxCount(getNumTasks());
return barrier; return barrier;
} }