livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5732: Issue in texture_load example and some comments regarding NoOpDeletor

master
Rider Linden 2015-10-15 10:12:58 -07:00
parent eca891e261
commit 3fdd5abf96
4 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llcorehttp/examples/http_texture_load.cpp
View File

@ -361,7 +361,7 @@ int main(int argc, char** argv)
<< std::endl;
// Clean up
hr->requestStopThread(NULL);
hr->requestStopThread(LLCore::HttpHandler::ptr_t());
ms_sleep(1000);
opt.reset();
delete hr;
@ -435,6 +435,11 @@ WorkingSet::~WorkingSet()
{
}
namespace
{
void NoOpDeletor(LLCore::HttpHandler *)
{ /*NoOp*/ }
}
bool WorkingSet::reload(LLCore::HttpRequest * hr, LLCore::HttpOptions::ptr_t & opt)
{
@ -464,11 +469,11 @@ bool WorkingSet::reload(LLCore::HttpRequest * hr, LLCore::HttpOptions::ptr_t & o
LLCore::HttpHandle handle;
if (offset || length)
{
handle = hr->requestGetByteRange(0, 0, buffer, offset, length, opt, mHeaders, this);
handle = hr->requestGetByteRange(0, 0, buffer, offset, length, opt, mHeaders, LLCore::HttpHandler::ptr_t(this, NoOpDeletor));
}
else
{
handle = hr->requestGet(0, 0, buffer, opt, mHeaders, this);
handle = hr->requestGet(0, 0, buffer, opt, mHeaders, LLCore::HttpHandler::ptr_t(this, NoOpDeletor));
}
if (! handle)
{

12
indra/newview/llappcorehttp.cpp
View File

@ -280,10 +280,16 @@ void setting_changed()
namespace
{
// The NoOpDeletor is used when wrapping LLAppCoreHttp in a smart pointer below for
// passage into the LLCore::Http libararies. When the smart pointer is destroyed,
// no action will be taken since we do not in this case want the entire LLAppCoreHttp object
// to be destroyed at the end of the call.
//
// *NOTE$: Yes! It is "Deletor"
// http://english.stackexchange.com/questions/4733/what-s-the-rule-for-adding-er-vs-or-when-nouning-a-verb
// "delete" derives from Latin "deletus"
void NoOpDeletor(LLCore::HttpHandler *)
{
}
{ /*NoOp*/ }
}
void LLAppCoreHttp::requestStop()

13
indra/newview/llmeshrepository.cpp
View File

@ -393,10 +393,17 @@ U32 LLMeshRepository::sMaxLockHoldoffs = 0;
LLDeadmanTimer LLMeshRepository::sQuiescentTimer(15.0, false); // true -> gather cpu metrics
namespace {
void NoOpDeletor(LLCore::HttpHandler *)
{
// The NoOpDeletor is used when passing certain objects (generally the LLMeshUploadThread)
// in a smart pointer below for passage into the LLCore::Http libararies.
// When the smart pointer is destroyed, no action will be taken since we
// do not in these cases want the object to be destroyed at the end of the call.
//
// *NOTE$: Yes! It is "Deletor"
// http://english.stackexchange.com/questions/4733/what-s-the-rule-for-adding-er-vs-or-when-nouning-a-verb
// "delete" derives from Latin "deletus"
}
void NoOpDeletor(LLCore::HttpHandler *)
{ /*NoOp*/ }
}
static S32 dump_num = 0;

12
indra/newview/lltexturefetch.cpp
View File

@ -256,9 +256,17 @@ static const S32 HTTP_REQUESTS_RANGE_END_MAX = 20000000;
//////////////////////////////////////////////////////////////////////////////
namespace
{
// The NoOpDeletor is used when passing certain objects (the LLTextureFetchWorker and
// the LLTextureFetchDebugger) in a smart pointer below for passage into
// the LLCore::Http libararies. When the smart pointer is destroyed, no
// action will be taken since we do not in these cases want the object to
// be destroyed at the end of the call.
//
// *NOTE$: Yes! It is "Deletor"
// http://english.stackexchange.com/questions/4733/what-s-the-rule-for-adding-er-vs-or-when-nouning-a-verb
// "delete" derives from Latin "deletus"
void NoOpDeletor(LLCore::HttpHandler *)
{
}
{ /*NoOp*/ }
}
static const char* e_state_name[] =