Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 20:04:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1045 from csoler/v0.6-FT

Browse source 
adding pending transfers 100 at a time instead of 1 at a time when lo…
This commit is contained in:
csoler 2017-09-18 22:50:35 +02:00 • committed by GitHub
commit 58ccf0bef4
1 changed files with 42 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libretroshare/src/ft/ftcontroller.cc
View file

@ -826,14 +826,15 @@ bool ftController::isActiveAndNoPending()
bool ftController::handleAPendingRequest() bool ftController::handleAPendingRequest()
{ {
uint32_t nb_requests_handled = 0 ;
static const uint32_t MAX_SIMULTANEOUS_PENDING_REQUESTS = 100 ;
while(!mPendingRequests.empty() && nb_requests_handled++ < MAX_SIMULTANEOUS_PENDING_REQUESTS)
{
ftPendingRequest req; ftPendingRequest req;
{ {
RsStackMutex stack(ctrlMutex); /******* LOCKED ********/ RsStackMutex stack(ctrlMutex); /******* LOCKED ********/
if (mPendingRequests.size() < 1)
{
return false;
}
req = mPendingRequests.front(); req = mPendingRequests.front();
mPendingRequests.pop_front(); mPendingRequests.pop_front();
} }
@ -880,8 +881,8 @@ bool ftController::handleAPendingRequest()
std::cerr << "No pending chunkmap for hash " << req.mHash << std::endl ; std::cerr << "No pending chunkmap for hash " << req.mHash << std::endl ;
#endif #endif
} }
}
return true ; return !mPendingRequests.empty();
} }
bool ftController::alreadyHaveFile(const RsFileHash& hash, FileInfo &info) bool ftController::alreadyHaveFile(const RsFileHash& hash, FileInfo &info)