Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix top check in MultiHandle::check_run_count.

Browse Source 
This check isn't really needed at all, since curl_multi_info_read
is fast enough, but well... The old check was flawed anyway.
This commit is contained in:
Aleric Inglewood
2012-10-15 21:03:08 +02:00
parent 02cffa9a71
commit bb8ea493d6
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/aistatemachine/aicurlthread.cpp
View File

@@ -1420,7 +1420,7 @@ void AICurlThread::run(void)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// MultiHandle // MultiHandle
MultiHandle::MultiHandle(void) : mHandleAddedOrRemoved(false), mPrevRunningHandles(0), mRunningHandles(0), mTimeOut(-1), mReadPollSet(NULL), mWritePollSet(NULL) MultiHandle::MultiHandle(void) : mRunningHandles(0), mTimeout(-1), mReadPollSet(NULL), mWritePollSet(NULL)
{ {
mReadPollSet = new PollSet; mReadPollSet = new PollSet;
mWritePollSet = new PollSet; mWritePollSet = new PollSet;
@@ -1543,7 +1543,6 @@ void MultiHandle::add_easy_request(AICurlEasyRequest const& easy_request)
} }
if (ret == CURLM_OK) if (ret == CURLM_OK)
{ {
mHandleAddedOrRemoved = true;
std::pair<addedEasyRequests_type::iterator, bool> res = mAddedEasyRequests.insert(easy_request); std::pair<addedEasyRequests_type::iterator, bool> res = mAddedEasyRequests.insert(easy_request);
llassert(res.second); // May not have been added before. llassert(res.second); // May not have been added before.
Dout(dc::curl, "MultiHandle::add_easy_request: Added AICurlEasyRequest " << (void*)easy_request.get_ptr().get() << "; now processing " << mAddedEasyRequests.size() << " easy handles."); Dout(dc::curl, "MultiHandle::add_easy_request: Added AICurlEasyRequest " << (void*)easy_request.get_ptr().get() << "; now processing " << mAddedEasyRequests.size() << " easy handles.");
@@ -1603,7 +1602,6 @@ CURLMcode MultiHandle::remove_easy_request(addedEasyRequests_type::iterator cons
ThreadSafeCurlEasyRequest* lockobj = iter->get_ptr().get(); ThreadSafeCurlEasyRequest* lockobj = iter->get_ptr().get();
#endif #endif
mAddedEasyRequests.erase(iter); mAddedEasyRequests.erase(iter);
mHandleAddedOrRemoved = true;
Dout(dc::curl, "MultiHandle::remove_easy_request: Removed AICurlEasyRequest " << (void*)lockobj << "; now processing " << mAddedEasyRequests.size() << " easy handles."); Dout(dc::curl, "MultiHandle::remove_easy_request: Removed AICurlEasyRequest " << (void*)lockobj << "; now processing " << mAddedEasyRequests.size() << " easy handles.");
// Attempt to add a queued request, if any. // Attempt to add a queued request, if any.
@@ -1618,7 +1616,8 @@ CURLMcode MultiHandle::remove_easy_request(addedEasyRequests_type::iterator cons
void MultiHandle::check_run_count(void) void MultiHandle::check_run_count(void)
{ {
if (mHandleAddedOrRemoved || mRunningHandles < mPrevRunningHandles) llassert(mAddedEasyRequests.size() >= mRunningHandles);
if (mAddedEasyRequests.size() - mRunningHandles > 0) // There is no need to do this when all easy handles are accounted for.
{ {
CURLMsg const* msg; CURLMsg const* msg;
int msgs_left; int msgs_left;
@@ -1652,9 +1651,7 @@ void MultiHandle::check_run_count(void)
// Destruction of easy_request at this point, causes the CurlEasyRequest to be deleted. // Destruction of easy_request at this point, causes the CurlEasyRequest to be deleted.
} }
} }
mHandleAddedOrRemoved = false;
} }
mPrevRunningHandles = mRunningHandles;
} }
void MultiHandle::finish_easy_request(AICurlEasyRequest const& easy_request, CURLcode result) void MultiHandle::finish_easy_request(AICurlEasyRequest const& easy_request, CURLcode result)

5
indra/aistatemachine/aicurlthread.h
View File

@@ -74,10 +74,7 @@ class MultiHandle : public CurlMultiHandle
private: private:
typedef std::set<AICurlEasyRequest, AICurlEasyRequestCompare> addedEasyRequests_type; typedef std::set<AICurlEasyRequest, AICurlEasyRequestCompare> addedEasyRequests_type;
addedEasyRequests_type mAddedEasyRequests; addedEasyRequests_type mAddedEasyRequests; // All easy requests currently added to the multi handle.
bool mHandleAddedOrRemoved; // Set when an easy handle was added or removed, reset in check_run_count().
int mPrevRunningHandles; // The last value of mRunningHandles that check_run_count() was called with.
int mRunningHandles; // The last value returned by curl_multi_socket_action. int mRunningHandles; // The last value returned by curl_multi_socket_action.
long mTimeout; // The last timeout in ms as set by the callback CURLMOPT_TIMERFUNCTION. long mTimeout; // The last timeout in ms as set by the callback CURLMOPT_TIMERFUNCTION.