Updated OSG to use OpenThreads. Moved any references to OpenThread to

OpenThreads and removed any dependency on Producer threads, Mutexes, etc.
This commit is contained in:
Don BURNS
2003-07-19 00:18:07 +00:00
parent 23fc1900ce
commit 56a13abc05
8 changed files with 29 additions and 33 deletions

View File

@@ -91,7 +91,8 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou
_fileRequestListMutex.unlock();
}
if (!threadIsRunning())
//if (!threadIsRunning())
if (!isRunning())
{
std::cout<<"DatabasePager::startThread()"<<std::endl;
startThread();

View File

@@ -20,11 +20,4 @@ LIB = $(LIB_PREFIX)$(TARGET_BASENAME).$(LIB_EXT)
INC += $(PRODUCER_INCLUDE_DIR) -I/usr/X11R6/include
LDFLAGS += $(PRODUCER_LIB_DIR)
ifeq ($(USE_OPEN_THREAD),1)
DEF += -D_USE_OPEN_THREAD
INC += $(INC_OPEN_THREAD)
LDFLAGS += $(LIB_OPEN_THREAD)
LIBS += -lOpenThread
endif
include $(TOPDIR)/Make/makerules

View File

@@ -11,8 +11,9 @@
* OpenSceneGraph Public License for more details.
*/
#include <OpenThreads/Mutex>
#include <osgProducer/OsgSceneHandler>
#include <Producer/Mutex>
using namespace osgUtil;
using namespace osgProducer;
@@ -24,7 +25,7 @@ OsgSceneHandler::OsgSceneHandler( osg::DisplaySettings *ds) :
void OsgSceneHandler::init()
{
static Producer::Mutex mutex;
static OpenThreads::Mutex mutex;
osg::notify(osg::INFO)<<"entering "<<this<<" init."<<std::endl;
mutex.lock();
osg::notify(osg::INFO)<<" running "<<this<<" init."<<std::endl;