FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change isRunning variable to an Atomic to address possible race condition asscoiated with reading and writing to the variable from different threads.

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14464 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-11-04 20:06:05 +00:00
parent de0664ef77
commit 5177298dad
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/OpenThreads/pthreads/PThreadPrivateData.h
View File

@@ -1,13 +1,13 @@
/* -*-c++-*- OpenThreads library, Copyright (C) 2002 - 2007 The Open Thread Group
*
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
* This library is open source and may be redistributed and/or modified under
* the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
* (at your option) any later version. The full license is in LICENSE file
* included with this distribution, and on the openscenegraph.org website.
*
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* OpenSceneGraph Public License for more details.
*/
@@ -22,6 +22,7 @@
#include <pthread.h>
#include <OpenThreads/Thread>
#include <OpenThreads/Block>
#include <OpenThreads/Atomic>
namespace OpenThreads {
@@ -33,7 +34,7 @@ class PThreadPrivateData {
friend class Thread;
//-------------------------------------------------------------------------
// We're friendly to PThreadPrivateActions, so it can get at some
// We're friendly to PThreadPrivateActions, so it can get at some
// variables.
//
friend class ThreadPrivateActions;
@@ -48,7 +49,10 @@ private:
volatile bool stackSizeLocked;
volatile bool isRunning;
void setRunning(bool flag) { _isRunning.exchange(flag); }
bool isRunning() const { return _isRunning!=0; }
Atomic _isRunning;
Block threadStartedBlock;
@@ -57,7 +61,7 @@ private:
volatile bool idSet;
volatile Thread::ThreadPriority threadPriority;
volatile Thread::ThreadPolicy threadPolicy;
pthread_t tid;
@@ -65,7 +69,7 @@ private:
volatile int uniqueId;
volatile int cpunum;
static int nextId;