mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-08-22 15:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.11'

Browse Source
This commit is contained in:
Paul-Louis Ageneau
2021-03-10 18:59:54 +01:00
parent f76243fb38 38db6d7365
commit 4cda5fe27b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.7) cmake_minimum_required(VERSION 3.7)
project(libdatachannel project(libdatachannel
VERSION 0.11.9 VERSION 0.11.10
LANGUAGES CXX) LANGUAGES CXX)
set(PROJECT_DESCRIPTION "WebRTC Data Channels Library") set(PROJECT_DESCRIPTION "WebRTC Data Channels Library")

4
src/impl/threadpool.cpp
View File

@ -67,7 +67,7 @@ void ThreadPool::join() {
void ThreadPool::run() { void ThreadPool::run() {
++mBusyWorkers; ++mBusyWorkers;
scope_guard([&]() { --mBusyWorkers; }); scope_guard guard([&]() { --mBusyWorkers; });
while (runOne()) { while (runOne()) {
} }
} }
@ -94,7 +94,7 @@ std::function<void()> ThreadPool::dequeue() {
} }
--mBusyWorkers; --mBusyWorkers;
scope_guard([&]() { ++mBusyWorkers; }); scope_guard guard([&]() { ++mBusyWorkers; });
mWaitingCondition.notify_all(); mWaitingCondition.notify_all();
if(time) if(time)
mTasksCondition.wait_until(lock, *time); mTasksCondition.wait_until(lock, *time);

2
src/impl/threadpool.hpp
View File

@ -72,7 +72,7 @@ protected:
std::function<void()> dequeue(); // returns null function if joining std::function<void()> dequeue(); // returns null function if joining
std::vector<std::thread> mWorkers; std::vector<std::thread> mWorkers;
int mBusyWorkers = 0; std::atomic<int> mBusyWorkers = 0;
std::atomic<bool> mJoining = false; std::atomic<bool> mJoining = false;
struct Task { struct Task {