Changeset 6267

Show
Ignore:
Timestamp:
02/23/07 17:31:34
Author:
robert
Message:

Moved Block, ReentrantMutex? and ReadWriteMutex? into OpenThreads?.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/VisualStudio/osgDB/osgDB.dsp

    r5501 r6267  
    216216# Begin Source File 
    217217 
    218 SOURCE=..\..\Src\osgDB\ReentrantMutex.cpp 
    219 # End Source File 
    220 # Begin Source File 
    221  
    222218SOURCE=..\..\src\osgDB\SharedStateManager.cpp 
    223219# End Source File 
    …… 
    301297 
    302298SOURCE=..\..\Include\osgDB\Registry 
    303 # End Source File 
    304 # Begin Source File 
    305  
    306 SOURCE=..\..\Include\osgDB\ReentrantMutex 
    307299# End Source File 
    308300# Begin Source File 

  • OpenSceneGraph/trunk/VisualStudio/osgWrappers/osgDB/wrapper_osgDB.dsp

    r6227 r6267  
    149149 
    150150# Begin Source File 
    151 SOURCE=..\..\..\src\osgWrappers\osgDB\ReentrantMutex.cpp 
    152 # End Source File 
    153  
    154 # Begin Source File 
    155151SOURCE=..\..\..\src\osgWrappers\osgDB\Registry.cpp 
    156152# End Source File 

  • OpenSceneGraph/trunk/Xcode/OpenSceneGraph/OpenSceneGraph.xcodeproj/project.pbxproj

    r6214 r6267  
    19111911                00E2813E07676504005AEE61 /* TexEnvFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00E2813B07676503005AEE61 /* TexEnvFilter.cpp */; }; 
    19121912                00E2814107676629005AEE61 /* Archive in Headers */ = {isa = PBXBuildFile; fileRef = 00E2813F07676626005AEE61 /* Archive */; settings = {ATTRIBUTES = (Public, ); }; }; 
    1913                 00E2814207676629005AEE61 /* ReentrantMutex in Headers */ = {isa = PBXBuildFile; fileRef = 00E2814007676628005AEE61 /* ReentrantMutex */; settings = {ATTRIBUTES = (Public, ); }; }; 
    19141913                00E28145076766DA005AEE61 /* Archive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00E28143076766D7005AEE61 /* Archive.cpp */; }; 
    1915                 00E28146076766DA005AEE61 /* ReentrantMutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00E28144076766D9005AEE61 /* ReentrantMutex.cpp */; }; 
    19161914                00E28148076767D2005AEE61 /* NodeTrackerManipulator in Headers */ = {isa = PBXBuildFile; fileRef = 00E28147076767D1005AEE61 /* NodeTrackerManipulator */; settings = {ATTRIBUTES = (Public, ); }; }; 
    19171915                00E2814A07676854005AEE61 /* NodeTrackerManipulator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 00E2814907676852005AEE61 /* NodeTrackerManipulator.cpp */; }; 
    …… 
    60546052                00E2813B07676503005AEE61 /* TexEnvFilter.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = TexEnvFilter.cpp; path = ../../src/osg/TexEnvFilter.cpp; sourceTree = SOURCE_ROOT; }; 
    60556053                00E2813F07676626005AEE61 /* Archive */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = Archive; path = ../../include/osgDB/Archive; sourceTree = SOURCE_ROOT; }; 
    6056                 00E2814007676628005AEE61 /* ReentrantMutex */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; name = ReentrantMutex; path = ../../include/osgDB/ReentrantMutex; sourceTree = SOURCE_ROOT; }; 
    60576054                00E28143076766D7005AEE61 /* Archive.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Archive.cpp; path = ../../src/osgDB/Archive.cpp; sourceTree = SOURCE_ROOT; }; 
    6058                 00E28144076766D9005AEE61 /* ReentrantMutex.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = ReentrantMutex.cpp; path = ../../src/osgDB/ReentrantMutex.cpp; sourceTree = SOURCE_ROOT; }; 
    60596055                00E28147076767D1005AEE61 /* NodeTrackerManipulator */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp; fileEncoding = 30; path = NodeTrackerManipulator; sourceTree = "<group>"; }; 
    60606056                00E2814907676852005AEE61 /* NodeTrackerManipulator.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = NodeTrackerManipulator.cpp; path = ../../src/osgGA/NodeTrackerManipulator.cpp; sourceTree = SOURCE_ROOT; }; 
    …… 
    1150711503                                BE1188F505D765CD00EB53E5 /* ReadFile.cpp */, 
    1150811504                                008F446B06CBF99E00F4220C /* ReaderWriter.cpp */, 
    11509                                 00E28144076766D9005AEE61 /* ReentrantMutex.cpp */, 
    1151011505                                BE1188F605D765CD00EB53E5 /* Registry.cpp */, 
    1151111506                                BE1188F705D765CD00EB53E5 /* SharedStateManager.cpp */, 
    …… 
    1153511530                                BE11891805D7665600EB53E5 /* ReaderWriter */, 
    1153611531                                BE11891905D7665600EB53E5 /* ReadFile */, 
    11537                                 00E2814007676628005AEE61 /* ReentrantMutex */, 
    1153811532                                BE11891A05D7665600EB53E5 /* Registry */, 
    1153911533                                BE11891B05D7665600EB53E5 /* SharedStateManager */, 
    …… 
    1327513269                                BE11892B05D7665600EB53E5 /* ReaderWriter in Headers */, 
    1327613270                                BE11892C05D7665600EB53E5 /* ReadFile in Headers */, 
    13277                                 00E2814207676629005AEE61 /* ReentrantMutex in Headers */, 
    1327813271                                BE11892D05D7665600EB53E5 /* Registry in Headers */, 
    1327913272                                BE11892E05D7665600EB53E5 /* SharedStateManager in Headers */, 
    …… 
    1903819031                                008F446C06CBF99E00F4220C /* ReaderWriter.cpp in Sources */, 
    1903919032                                00E28145076766DA005AEE61 /* Archive.cpp in Sources */, 
    19040                                 00E28146076766DA005AEE61 /* ReentrantMutex.cpp in Sources */, 
    1904119033                        ); 
    1904219034                        runOnlyForDeploymentPostprocessing = 0; 

  • OpenSceneGraph/trunk/examples/osgphotoalbum/ImageReaderWriter.h

    r5328 r6267  
    1919 
    2020#include <OpenThreads/ScopedLock> 
    21 #include <osgDB/ReentrantMutex> 
     21#include <OpenThreads/ReentrantMutex> 
    2222 
    2323#include "PhotoArchive.h" 
    2424 
    25 #define SERIALIZER() OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex)   
     25#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)   
    2626 
    2727class ImageReaderWriter : public osgDB::ReaderWriter 
    …… 
    5454        ReadResult local_readNode(const std::string& fileName, const Options*); 
    5555 
    56         mutable osgDB::ReentrantMutex _serializerMutex; 
     56        mutable OpenThreads::ReentrantMutex _serializerMutex; 
    5757 
    5858        struct DataReference 

  • OpenSceneGraph/trunk/include/osg/GraphicsContext

    r6220 r6267  
    190190 
    191191        /** Get the operations queue block used to mark an empty queue, if you end items into the empty queu you must release this block.*/ 
    192         osg::Block* getOperationsBlock() { return _operationsBlock.get(); } 
     192        osg::RefBlock* getOperationsBlock() { return _operationsBlock.get(); } 
    193193 
    194194        /** Get the current operations that is being run.*/ 
    …… 
    382382         
    383383        OpenThreads::Mutex                  _operationsMutex; 
    384         osg::ref_ptr<osg::Block>            _operationsBlock; 
     384        osg::ref_ptr<osg::RefBlock>         _operationsBlock; 
    385385        OperationQueue                      _operations; 
    386386        osg::ref_ptr<Operation>             _currentOperation; 

  • OpenSceneGraph/trunk/include/osg/GraphicsThread

    r6088 r6267  
    2121#include <OpenThreads/Barrier> 
    2222#include <OpenThreads/Condition> 
     23#include <OpenThreads/Block> 
    2324 
    2425#include <list> 
    …… 
    2627namespace osg { 
    2728 
    28 class Block: virtual public osg::Referenced { 
     29class RefBlock: virtual public osg::Referenced, public OpenThreads::Block 
     30{ 
    2931    public: 
    30         Block():_released(false) {} 
    3132 
    32         inline void block() 
    33         { 
    34             OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut); 
    35             if( !_released ) 
    36                 _cond.wait(&_mut); 
    37         } 
     33        RefBlock() {} 
    3834 
    39         inline void release() 
    40         { 
    41             OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut); 
    42             if (!_released) 
    43             { 
    44                 _released = true; 
    45                 _cond.broadcast(); 
    46             } 
    47         } 
    48  
    49         inline void reset() 
    50         { 
    51             OpenThreads::ScopedLock<OpenThreads::Mutex> mutlock(_mut); 
    52             _released = false; 
    53         } 
    54          
    55         inline void set(bool doRelease) 
    56         { 
    57             if (doRelease!=_released) 
    58             { 
    59                 if (doRelease) release(); 
    60                 else reset(); 
    61             } 
    62         } 
    63  
    64     protected: 
    65  
    66         ~Block() 
    67         { 
    68             release(); 
    69         } 
    70  
    71     private: 
    72         OpenThreads::Mutex _mut; 
    73         OpenThreads::Condition _cond; 
    74         bool _released; 
    7535}; 
    7636 
    …… 
    156116 
    157117        OpenThreads::Mutex          _operationsMutex; 
    158         osg::ref_ptr<osg::Block>    _operationsBlock; 
     118        osg::ref_ptr<osg::RefBlock> _operationsBlock; 
    159119        OperationQueue              _operations; 
    160120        osg::ref_ptr<Operation>     _currentOperation; 
    …… 
    196156/** ReleaseContext_Block_MakeCurrentOperation releases the context for another thread to aquire,  
    197157  * then blocks waiting for context to be released, once the block is release the context is re-aqquired.*/ 
    198 struct OSG_EXPORT ReleaseContext_Block_MakeCurrentOperation : public Operation, public Block 
     158struct OSG_EXPORT ReleaseContext_Block_MakeCurrentOperation : public Operation, public RefBlock 
    199159{ 
    200160    ReleaseContext_Block_MakeCurrentOperation(): 

  • OpenSceneGraph/trunk/include/osgDB/DatabasePager

    r5795 r6267  
    8585        bool getUseFrameBlock() const { return _useFrameBlock; } 
    8686         
    87         osg::Block* getFrameBlock() { return _frameBlock.get(); } 
     87        osg::RefBlock* getFrameBlock() { return _frameBlock.get(); } 
    8888 
    8989        /** Set the priority of the database pager thread during the frame (i.e. while cull and draw are running.)*/ 
    …… 
    294294 
    295295         
    296         osg::ref_ptr<osg::Block>       _databasePagerThreadBlock; 
     296        osg::ref_ptr<osg::RefBlock>    _databasePagerThreadBlock; 
    297297 
    298298        inline void updateDatabasePagerThreadBlock() 
    …… 
    326326        int                             _numFramesActive; 
    327327        mutable OpenThreads::Mutex      _numFramesActiveMutex; 
    328         osg::ref_ptr<osg::Block>        _frameBlock; 
     328        osg::ref_ptr<osg::RefBlock>     _frameBlock; 
    329329        int                             _frameNumber; 
    330330 

  • OpenSceneGraph/trunk/include/osgParticle/ParticleSystem

    r5979 r6267  
    3131#include <osg/BoundingBox> 
    3232 
    33 #include <osgDB/ReentrantMutex> 
     33#include <OpenThreads/ReadWriteMutex> 
    3434 
    3535namespace osgParticle 
    …… 
    167167        virtual osg::BoundingBox computeBound() const; 
    168168         
    169         osgDB::ReadWriteMutex* getReadWriteMutex() const { return &_readWriteMutex; } 
     169        OpenThreads::ReadWriteMutex* getReadWriteMutex() const { return &_readWriteMutex; } 
    170170 
    171171    protected: 
    …… 
    206206        mutable int _draw_count; 
    207207         
    208         mutable osgDB::ReadWriteMutex _readWriteMutex; 
     208        mutable OpenThreads::ReadWriteMutex _readWriteMutex; 
    209209         
    210210    }; 

  • OpenSceneGraph/trunk/src/osg/GraphicsContext.cpp

    r6088 r6267  
    138138{ 
    139139    setThreadSafeRefUnref(true); 
    140     _operationsBlock = new Block; 
     140    _operationsBlock = new RefBlock; 
    141141} 
    142142 
    …… 
    147147{ 
    148148    setThreadSafeRefUnref(true); 
    149     _operationsBlock = new Block; 
     149    _operationsBlock = new RefBlock; 
    150150} 
    151151 

  • OpenSceneGraph/trunk/src/osg/GraphicsThread.cpp

    r6230 r6267  
    4545    _done(false) 
    4646{ 
    47     _operationsBlock = new Block; 
     47    _operationsBlock = new RefBlock; 
    4848} 
    4949 

  • OpenSceneGraph/trunk/src/osgDB/DatabasePager.cpp

    r5874 r6267  
    3838    _numFramesActive = 0; 
    3939    _frameNumber = 0; 
    40     _frameBlock = new osg::Block; 
    41     _databasePagerThreadBlock = new osg::Block; 
     40    _frameBlock = new osg::RefBlock; 
     41    _databasePagerThreadBlock = new osg::RefBlock; 
    4242 
    4343    _threadPriorityDuringFrame = THREAD_PRIORITY_MIN; 

  • OpenSceneGraph/trunk/src/osgDB/GNUmakefile

    r4076 r6267  
    1010        ReadFile.cpp\ 
    1111        ReaderWriter.cpp\ 
    12         ReentrantMutex.cpp\ 
    1312        Registry.cpp\ 
    1413        Version.cpp\ 

  • OpenSceneGraph/trunk/src/osgParticle/ConnectedParticleSystem.cpp

    r5858 r6267  
    115115void ConnectedParticleSystem::drawImplementation(osg::State& state) const 
    116116{ 
    117     osgDB::ScopedReadLock lock(_readWriteMutex); 
     117    OpenThreads::ScopedReadLock lock(_readWriteMutex); 
    118118 
    119119    const Particle* particle = (_startParticle != Particle::INVALID_INDEX) ? &_particles[_startParticle] : 0; 

  • OpenSceneGraph/trunk/src/osgParticle/ParticleProcessor.cpp

    r6051 r6267  
    6565            if (nv.getFrameStamp()) 
    6666            { 
    67                 osgDB::ScopedWriteLock lock(*(_ps->getReadWriteMutex())); 
     67                OpenThreads::ScopedWriteLock lock(*(_ps->getReadWriteMutex())); 
    6868 
    6969                //added- 1/17/06- bgandere@nps.edu  

  • OpenSceneGraph/trunk/src/osgParticle/ParticleSystem.cpp

    r5855 r6267  
    9292void osgParticle::ParticleSystem::drawImplementation(osg::State& state) const 
    9393{ 
    94     osgDB::ScopedReadLock lock(_readWriteMutex); 
     94    OpenThreads::ScopedReadLock lock(_readWriteMutex); 
    9595 
    9696    // update the frame count, so other objects can detect when 

  • OpenSceneGraph/trunk/src/osgParticle/ParticleSystemUpdater.cpp

    r6051 r6267  
    4141                        ParticleSystem* ps = i->get(); 
    4242                         
    43                         osgDB::ScopedWriteLock lock(*(ps->getReadWriteMutex())); 
     43                        OpenThreads::ScopedWriteLock lock(*(ps->getReadWriteMutex())); 
    4444 
    4545                        if (!ps->isFrozen() && (ps->getLastFrameNumber() >= (nv.getFrameStamp()->getFrameNumber() - 1) || !ps->getFreezeOnCull())) 

  • OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/ReaderWriterFLT.cpp

    r6257 r6267  
    1212#include <osgDB/Registry> 
    1313#include <osgDB/ReadFile> 
    14 #include <osgDB/ReentrantMutex> 
     14#include <OpenThreads/ReentrantMutex> 
    1515#include <osgUtil/Optimizer> 
    1616 
    …… 
    1919#include "RecordInputStream.h" 
    2020 
    21 #define SERIALIZER() OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex)   
     21#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)   
    2222 
    2323using namespace flt; 
    …… 
    280280    protected: 
    281281 
    282         mutable osgDB::ReentrantMutex _serializerMutex; 
     282        mutable OpenThreads::ReentrantMutex _serializerMutex; 
    283283}; 
    284284 

  • OpenSceneGraph/trunk/src/osgPlugins/dae/ReaderWriterDAE.cpp

    r5615 r6267  
    1919 
    2020#include <OpenThreads/ScopedLock> 
    21 #include <osgDB/ReentrantMutex> 
     21#include <OpenThreads/ReentrantMutex> 
    2222 
    2323#include "daeReader.h" 
    …… 
    2626#define EXTENSION_NAME "dae" 
    2727 
    28 #define SERIALIZER() OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex)   
     28#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)   
    2929 
    3030/////////////////////////////////////////////////////////////////////////// 
    …… 
    6262 
    6363    mutable DAE *_dae; 
    64     mutable osgDB::ReentrantMutex _serializerMutex; 
     64    mutable OpenThreads::ReentrantMutex _serializerMutex; 
    6565 
    6666}; 

  • OpenSceneGraph/trunk/src/osgPlugins/flt/ReaderWriterFLT.cpp

    r4288 r6267  
    2727{ 
    2828    // serialize all access to the OpenFlight plugin as its not thread safe by itself. 
    29     OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex); 
     29    OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex); 
    3030 
    3131    std::string ext = osgDB::getLowerCaseFileExtension(file); 

  • OpenSceneGraph/trunk/src/osgPlugins/flt/ReaderWriterFLT.h

    r4288 r6267  
    3939#include <osgDB/Registry> 
    4040#include <osgDB/FileNameUtils> 
    41 #include <osgDB/ReentrantMutex> 
     41#include <OpenThreads/ReentrantMutex> 
    4242 
    4343 
    …… 
    6060protected: 
    6161 
    62     mutable osgDB::ReentrantMutex _serializerMutex; 
     62    mutable OpenThreads::ReentrantMutex _serializerMutex; 
    6363}; 
    6464 

  • OpenSceneGraph/trunk/src/osgPlugins/gdal/ReaderWriterGDAL.cpp

    r4706 r6267  
    1010 
    1111#include <OpenThreads/ScopedLock> 
    12 #include <osgDB/ReentrantMutex> 
     12#include <OpenThreads/ReentrantMutex> 
    1313 
    1414#include <gdal_priv.h> 
    1515 
    16 #define SERIALIZER() OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex)   
     16#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)   
    1717 
    1818// From easyrgb.com 
    …… 
    3838        virtual ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const 
    3939        { 
    40             OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex); 
     40            OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex); 
    4141            return const_cast<ReaderWriterGDAL*>(this)->local_readImage(fileName, options); 
    4242        } 
    …… 
    4444        virtual ReadResult readHeightField(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const 
    4545        { 
    46             OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex); 
     46            OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex); 
    4747            return const_cast<ReaderWriterGDAL*>(this)->local_readHeightField(fileName, options); 
    4848        } 
    …… 
    730730        } 
    731731         
    732         mutable osgDB::ReentrantMutex _serializerMutex; 
     732        mutable OpenThreads::ReentrantMutex _serializerMutex; 
    733733         
    734734}; 

  • OpenSceneGraph/trunk/src/osgPlugins/osga/OSGA_Archive.h

    r4363 r6267  
    1717 
    1818#include <OpenThreads/ScopedLock> 
    19 #include <osgDB/ReentrantMutex> 
    20  
    21 #define SERIALIZER() OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex)   
     19#include <OpenThreads/ReentrantMutex> 
     20 
     21#define SERIALIZER() OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex)   
    2222 
    2323class OSGA_Archive : public osgDB::Archive 
    …… 
    9494    protected: 
    9595   
    96         mutable osgDB::ReentrantMutex _serializerMutex; 
     96        mutable OpenThreads::ReentrantMutex _serializerMutex; 
    9797 
    9898        class IndexBlock; 

  • OpenSceneGraph/trunk/src/osgPlugins/txp/ReaderWriterTXP.h

    r5188 r6267  
    4545 
    4646#include <OpenThreads/ScopedLock> 
    47 #include <osgDB/ReentrantMutex> 
     47#include <OpenThreads/ReentrantMutex> 
    4848 
    4949#include "TXPArchive.h" 
    …… 
    6969            return ReadResult::FILE_NOT_HANDLED; 
    7070             
    71         OpenThreads::ScopedLock<osgDB::ReentrantMutex> lock(_serializerMutex); 
     71        OpenThreads::ScopedLock<OpenThreads::ReentrantMutex> lock(_serializerMutex); 
    7272 
    7373        return const_cast<ReaderWriterTXP*>(this)->local_readNode(file, options); 
    …… 
    8686    bool extractChildrenLocations(const std::string& name, int parentLod, std::vector<TXPArchive::TileLocationInfo>& locs, int nbChild) const; 
    8787 
    88     mutable osgDB::ReentrantMutex               _serializerMutex; 
     88    mutable OpenThreads::ReentrantMutex               _serializerMutex; 
    8989     
    9090    std::map< int,osg::ref_ptr<TXPArchive> >    _archives; 

  • OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsContext.cpp

    r6227 r6267  
    6767                  "Get the operations queue mutex. ", 
    6868                  ""); 
    69         I_Method0(osg::Block *, getOperationsBlock, 
    70                   Properties::NON_VIRTUAL, 
    71                   __osg_Block_P1__getOperationsBlock, 
     69        I_Method0(osg::RefBlock *, getOperationsBlock, 
     70                  Properties::NON_VIRTUAL, 
     71                  __osg_RefBlock_P1__getOperationsBlock, 
    7272                  "Get the operations queue block used to mark an empty queue, if you end items into the empty queu you must release this block. ", 
    7373                  ""); 
    …… 
    306306                         __OperationsThread_P1__getGraphicsThread,  
    307307                         __void__setGraphicsThread__OperationsThread_P1); 
    308         I_SimpleProperty(osg::Block *, OperationsBlock,  
    309                          __osg_Block_P1__getOperationsBlock,  
     308        I_SimpleProperty(osg::RefBlock *, OperationsBlock,  
     309                         __osg_RefBlock_P1__getOperationsBlock,  
    310310                         0); 
    311311        I_SimpleProperty(OpenThreads::Mutex *, OperationsMutex,  

  • OpenSceneGraph/trunk/src/osgWrappers/osg/GraphicsThread.cpp

    r6180 r6267  
    4040                  ""); 
    4141        I_PublicMemberProperty(osg::BarrierOperation::PreBlockOp, _preBlockOp); 
    42 END_REFLECTOR 
    43  
    44 BEGIN_OBJECT_REFLECTOR(osg::Block) 
    45         I_VirtualBaseType(osg::Referenced); 
    46         I_Constructor0(____Block, 
    47                        "", 
    48                        ""); 
    49         I_Method0(void, block, 
    50                   Properties::NON_VIRTUAL, 
    51                   __void__block, 
    52                   "", 
    53                   ""); 
    54         I_Method0(void, release, 
    55                   Properties::NON_VIRTUAL, 
    56                   __void__release, 
    57                   "", 
    58                   ""); 
    59         I_Method0(void, reset, 
    60                   Properties::NON_VIRTUAL, 
    61                   __void__reset, 
    62                   "", 
    63                   ""); 
    64         I_Method1(void, set, IN, bool, doRelease, 
    65                   Properties::NON_VIRTUAL, 
    66                   __void__set__bool, 
    67                   "", 
    68                   ""); 
    6942END_REFLECTOR 
    7043 
    …… 
    186159END_REFLECTOR 
    187160 
     161BEGIN_OBJECT_REFLECTOR(osg::RefBlock) 
     162        I_VirtualBaseType(osg::Referenced); 
     163        I_Constructor0(____RefBlock, 
     164                       "", 
     165                       ""); 
     166END_REFLECTOR 
     167 
    188168BEGIN_OBJECT_REFLECTOR(osg::ReleaseContext_Block_MakeCurrentOperation) 
    189169        I_BaseType(osg::Operation); 
    190         I_BaseType(osg::Block); 
     170        I_BaseType(osg::RefBlock); 
    191171        I_Constructor0(____ReleaseContext_Block_MakeCurrentOperation, 
    192172                       "", 
    …… 
    195175                  Properties::VIRTUAL, 
    196176                  __void__release, 
    197                   "", 
     177                  "if this operation is a barrier then release it. ", 
    198178                  ""); 
    199179END_REFLECTOR 

  • OpenSceneGraph/trunk/src/osgWrappers/osgDB/DatabasePager.cpp

    r6180 r6267  
    109109                  "Get the whether UseFrameBlock is on or off. ", 
    110110                  ""); 
    111         I_Method0(osg::Block *, getFrameBlock, 
    112                   Properties::NON_VIRTUAL, 
    113                   __osg_Block_P1__getFrameBlock, 
     111        I_Method0(osg::RefBlock *, getFrameBlock, 
     112                  Properties::NON_VIRTUAL, 
     113                  __osg_RefBlock_P1__getFrameBlock, 
    114114                  "", 
    115115                  ""); 
    …… 
    312312                         __unsigned_int__getFileRequestListSize,  
    313313                         0); 
    314         I_SimpleProperty(osg::Block *, FrameBlock,  
    315                          __osg_Block_P1__getFrameBlock,  
     314        I_SimpleProperty(osg::RefBlock *, FrameBlock,  
     315                         __osg_RefBlock_P1__getFrameBlock,  
    316316                         0); 
    317317        I_SimpleProperty(unsigned int, MaximumNumOfObjectsToCompilePerFrame,  

  • OpenSceneGraph/trunk/src/osgWrappers/osgDB/GNUmakefile

    r6227 r6267  
    1616        ParameterOutput.cpp\ 
    1717        ReaderWriter.cpp\ 
    18         ReentrantMutex.cpp\ 
    1918        Registry.cpp\ 
    2019        SharedStateManager.cpp\ 

  • OpenSceneGraph/trunk/src/osgWrappers/osgParticle/ParticleSystem.cpp

    r6227 r6267  
    1616#include <osg/State> 
    1717#include <osg/Vec3> 
    18 #include <osgDB/ReentrantMutex> 
    1918#include <osgParticle/Particle> 
    2019#include <osgParticle/ParticleSystem> 
    …… 
    232231                  "Compute the bounding box around Drawables's geometry. ", 
    233232                  ""); 
    234         I_Method0(osgDB::ReadWriteMutex *, getReadWriteMutex, 
    235                   Properties::NON_VIRTUAL, 
    236                   __osgDB_ReadWriteMutex_P1__getReadWriteMutex, 
     233        I_Method0(OpenThreads::ReadWriteMutex *, getReadWriteMutex, 
     234                  Properties::NON_VIRTUAL, 
     235                  __OpenThreads_ReadWriteMutex_P1__getReadWriteMutex, 
    237236                  "", 
    238237                  ""); 
    …… 
    267266                         __Alignment__getParticleAlignment,  
    268267                         __void__setParticleAlignment__Alignment); 
    269         I_SimpleProperty(osgDB::ReadWriteMutex *, ReadWriteMutex,  
    270                          __osgDB_ReadWriteMutex_P1__getReadWriteMutex,  
     268        I_SimpleProperty(OpenThreads::ReadWriteMutex *, ReadWriteMutex,  
     269                         __OpenThreads_ReadWriteMutex_P1__getReadWriteMutex,  
    271270                         0); 
    272271END_REFLECTOR