mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 21:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Race condition fix

Browse Source
This commit is contained in:
scrawl 2015-06-10 19:02:33 +02:00
parent 35b2d91fb3
commit 9c86d4f8bc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/sceneutil/workqueue.cpp
View File

@ -25,6 +25,7 @@ void WorkTicket::signalDone()
WorkItem::WorkItem() WorkItem::WorkItem()
: mTicket(new WorkTicket) : mTicket(new WorkTicket)
{ {
mTicket->setThreadSafeRefUnref(true);
} }
WorkItem::~WorkItem() WorkItem::~WorkItem()
@ -73,9 +74,9 @@ WorkQueue::~WorkQueue()
} }
} }
WorkTicket* WorkQueue::addWorkItem(WorkItem *item) osg::ref_ptr<WorkTicket> WorkQueue::addWorkItem(WorkItem *item)
{ {
WorkTicket* ticket = item->getTicket().get(); osg::ref_ptr<WorkTicket> ticket = item->getTicket();
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex); OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mMutex);
mQueue.push(item); mQueue.push(item);
mCondition.signal(); mCondition.signal();

2
components/sceneutil/workqueue.hpp
View File

@ -65,7 +65,7 @@ namespace SceneUtil
/// Add a new work item to the back of the queue. /// Add a new work item to the back of the queue.
/// @par The returned WorkTicket may be used by the caller to wait until the work is complete. /// @par The returned WorkTicket may be used by the caller to wait until the work is complete.
WorkTicket* addWorkItem(WorkItem* item); osg::ref_ptr<WorkTicket> addWorkItem(WorkItem* item);
/// Get the next work item from the front of the queue. If the queue is empty, waits until a new item is added. /// Get the next work item from the front of the queue. If the queue is empty, waits until a new item is added.
/// If the workqueue is in the process of being destroyed, may return NULL. /// If the workqueue is in the process of being destroyed, may return NULL.