Robert Osfield 34794c5c27 From Laurens Voerman, "I found that using an ImageSequence with mode PAGE_AND_DISCARD_USED_IMAGES triggers the (3) imageThreads to run and never stop, even when no more work is to be done. This is due to a bug in the stop condition currently setting the thread to stop and wait for a signal only when no work needs to be done AND the databasepager is paused. ...

It should stop and wait for a signal on either of those two. Due to a few logical inversions it boils down to replacing || with &&

OLD _block->set((!_requestList.empty() || !_pager->_databasePagerThreadPaused));
NEW _block->set((!_requestList.empty() && !_pager->_databasePagerThreadPaused));//release the threads to run IF (work_to_be_done && not_paused)

This bug is present since svn rev 8663 (just before 2.6.0 release)


attached is a zip with the files:

OpenSceneGraph\include\osgDB\ImagePager



This file is valid for svn branch and stable 3.2 and 3.4
branches 2.6 - 3.0 have the same bug, but other differences in the file."


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15125 16af8721-9629-0410-8352-f15c8da7e697

2015-09-04 15:04:58 +00:00

..

Archive

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

AuthenticationMap

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Callbacks

From Jannik Heller, typo fixes

2015-04-13 10:43:56 +00:00

ClassInterface

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

ConvertBase64

From Johannes Scholz, "Attached you find a patch for osgDB::OutputStream and osgDB::InputStream to include osg::Image::data() using Base64 encoding inside the ASCII OSGT, if WriteImageHint=IncludeData is set, only."

2015-03-02 12:11:43 +00:00

ConvertUTF

Standardized on defined(__ANDROID__)

2014-11-28 10:54:40 +00:00

DatabasePager

From Jannik Heller, typo fixes

2015-06-01 13:11:49 +00:00

DatabaseRevisions

From David Callu, warning fixes and removal of spaces at end of lines.

2013-06-28 12:00:43 +00:00

DataTypes

Added access methods to Serializer to help with using wrappers for other purposes such as script integration.

2013-09-11 15:44:08 +00:00

DotOsgWrapper

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

DynamicLibrary

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Export

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ExternalFileWriter

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

FileCache

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

FileNameUtils

Added osgDB::getSortedDirectoryContents and osgDB::FileNameComparator to help with sorting directory contents into alphabetic and numerical order.

2012-09-12 16:02:02 +00:00

FileUtils

Added osgDB::getSortedDirectoryContents and osgDB::FileNameComparator to help with sorting directory contents into alphabetic and numerical order.

2012-09-12 16:02:02 +00:00

fstream

From Martin Naylor, replace osgDB::fstream with an osgDB::open() call.

2013-06-12 12:49:18 +00:00

ImageOptions

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ImagePager

From Laurens Voerman, "I found that using an ImageSequence with mode PAGE_AND_DISCARD_USED_IMAGES triggers the (3) imageThreads to run and never stop, even when no more work is to be done. This is due to a bug in the stop condition currently setting the thread to stop and wait for a signal only when no work needs to be done AND the databasepager is paused.

2015-09-04 15:04:58 +00:00

ImageProcessor

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

Input

Refactored osgDB::Input::readObjectOfType to use a template, and updated associated wrappers to avoid using local static's

2012-11-21 13:38:11 +00:00

InputStream

Added handling of the reading of field properties to a dummy object for cached images to avoid threading issues associated with reusing and modifying an active object.

2014-11-05 16:08:42 +00:00

ObjectCache

Refactored the handling of use of the osgDB::ObjectCache in the DatabasePager to use a local thread specific ObjectCache to handle new additions and

2014-11-13 09:40:11 +00:00

ObjectWrapper

From Frashud Lashkari, "I was getting "Unsupported wrapper class..." error messages when attempting to load osgb models simultaneously from multiple threads. I believe the problem is caused by un-synchronized access to the global osgDB::ObjectWrapperManager class. I've attached a change that adds a mutex to the class and uses it when accessing the internal wrapper/compress maps. This appears to fix the issues I was having."

2015-06-01 12:07:04 +00:00

Options

From Mike Connell, "Give ReadFileCallback access to parent location : These small changes to the database pager allow user code in the ReadFileCallback to safely determine where the file being loaded is destined to be inserted into the scenegraph.

2015-06-08 11:18:24 +00:00

Output

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

OutputStream

Fixed warning by removing redundent check

2015-09-04 14:23:55 +00:00

ParameterOutput

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

PluginQuery

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

ReaderWriter

From Albert Luaces, typo fixes.

2015-06-01 13:40:20 +00:00

ReadFile

Added osgDB::readShaderFileWithFallback(..) convinience functions to make it easier to set up reading external shader files with a built in fallback.

2014-12-24 10:13:42 +00:00

Registry

From Jannik Heller, typo fixes

2015-06-01 13:11:49 +00:00

Serializer

Added supoort for osg::CullSettings/Camera::InheritanceMaskActionOnAttributeSetting and InheritanceMask properties.

2015-06-09 16:49:20 +00:00

SharedStateManager

Fixed usage of META_NodeVisitor so it doesn't include ""

2013-01-24 18:48:34 +00:00

StreamOperator

From Wang Rui, "The file attached includes two new features for the serialization IO functionality. First, custom serializer version control should work now, just by defining a new REGISTER_CUSTOM_OBJECT_WRAPPER macro. For example:

2013-06-24 08:48:55 +00:00

Version

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00

WriteFile

Added readScript/writeScript methods to ReaderWriter

2014-07-14 15:59:06 +00:00

XmlParser

Ran script to remove trailing spaces and tabs

2012-03-21 17:36:20 +00:00