Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-26 05:08:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup: webseed (#2712)

Browse Source 
* fixup! refactor: tr_webseed simplification (#2613)

call connection_limiter.taskStarted in the right place

* perf: put web thread to sleep when inactive
This commit is contained in:
Charles Kerr
2022-02-25 14:45:00 -06:00
committed by GitHub
parent 8c598c463c
commit 412ebc63c6
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libtransmission/web.cc
View File

@@ -4,6 +4,7 @@
// License text can be found in the licenses/ folder.
#include <algorithm>
#include <condition_variable>
#include <list>
#include <map>
#include <memory>
@@ -139,12 +140,14 @@ public:
~Impl()
{
run_mode = RunMode::CloseNow;
queued_tasks_cv.notify_one();
curl_thread->join();
}
void closeSoon()
{
run_mode = RunMode::CloseSoon;
queued_tasks_cv.notify_one();
}
[[nodiscard]] bool isClosed() const
@@ -161,6 +164,7 @@ public:
auto const lock = std::unique_lock(queued_tasks_mutex);
queued_tasks.emplace_back(new Task{ *this, std::move(options) });
queued_tasks_cv.notify_one();
}
private:
@@ -436,9 +440,20 @@ private:
break;
}
// add queued tasks
{
auto const lock = std::unique_lock(impl->queued_tasks_mutex);
auto lock = std::unique_lock(impl->queued_tasks_mutex);
// sleep until there's something to do
auto const has_work = [&running_tasks, impl]()
{
return running_tasks > 0 || !std::empty(impl->queued_tasks) || impl->run_mode != RunMode::Run;
};
if (!has_work())
{
impl->queued_tasks_cv.wait(lock, has_work);
}
// add queued tasks
for (auto* task : impl->queued_tasks)
{
dbgmsg("adding task to curl: [%s]", task->url().c_str());
@@ -509,7 +524,8 @@ private:
private:
std::shared_ptr<CURLSH> const curlsh_{ curl_share_init(), curl_share_cleanup };
std::recursive_mutex queued_tasks_mutex;
std::mutex queued_tasks_mutex;
std::condition_variable queued_tasks_cv;
std::list<Task*> queued_tasks;
CURLSH* shared()