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

Re-enabled processor affinity

Browse Source
This commit is contained in:
Robert Osfield 2007-02-06 16:23:19 +00:00
parent 3de205ec45
commit 2236c0576e
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/osgViewer/Viewer.cpp
View File

@ -987,7 +987,7 @@ void Viewer::startThreading()
int numProcessors = OpenThreads::GetNumberOfProcessors();
bool affinity = false;//true;
bool affinity = true;
Contexts::iterator citr;
@ -1044,6 +1044,9 @@ void Viewer::startThreading()
osg::ref_ptr<osg::SwapBuffersOperation> swapOp = new osg::SwapBuffersOperation();
typedef std::map<OpenThreads::Thread*, int> ThreadAffinityMap;
ThreadAffinityMap threadAffinityMap;
unsigned int processNum = 1;
for(citr = contexts.begin();
citr != contexts.end();
@ -1058,6 +1061,8 @@ void Viewer::startThreading()
#if 1
if (affinity) gc->getGraphicsThread()->setProcessorAffinity(processNum % numProcessors);
threadAffinityMap[gc->getGraphicsThread()] = processNum % numProcessors;
#else
if (affinity) gc->getGraphicsThread()->setProcessorAffinity(1);
#endif
@ -1106,6 +1111,7 @@ void Viewer::startThreading()
#if 1
if (affinity) camera->getCameraThread()->setProcessorAffinity(processNum % numProcessors);
threadAffinityMap[camera->getCameraThread()] = processNum % numProcessors;
#else
if (affinity) camera->getCameraThread()->setProcessorAffinity(1);
#endif
@ -1137,7 +1143,7 @@ void Viewer::startThreading()
for(camItr = cameras.begin();
camItr != cameras.end();
++camItr, ++processNum)
++camItr)
{
osg::Camera* camera = *camItr;
if (camera->getCameraThread() && !camera->getCameraThread()->isRunning())
@ -1150,6 +1156,22 @@ void Viewer::startThreading()
if (affinity) OpenThreads::SetProcessorAffinityOfCurrentThread(0);
#if 0
if (affinity)
{
for(ThreadAffinityMap::iterator titr = threadAffinityMap.begin();
titr != threadAffinityMap.end();
++titr)
{
titr->first->setProcessorAffinity(titr->second);
}
}
if (affinity) OpenThreads::SetProcessorAffinityOfCurrentThread(0);
#endif
for(citr = contexts.begin();
citr != contexts.end();
++citr)