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

Introduced a local reference to the appropriate EasyCurl object to avoid seperate getEasyCurl() incurring a mutex lock overhead.

Browse Source
This commit is contained in:
Robert Osfield
2010-12-21 12:51:15 +00:00
parent 56a8df7ba7
commit c38a1eb56d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgPlugins/curl/ReaderWriterCURL.cpp
View File

@@ -384,12 +384,13 @@ osgDB::ReaderWriter::ReadResult ReaderWriterCURL::readFile(ObjectType objectType
std::stringstream buffer;
EasyCurl::StreamObject sp(&buffer, std::string());
EasyCurl& easyCurl = getEasyCurl();
// setup the timeouts:
getEasyCurl().setConnectionTimeout(connectTimeout);
getEasyCurl().setTimeout(timeout);
easyCurl.setConnectionTimeout(connectTimeout);
easyCurl.setTimeout(timeout);
ReadResult curlResult = getEasyCurl().read(proxyAddress, fileName, sp, options);
ReadResult curlResult = easyCurl.read(proxyAddress, fileName, sp, options);
if (curlResult.status()==ReadResult::FILE_LOADED)
{
@@ -404,7 +405,7 @@ osgDB::ReaderWriter::ReadResult ReaderWriterCURL::readFile(ObjectType objectType
// mime-type:
if ( !reader )
{
std::string mimeType = getEasyCurl().getResultMimeType(sp);
std::string mimeType = easyCurl.getResultMimeType(sp);
OSG_INFO << "CURL: Looking up extension for mime-type " << mimeType << std::endl;
if ( mimeType.length() > 0 )
{