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

take locks out of ModelRegistry

Browse Source 
They should be unnecessary and were causing deadlock with Effects that
load images.
This commit is contained in:
Tim Moore 2009-11-29 22:54:02 +01:00
parent c2317edf8a
commit e37c218c2a
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
simgear/scene/model/ModelRegistry.cxx
View File

@ -62,9 +62,6 @@ using namespace osgUtil;
using namespace osgDB;
using namespace simgear;
using OpenThreads::ReentrantMutex;
using OpenThreads::ScopedLock;
// Little helper class that holds an extra reference to a
// loaded 3d model.
// Since we clone all structural nodes from our 3d models,
@ -205,7 +202,6 @@ ReaderWriter::ReadResult
ModelRegistry::readImage(const string& fileName,
const ReaderWriter::Options* opt)
{
ScopedLock<ReentrantMutex> lock(readerMutex);
CallbackMap::iterator iter
= imageCallbackMap.find(getFileExtension(fileName));
{
@ -354,8 +350,6 @@ ReaderWriter::ReadResult
ModelRegistry::readNode(const string& fileName,
const ReaderWriter::Options* opt)
{
ScopedLock<ReentrantMutex> lock(readerMutex);
ReaderWriter::ReadResult res;
CallbackMap::iterator iter
= nodeCallbackMap.find(getFileExtension(fileName));

5
simgear/scene/model/ModelRegistry.hxx
View File

@ -19,8 +19,6 @@
#ifndef _SG_MODELREGISTRY_HXX
#define _SG_MODELREGISTRY_HXX 1
#include <OpenThreads/ReentrantMutex>
#include <osg/ref_ptr>
#include <osg/Node>
#include <osgDB/FileUtils>
@ -225,9 +223,6 @@ protected:
CallbackMap imageCallbackMap;
CallbackMap nodeCallbackMap;
osg::ref_ptr<DefaultCallback> _defaultCallback;
// Protect against simultaneous calls from main thread (MP models)
// and pager thread.
OpenThreads::ReentrantMutex readerMutex;
};
// Callback that only loads the file without any caching or