diff --git a/src/osgDB/DatabasePager.cpp b/src/osgDB/DatabasePager.cpp index 2852ab63e..2c9207033 100644 --- a/src/osgDB/DatabasePager.cpp +++ b/src/osgDB/DatabasePager.cpp @@ -839,34 +839,6 @@ DatabasePager::DatabasePager() _numFramesActive = 0; _frameNumber = 0; - const char* str = getenv("OSG_DATABASE_PAGER_PRIORITY"); - if (str) - { - if (strcmp(str,"DEFAULT")==0) - { - setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_DEFAULT); - } - else if (strcmp(str,"MIN")==0) - { - setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_MIN); - } - else if (strcmp(str,"LOW")==0) - { - setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_LOW); - } - else if (strcmp(str,"NOMINAL")==0) - { - setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_NOMINAL); - } - else if (strcmp(str,"HIGH")==0) - { - setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_HIGH); - } - else if (strcmp(str,"MAX")==0) - { - setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_MAX); - } - } #if __APPLE__ // OSX really doesn't like compiling display lists, and performs poorly when they are used, @@ -876,7 +848,7 @@ DatabasePager::DatabasePager() _drawablePolicy = DO_NOT_MODIFY_DRAWABLE_SETTINGS; #endif - str = getenv("OSG_DATABASE_PAGER_GEOMETRY"); + const char* str = getenv("OSG_DATABASE_PAGER_GEOMETRY"); if (!str) str = getenv("OSG_DATABASE_PAGER_DRAWABLE"); if (str) { @@ -1002,6 +974,34 @@ DatabasePager::DatabasePager() osg::DisplaySettings::instance()->getNumOfDatabaseThreadsHint(), osg::DisplaySettings::instance()->getNumOfHttpDatabaseThreadsHint()); + str = getenv("OSG_DATABASE_PAGER_PRIORITY"); + if (str) + { + if (strcmp(str,"DEFAULT")==0) + { + setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_DEFAULT); + } + else if (strcmp(str,"MIN")==0) + { + setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_MIN); + } + else if (strcmp(str,"LOW")==0) + { + setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_LOW); + } + else if (strcmp(str,"NOMINAL")==0) + { + setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_NOMINAL); + } + else if (strcmp(str,"HIGH")==0) + { + setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_HIGH); + } + else if (strcmp(str,"MAX")==0) + { + setSchedulePriority(OpenThreads::Thread::THREAD_PRIORITY_MAX); + } + } } DatabasePager::DatabasePager(const DatabasePager& rhs) diff --git a/src/osgViewer/ViewerBase.cpp b/src/osgViewer/ViewerBase.cpp index 37dec743d..ebf58df3c 100644 --- a/src/osgViewer/ViewerBase.cpp +++ b/src/osgViewer/ViewerBase.cpp @@ -157,23 +157,6 @@ void ViewerBase::setUpThreading() Scenes scenes; getScenes(scenes); - - for(Scenes::iterator itr = scenes.begin(); - itr != scenes.end(); - ++itr) - { - Scene* scene = *itr; - osgDB::DatabasePager* dp = scene->getDatabasePager(); - if (dp) - { - for(unsigned int i=0; igetNumDatabaseThreads(); ++i) - { - osgDB::DatabasePager::DatabaseThread* dt = dp->getDatabaseThread(i); - dt->setProcessorAffinity(1); - } - } - } - } } }