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

fix potential asan/tsan issue

Browse Source
This commit is contained in:
Erwin Coumans
2018-05-15 13:24:28 -07:00
parent 703767c6f3
commit d17d496f97
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
examples/SharedMemory/PhysicsServerExample.cpp
View File

@@ -201,7 +201,8 @@ struct MotionArgs
{ {
m_vrControllerEvents[i].m_buttons[b]=0; m_vrControllerEvents[i].m_buttons[b]=0;
} }
m_vrControllerPos[i].setValue(0,0,0);
m_vrControllerOrn[i].setValue(0,0,0,1);
m_isVrControllerPicking[i] = false; m_isVrControllerPicking[i] = false;
m_isVrControllerDragging[i] = false; m_isVrControllerDragging[i] = false;
m_isVrControllerReleasing[i] = false; m_isVrControllerReleasing[i] = false;
@@ -1747,6 +1748,8 @@ void PhysicsServerExample::initPhysics()
m_threadSupport = createMotionThreadSupport(MAX_MOTION_NUM_THREADS); m_threadSupport = createMotionThreadSupport(MAX_MOTION_NUM_THREADS);
m_isConnected = m_physicsServer.connectSharedMemory( m_guiHelper);
for (int i=0;i<m_threadSupport->getNumTasks();i++) for (int i=0;i<m_threadSupport->getNumTasks();i++)
{ {
@@ -1765,18 +1768,25 @@ void PhysicsServerExample::initPhysics()
m_args[w].m_cs2 = m_threadSupport->createCriticalSection(); m_args[w].m_cs2 = m_threadSupport->createCriticalSection();
m_args[w].m_cs3 = m_threadSupport->createCriticalSection(); m_args[w].m_cs3 = m_threadSupport->createCriticalSection();
m_args[w].m_csGUI = m_threadSupport->createCriticalSection(); m_args[w].m_csGUI = m_threadSupport->createCriticalSection();
m_args[w].m_cs->lock();
m_args[w].m_cs->setSharedParam(0,eMotionIsUnInitialized); m_args[w].m_cs->setSharedParam(0,eMotionIsUnInitialized);
m_args[w].m_cs->unlock();
int numMoving = 0; int numMoving = 0;
m_args[w].m_positions.resize(numMoving); m_args[w].m_positions.resize(numMoving);
m_args[w].m_physicsServerPtr = &m_physicsServer; m_args[w].m_physicsServerPtr = &m_physicsServer;
//int index = 0; //int index = 0;
m_threadSupport->runTask(B3_THREAD_SCHEDULE_TASK, (void*) &this->m_args[w], w); m_threadSupport->runTask(B3_THREAD_SCHEDULE_TASK, (void*) &this->m_args[w], w);
bool isUninitialized = true;
while (m_args[w].m_cs->getSharedParam(0)==eMotionIsUnInitialized) while (isUninitialized)
{ {
m_args[w].m_cs->lock();
isUninitialized = (m_args[w].m_cs->getSharedParam(0)==eMotionIsUnInitialized);
m_args[w].m_cs->unlock();
#ifdef _WIN32
b3Clock::usleep(1000); b3Clock::usleep(1000);
#endif
} }
} }
@@ -1789,8 +1799,6 @@ void PhysicsServerExample::initPhysics()
m_args[0].m_cs2->lock(); m_args[0].m_cs2->lock();
m_isConnected = m_physicsServer.connectSharedMemory( m_guiHelper);
{ {