[med-svn] [Git][med-team/libthread-pool][debian/stretch-backports] 35 commits: Do not build with -march=native
Andreas Tille
gitlab at salsa.debian.org
Fri Nov 22 09:27:25 GMT 2019
Andreas Tille pushed to branch debian/stretch-backports at Debian Med / libthread-pool
Commits:
72581542 by Andreas Tille at 2018-08-26T12:55:41Z
Do not build with -march=native
- - - - -
038ca53c by Andreas Tille at 2018-08-26T12:56:10Z
Standards-Version: 4.2.0
- - - - -
83af403e by Andreas Tille at 2018-08-26T12:57:17Z
Upload to unstable
- - - - -
964266ed by Michael R. Crusoe at 2019-01-04T17:44:33Z
add missing pthread
- - - - -
3c785962 by Michael R. Crusoe at 2019-01-04T17:44:46Z
Remove trailing whitespace in debian/copyright
- - - - -
666efa01 by Michael R. Crusoe at 2019-02-15T15:52:00Z
document Standards-Version: 4.3.0; no changes needed
- - - - -
f8ff75e9 by Michael R. Crusoe at 2019-02-15T15:55:24Z
Update homepage URL.
- - - - -
2002dac2 by Michael R. Crusoe at 2019-02-15T16:38:35Z
build & run the tests
- - - - -
aaea68ed by Michael R. Crusoe at 2019-02-15T16:43:47Z
respect nocheck
- - - - -
95daca31 by Andreas Tille at 2019-08-21T09:19:16Z
Rebuild for new version of gcc to fix symbols
- - - - -
63253377 by Andreas Tille at 2019-08-21T09:19:30Z
debhelper-compat 12
- - - - -
86126010 by Andreas Tille at 2019-08-21T09:19:39Z
Standards-Version: 4.4.0
- - - - -
e0397e86 by Andreas Tille at 2019-08-21T09:19:44Z
Set upstream metadata fields: Name.
Fixes lintian: upstream-metadata-file-is-missing
See https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html for more details.
- - - - -
5c1d9a83 by Andreas Tille at 2019-08-21T09:21:34Z
Upload to unstable
- - - - -
73b5bc76 by Andreas Tille at 2019-09-09T11:58:01Z
Fix FTBFS with nocheck profile: Unconditionally build-depend on googletest
- - - - -
e4bd0e99 by Andreas Tille at 2019-09-09T11:58:23Z
Remove obsolete fields Name from debian/upstream/metadata.
- - - - -
dc0bb153 by Andreas Tille at 2019-09-09T12:00:52Z
Upload to unstable
- - - - -
89fefd08 by Andreas Tille at 2019-09-17T18:15:11Z
New upstream version 2.0.1
- - - - -
23762163 by Andreas Tille at 2019-09-17T18:15:11Z
New upstream version
- - - - -
86250418 by Andreas Tille at 2019-09-17T18:15:12Z
Update upstream source from tag 'upstream/2.0.1'
Update to upstream version '2.0.1'
with Debian dir a07b484a581b1c1646452e487c50836e36a26f56
- - - - -
14483ae5 by Andreas Tille at 2019-09-17T20:13:26Z
Adapt patches
- - - - -
cabae11d by Andreas Tille at 2019-09-17T20:27:02Z
Fix library location
- - - - -
3641ff58 by Andreas Tille at 2019-09-17T20:28:09Z
Upload to unstable
- - - - -
922f20a4 by Andreas Tille at 2019-11-18T17:44:59Z
Fix build on i386
- - - - -
4682a2df by Andreas Tille at 2019-11-18T17:45:20Z
Fix build on i386
- - - - -
53cb9ace by Andreas Tille at 2019-11-18T17:46:18Z
Provide symbols for amd64 only
- - - - -
9ac3df4c by Andreas Tille at 2019-11-18T17:46:36Z
Standards-Version: 4.4.1
- - - - -
916bcc4b by Andreas Tille at 2019-11-18T17:46:38Z
Set upstream metadata fields: Repository.
Fixes lintian: upstream-metadata-file-is-missing
See https://lintian.debian.org/tags/upstream-metadata-file-is-missing.html for more details.
- - - - -
b79a8c44 by Andreas Tille at 2019-11-18T17:57:02Z
Upload to unstable
- - - - -
958e1373 by Andreas Tille at 2019-11-19T06:13:22Z
Test-Depends: cmake
- - - - -
e8c2891f by Andreas Tille at 2019-11-19T08:21:54Z
Upload to unstable
- - - - -
d60363ff by Andreas Tille at 2019-11-19T20:52:32Z
Test-Depends: build-essential
- - - - -
01b3de4b by Andreas Tille at 2019-11-19T20:55:06Z
Upload to unstable
- - - - -
94a497b9 by Andreas Tille at 2019-11-22T09:14:50Z
Merge tag 'debian/2.0.1-4' into debian/stretch-backports
- - - - -
d7b48a64 by Andreas Tille at 2019-11-22T09:15:51Z
Rebuild for stretch-backports-sloppy
- - - - -
18 changed files:
- CMakeLists.txt
- README.md
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- + debian/patches/no_march--native.patch
- debian/patches/series
- debian/patches/shared_and_static.patch
- debian/patches/soversion.patch
- debian/rules
- + debian/tests/CMakeLists.txt
- + debian/tests/control
- + debian/tests/run-unit-test
- + debian/upstream/metadata
- include/thread_pool/thread_pool.hpp
- src/thread_pool.cpp
- test/thread_pool_test.cpp
Changes:
=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.2)
project(thread_pool)
+include(GNUInstallDirs)
+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
@@ -8,21 +10,31 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -march=native")
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+
+find_package(Threads REQUIRED)
option(thread_pool_build_tests "Build thread_pool unit tests" OFF)
add_library(thread_pool STATIC
src/thread_pool.cpp)
+target_link_libraries(thread_pool Threads::Threads)
+
target_include_directories(thread_pool PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
-install(TARGETS thread_pool DESTINATION lib)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/thread_pool DESTINATION include)
+install(TARGETS thread_pool DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/thread_pool DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
if (thread_pool_build_tests)
add_executable(thread_pool_test test/thread_pool_test.cpp)
- add_subdirectory(vendor/googletest/googletest EXCLUDE_FROM_ALL)
+
+ if (NOT TARGET gtest_main)
+ add_subdirectory(vendor/googletest/googletest EXCLUDE_FROM_ALL)
+ endif()
+
target_link_libraries(thread_pool_test thread_pool gtest_main)
-endif(thread_pool_build_tests)
+endif()
=====================================
README.md
=====================================
@@ -1,5 +1,6 @@
# Thread pool
+[](https://github.com/rvaser/thread_pool/releases/latest)
A c++ thread pool implementation inspired by https://github.com/progschj/ThreadPool.
@@ -15,10 +16,10 @@ Application uses following software:
## Instalation
-CmakeLists is provided in the project root folder. By running the following commands:
+By running the following commands:
```bash
-git clone https://github.com/rvaser/thread_pool thread_pool
+git clone https://github.com/rvaser/thread_pool.git thread_pool
cd thread_pool
mkdir build
cd build
@@ -26,9 +27,11 @@ cmake -DCMAKE_BUILD_TYPE=Release ..
make
```
-a library named libthread_pool.a will appear in `build/lib` directory. To link the library with your code, add `-Iinclude/ -Lbuild/lib -lthread_pool -lpthread --std=c++11` while compiling and include `thread_pool/thread_pool.hpp` in your desired source files. Optionally, you can run `sudo make install` to install thread_pool library to your machine which lets you exclude `-Iinclude/ -Lbuild/lib` while compiling.
+a library named `libthread_pool.a` will appear in `build/lib` directory. Optionally, you can run `sudo make install` to install thread_pool library to your machine.
-Alternatively, add the project to your CMakeLists.txt file with `add_subdirectory(vendor/thread_pool EXCLUDE_FROM_ALL)` and `target_link_libraries(your_exe thread_pool pthread)` commands.
+Alternatively, add the project to your `CMakeLists.txt` file with `add_subdirectory(vendor/thread_pool EXCLUDE_FROM_ALL)` and `target_link_libraries(your_exe thread_pool)` commands.
+
+To build unit tests run `git submodule update --init` and add `-Dthread_pool_build_tests=ON` while running `cmake`. After installation, an executable named `thread_pool_test` will be created in `build/bin`.
## Usage
@@ -53,11 +56,10 @@ std::shared_ptr<thread_pool::ThreadPool> thread_pool =
// create storage for return values of function1 and function2
std::vector<std::future<int>> thread_futures;
-for (int i = 0; i < num_tasks; ++i) {
+for (std::uint32_t i = 0; i < num_tasks; ++i) {
// be sure to use std::ref() when passing references!
- thread_futures.emplace_back(thread_pool->submit_task(function1,
- std::ref(data), index, ...));
- thread_futures.emplace_back(thread_pool->submit_task(function2, a, b));
+ thread_futures.emplace_back(thread_pool->submit(function1, std::ref(data), index, ...));
+ thread_futures.emplace_back(thread_pool->submit(function2, a, b));
}
// wait for threads to finish
@@ -68,8 +70,8 @@ for (auto& it: thread_futures) {
// new set of tasks running function3
std::vector<std::future<void>> thread_futures2;
-for (int i = 0; i < num_tasks2; ++i) {
- thread_futures2.emplace_back(thread_pool->submit_task(function3));
+for (std::uint32_t i = 0; i < num_tasks2; ++i) {
+ thread_futures2.emplace_back(thread_pool->submit(function3));
}
for (auto& it2: thread_futures2) {
it.wait();
=====================================
debian/changelog
=====================================
@@ -1,3 +1,74 @@
+libthread-pool (2.0.1-4~bpo9+1) stretch-backports-sloppy; urgency=medium
+
+ * Rebuild for stretch-backports-sloppy.
+
+ -- Andreas Tille <tille at debian.org> Fri, 22 Nov 2019 10:15:00 +0100
+
+libthread-pool (2.0.1-4) unstable; urgency=medium
+
+ * Test-Depends: build-essential
+
+ -- Andreas Tille <tille at debian.org> Tue, 19 Nov 2019 21:52:39 +0100
+
+libthread-pool (2.0.1-3) unstable; urgency=medium
+
+ * Test-Depends: cmake
+
+ -- Andreas Tille <tille at debian.org> Tue, 19 Nov 2019 07:13:35 +0100
+
+libthread-pool (2.0.1-2) unstable; urgency=medium
+
+ * Fix build on i386
+ * Provide symbols for amd64 only
+ * Standards-Version: 4.4.1
+ * Set upstream metadata fields: Repository.
+
+ -- Andreas Tille <tille at debian.org> Mon, 18 Nov 2019 18:46:39 +0100
+
+libthread-pool (2.0.1-1) unstable; urgency=medium
+
+ * New upstream version
+
+ -- Andreas Tille <tille at debian.org> Tue, 17 Sep 2019 22:18:26 +0200
+
+libthread-pool (1.0.0-4) unstable; urgency=medium
+
+ [ Helmut Grohne ]
+ * Fix FTBFS with nocheck profile: Unconditionally build-depend on
+ googletest. (Closes: #939519)
+
+ [ Andreas Tille ]
+ * Remove obsolete fields Name from debian/upstream/metadata.
+
+ -- Andreas Tille <tille at debian.org> Mon, 09 Sep 2019 13:58:23 +0200
+
+libthread-pool (1.0.0-3) unstable; urgency=medium
+
+ [ Michael R. Crusoe ]
+ * Add missing '-pthread'
+ * Remove trailing whitespace in debian/copyright
+ * Update homepage URL.
+ * Build the included tests and run them
+ * As an autopkgtest, build the tests against the installed package and run
+ them.
+
+ [ Andreas Tille ]
+ * Rebuild for new version of gcc to fix symbols
+ Closes: #925761
+ * debhelper-compat 12
+ * Standards-Version: 4.4.0
+ * Set upstream metadata fields: Name.
+
+ -- Andreas Tille <tille at debian.org> Wed, 21 Aug 2019 11:19:44 +0200
+
+libthread-pool (1.0.0-2) unstable; urgency=medium
+
+ * Do not build with -march=native
+ Closes: #906618
+ * Standards-Version: 4.2.0
+
+ -- Andreas Tille <tille at debian.org> Sun, 26 Aug 2018 14:56:11 +0200
+
libthread-pool (1.0.0-1~bpo9+1) stretch-backports; urgency=medium
* Rebuild for stretch-backports.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -3,15 +3,15 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
Uploaders: Andreas Tille <tille at debian.org>
Section: science
Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
cmake,
d-shlibs,
rename,
- libgtest-dev
-Standards-Version: 4.1.4
+ googletest
+Standards-Version: 4.4.1
Vcs-Browser: https://salsa.debian.org/med-team/libthread-pool
Vcs-Git: https://salsa.debian.org/med-team/libthread-pool.git
-Homepage: https://github.com/rvaser/libthread-pool
+Homepage: https://github.com/rvaser/thread_pool
Package: libthread-pool0
Architecture: any
@@ -31,8 +31,7 @@ Description: C++ thread pool library
Package: libthread-pool-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends},
- ${misc:Depends},
+Depends: ${misc:Depends},
libthread-pool0 (= ${binary:Version})
Description: C++ thread pool library (devel)
A thread pool is a software design pattern for achieving concurrency of
=====================================
debian/copyright
=====================================
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: thread_pool
-Upstream-Contact:
+Upstream-Contact:
Source: https://github.com/rvaser/thread_pool/releases
Files: *
=====================================
debian/patches/no_march--native.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Do not build with -march=native
+Bug-Debian: https://bugs.debian.org/906618
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 26 Aug 2018 14:53:02 +0200
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PRO
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -march=native")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
shared_and_static.patch
soversion.patch
+no_march--native.patch
=====================================
debian/patches/shared_and_static.patch
=====================================
@@ -4,7 +4,7 @@ Description: Build shared and static lib
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -11,14 +11,22 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+@@ -17,7 +17,10 @@ find_package(Threads REQUIRED)
option(thread_pool_build_tests "Build thread_pool unit tests" OFF)
@@ -15,7 +15,8 @@ Description: Build shared and static lib
+add_library(thread_pool_static STATIC
src/thread_pool.cpp)
- target_include_directories(thread_pool PUBLIC
+ target_link_libraries(thread_pool Threads::Threads)
+@@ -26,7 +29,12 @@ target_include_directories(thread_pool P
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
@@ -23,8 +24,8 @@ Description: Build shared and static lib
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<INSTALL_INTERFACE:include>)
+
- install(TARGETS thread_pool DESTINATION lib)
+ install(TARGETS thread_pool DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS thread_pool_static DESTINATION lib)
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/thread_pool DESTINATION include)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/thread_pool DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
if (thread_pool_build_tests)
=====================================
debian/patches/soversion.patch
=====================================
@@ -9,11 +9,11 @@ Description: Add soversion
-project(thread_pool)
+project(thread_pool LANGUAGES CXX VERSION 1.0.0)
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-@@ -17,6 +17,11 @@ add_library(thread_pool SHARED
- add_library(thread_pool_static STATIC
- src/thread_pool.cpp)
+ include(GNUInstallDirs)
+
+@@ -25,6 +25,11 @@ add_library(thread_pool_static STATIC
+
+ target_link_libraries(thread_pool Threads::Threads)
+set_target_properties(thread_pool
+ PROPERTIES
=====================================
debian/rules
=====================================
@@ -3,17 +3,28 @@
# DH_VERBOSE := 1
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
+export DEB_LDFLAGS_MAINT_APPEND+=-pthread
%:
dh $@
+override_dh_auto_configure:
+ rm -Rf vendor/*
+ ln -s /usr/src/googletest ./vendor/
+ dh_auto_configure -- -Dthread_pool_build_tests=ON
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ ./obj-*/bin/thread_pool_test
+endif
+
override_dh_install:
dh_install
file-rename 's/_static\.a/.a/' `find debian -name "lib*_static.a"`
+ mv debian/tmp/usr/lib/*.a debian/tmp/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` # this somehow inserts i686-linux-gnu which is wrong: $(DEB_HOST_MULTIARCH)
d-shlibmove --commit \
--multiarch \
--devunversioned \
--exclude-la \
--movedev debian/tmp/usr/include/* usr/include \
- debian/tmp/usr/lib/*.so
+ debian/tmp/usr/lib/*/*.so
=====================================
debian/tests/CMakeLists.txt
=====================================
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.2)
+project(thread_pool_test)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_executable(thread_pool_test thread_pool_test.cpp)
+add_subdirectory(/usr/src/googletest .. EXCLUDE_FROM_ALL)
+target_link_libraries(thread_pool_test thread_pool gtest_main)
=====================================
debian/tests/control
=====================================
@@ -0,0 +1,3 @@
+Tests: run-unit-test
+Depends: @, googletest, cmake, build-essential
+Restrictions: allow-stderr
=====================================
debian/tests/run-unit-test
=====================================
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+pkg=libthread-pool
+
+if [ "$AUTOPKGTEST_TMP" = "" ] ; then
+ AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
+ trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
+fi
+
+cp -a test/* $AUTOPKGTEST_TMP
+cp -a debian/tests/CMakeLists.txt $AUTOPKGTEST_TMP
+
+cd $AUTOPKGTEST_TMP
+mkdir build
+cd build
+cmake ..
+make
+./thread_pool_test
=====================================
debian/upstream/metadata
=====================================
@@ -0,0 +1 @@
+Repository: https://github.com/rvaser/thread_pool.git
=====================================
include/thread_pool/thread_pool.hpp
=====================================
@@ -6,9 +6,10 @@
#pragma once
-#include <stdint.h>
+#include <cstdint>
#include <memory>
#include <vector>
+#include <string>
#include <queue>
#include <mutex>
#include <thread>
@@ -19,40 +20,42 @@
namespace thread_pool {
+static const std::string version = "v2.0.1";
+
class Semaphore;
-std::unique_ptr<Semaphore> createSemaphore(uint32_t value);
+std::unique_ptr<Semaphore> createSemaphore(std::uint32_t value);
class ThreadPool;
-std::unique_ptr<ThreadPool> createThreadPool(uint32_t num_threads =
+std::unique_ptr<ThreadPool> createThreadPool(std::uint32_t num_threads =
std::thread::hardware_concurrency() / 2);
class Semaphore {
public:
~Semaphore() = default;
- uint32_t value() const {
+ std::uint32_t value() const {
return value_;
}
void wait();
void post();
- friend std::unique_ptr<Semaphore> createSemaphore(uint32_t value);
+ friend std::unique_ptr<Semaphore> createSemaphore(std::uint32_t value);
private:
- Semaphore(uint32_t value);
+ Semaphore(std::uint32_t value);
Semaphore(const Semaphore&) = delete;
const Semaphore& operator=(const Semaphore&) = delete;
std::mutex mutex_;
std::condition_variable condition_;
- uint32_t value_;
+ std::uint32_t value_;
};
class ThreadPool {
public:
~ThreadPool();
- uint32_t num_threads() const {
+ std::uint32_t num_threads() const {
return threads_.size();
}
@@ -61,7 +64,7 @@ public:
}
template<typename T, typename... Ts>
- auto submit_task(T&& routine, Ts&&... params)
+ auto submit(T&& routine, Ts&&... params)
-> std::future<typename std::result_of<T(Ts...)>::type> {
auto task = std::make_shared<std::packaged_task<typename std::result_of<T(Ts...)>::type()>>(
@@ -82,9 +85,9 @@ public:
return task_result;
}
- friend std::unique_ptr<ThreadPool> createThreadPool(uint32_t num_threads);
+ friend std::unique_ptr<ThreadPool> createThreadPool(std::uint32_t num_threads);
private:
- ThreadPool(uint32_t num_threads);
+ ThreadPool(std::uint32_t num_threads);
ThreadPool(const ThreadPool&) = delete;
const ThreadPool& operator=(const ThreadPool&) = delete;
=====================================
src/thread_pool.cpp
=====================================
@@ -4,26 +4,25 @@
* @brief ThreadPool class source file
*/
-#include <stdlib.h>
+#include <exception>
#include "thread_pool/thread_pool.hpp"
namespace thread_pool {
-std::unique_ptr<Semaphore> createSemaphore(uint32_t value) {
+std::unique_ptr<Semaphore> createSemaphore(std::uint32_t value) {
return std::unique_ptr<Semaphore>(new Semaphore(value));
}
-std::unique_ptr<ThreadPool> createThreadPool(uint32_t num_threads) {
+std::unique_ptr<ThreadPool> createThreadPool(std::uint32_t num_threads) {
if (num_threads == 0) {
- fprintf(stderr, "[thread_pool::createThreadPool] error: "
+ throw std::invalid_argument("[thread_pool::createThreadPool] error: "
"invalid number of threads!");
- exit(1);
}
return std::unique_ptr<ThreadPool>(new ThreadPool(num_threads));
}
-Semaphore::Semaphore(uint32_t value)
+Semaphore::Semaphore(std::uint32_t value)
: value_(value) {
}
@@ -39,13 +38,13 @@ void Semaphore::wait() {
--value_;
}
-ThreadPool::ThreadPool(uint32_t num_threads) {
+ThreadPool::ThreadPool(std::uint32_t num_threads) {
queue_sem_ = createSemaphore(1);
active_sem_ = createSemaphore(0);
terminate_ = false;
- for (uint32_t i = 0; i < num_threads; ++i) {
+ for (std::uint32_t i = 0; i < num_threads; ++i) {
threads_.emplace_back(ThreadPool::worker_thread, this);
thread_identifiers_.emplace_back(threads_.back().get_id());
}
@@ -54,7 +53,7 @@ ThreadPool::ThreadPool(uint32_t num_threads) {
ThreadPool::~ThreadPool() {
terminate_ = true;
- for (uint32_t i = 0; i < threads_.size(); ++i) {
+ for (std::uint32_t i = 0; i < threads_.size(); ++i) {
active_sem_->post();
}
for (auto& it: threads_) {
=====================================
test/thread_pool_test.cpp
=====================================
@@ -22,29 +22,33 @@ public:
};
TEST(ThreadPoolTest_, CreateThreadPoolError) {
- EXPECT_DEATH((thread_pool::createThreadPool(0)),
- ".thread_pool::createThreadPool. error: invalid number of threads!");
+ try {
+ auto thread_pool = thread_pool::createThreadPool(0);
+ } catch (std::invalid_argument& exception) {
+ EXPECT_STREQ(exception.what(), "[thread_pool::createThreadPool] error: "
+ "invalid number of threads!");
+ }
}
TEST_F(ThreadPoolTest, ParallelCalculation) {
- std::vector<std::vector<uint32_t>> data(10);
+ std::vector<std::vector<std::uint32_t>> data(10);
for (auto& it: data) {
it.reserve(100000);
- for (uint32_t i = 0; i < 100000; ++i) {
+ for (std::uint32_t i = 0; i < 100000; ++i) {
it.push_back(i);
}
}
- auto do_some_calculation = [](std::vector<uint32_t>& src) -> void {
- for (uint32_t i = 0; i < src.size() - 1; ++i) {
+ auto do_some_calculation = [](std::vector<std::uint32_t>& src) -> void {
+ for (std::uint32_t i = 0; i < src.size() - 1; ++i) {
src[i] = (src[i] * src[i + 1]) / (src[i] - src[i + 1] * 3);
}
};
std::vector<std::future<void>> thread_futures;
- for (uint32_t i = 0; i < data.size(); ++i) {
- thread_futures.emplace_back(thread_pool->submit_task(do_some_calculation,
+ for (std::uint32_t i = 0; i < data.size(); ++i) {
+ thread_futures.emplace_back(thread_pool->submit(do_some_calculation,
std::ref(data[i])));
}
@@ -56,8 +60,8 @@ TEST_F(ThreadPoolTest, ParallelCalculation) {
TEST_F(ThreadPoolTest, ThreadIdentifiers) {
const auto& identifiers = thread_pool->thread_identifiers();
- std::unordered_map<std::thread::id, uint32_t> thread_map;
- uint32_t thread_id = 0;
+ std::unordered_map<std::thread::id, std::uint32_t> thread_map;
+ std::uint32_t thread_id = 0;
for (const auto& it: identifiers) {
thread_map[it] = thread_id++;
}
@@ -67,7 +71,7 @@ TEST_F(ThreadPoolTest, ThreadIdentifiers) {
auto barrier = thread_pool::createSemaphore(0);
auto checkpoint = thread_pool::createSemaphore(0);
auto check_thread_id = [&barrier, &checkpoint](
- std::unordered_map<std::thread::id, uint32_t>& thread_map) -> int32_t {
+ std::unordered_map<std::thread::id, std::uint32_t>& thread_map) -> std::int32_t {
checkpoint->post();
barrier->wait();
@@ -78,27 +82,27 @@ TEST_F(ThreadPoolTest, ThreadIdentifiers) {
return -1;
};
- std::vector<std::future<int32_t>> thread_futures;
- for (uint32_t i = 0; i < thread_id; ++i) {
- thread_futures.emplace_back(thread_pool->submit_task(check_thread_id,
+ std::vector<std::future<std::int32_t>> thread_futures;
+ for (std::uint32_t i = 0; i < thread_id; ++i) {
+ thread_futures.emplace_back(thread_pool->submit(check_thread_id,
std::ref(thread_map)));
}
- for (uint32_t i = 0; i < thread_id; ++i) {
+ for (std::uint32_t i = 0; i < thread_id; ++i) {
checkpoint->wait();
}
- for (uint32_t i = 0; i < thread_id; ++i) {
+ for (std::uint32_t i = 0; i < thread_id; ++i) {
barrier->post();
}
- std::unordered_set<int32_t> thread_identifiers;
+ std::unordered_set<std::int32_t> thread_identifiers;
for (auto& it: thread_futures) {
it.wait();
thread_identifiers.emplace(it.get());
}
EXPECT_EQ(thread_id, thread_identifiers.size());
- for (uint32_t i = 0; i < thread_id; ++i) {
+ for (std::uint32_t i = 0; i < thread_id; ++i) {
EXPECT_EQ(1U, thread_identifiers.count(i));
}
}
View it on GitLab: https://salsa.debian.org/med-team/libthread-pool/compare/9c6cb1fb9904c42f4cbce585f98ffcfd2ff7a24f...d7b48a641b525a7f9fd3868435ee8637b08cea73
--
View it on GitLab: https://salsa.debian.org/med-team/libthread-pool/compare/9c6cb1fb9904c42f4cbce585f98ffcfd2ff7a24f...d7b48a641b525a7f9fd3868435ee8637b08cea73
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191122/e1e63f09/attachment-0001.html>
More information about the debian-med-commit
mailing list