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

Backed out changeset 8db8aca9022a (Remove temporary HttpRequestPumper eventnames from mainloop eventpump) to make room for LL fix

meow-7.2.2
Ansariel 2016-06-24 11:29:45 +02:00
parent c33ccd4754
commit 9e1c533805
4 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llcommon/lldependencies.h
View File

@ -721,9 +721,6 @@ public:
template<typename KEY_OR_ITER>
dep_range get_before_range(const KEY_OR_ITER& key) const;
void clearCache()
{ mCache.clear(); }
private:
DepNodeMap mNodes;
mutable iterator_list mCache;

8
indra/llcommon/llevents.cpp
View File

@ -481,14 +481,6 @@ void LLEventPump::stopListening(const std::string& name)
// avoid a new dependency sort in such cases.
}
// <FS:ND> Allow full unregister, or mDeps will grow and grow with stale entries from temporary HttpRequestPumper instances
void LLEventPump::removeFromDeps( std::string const &a_strName )
{
mDeps.remove( a_strName );
mDeps.clearCache();
}
// </FS:ND?
/*****************************************************************************
* LLEventStream
*****************************************************************************/

2
indra/llcommon/llevents.h
View File

@ -533,8 +533,6 @@ public:
/// <tt>getListener(name).disconnect()</tt> because stopListening() also
/// forgets this name.
virtual void stopListening(const std::string& name);
void removeFromDeps( std::string const &a_strName ); // <FS:ND> Allow full unregister, or mDeps will grow and grow with stale entries from temporary HttpRequestPumper instances
/// Post an event to all listeners. The @c bool return is only meaningful
/// if the underlying leaf class is LLEventStream -- beware of relying on
/// it too much! Truthfully, we return @c bool mostly to permit chaining

7
indra/llmessage/llcorehttputil.cpp
View File

@ -102,7 +102,6 @@ private:
LLTempBoundListener mBoundListener;
LLCore::HttpRequest::ptr_t mHttpRequest;
std::string mEventName; // <FS:ND/> Remember event name for unregister
};
@ -642,9 +641,8 @@ LLSD HttpCoroJSONHandler::parseBody(LLCore::HttpResponse *response, bool &succes
HttpRequestPumper::HttpRequestPumper(const LLCore::HttpRequest::ptr_t &request) :
mHttpRequest(request)
{
mEventName = LLEventPump::inventName(); // <FS:ND/> Remember name for unregister
mBoundListener = LLEventPumps::instance().obtain("mainloop").
listen( mEventName, boost::bind(&HttpRequestPumper::pollRequest, this, _1));
listen(LLEventPump::inventName(), boost::bind(&HttpRequestPumper::pollRequest, this, _1));
}
HttpRequestPumper::~HttpRequestPumper()
@ -653,9 +651,6 @@ HttpRequestPumper::~HttpRequestPumper()
{
mBoundListener.disconnect();
}
LLEventPumps::instance().obtain( "mainloop" ).removeFromDeps( mEventName ); // <FS:ND> Unregister, or mDeps of mainloop pump will grow and grow with stale entries from temporary HttpRequestPumper instances
}
bool HttpRequestPumper::pollRequest(const LLSD&)