Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ None.

# License

Copyright (c) 2005-2024 Xavier Leclercq\
Copyright (c) 2000-2026 Xavier Leclercq\
This work is licensed under the Boost Software License 1.0\
See https://github.com/ishiko-cpp/concurrency/blob/main/LICENSE.txt
2 changes: 1 addition & 1 deletion include/Ishiko/Concurrency.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
// SPDX-License-Identifier: BSL-1.0

#ifndef GUARD_ISHIKO_CPP_CONCURRENCY_HPP
Expand Down
2 changes: 1 addition & 1 deletion include/Ishiko/Concurrency/Thread.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
// SPDX-License-Identifier: BSL-1.0

#ifndef GUARD_ISHIKO_CPP_CONCURRENCY_THREAD_HPP
Expand Down
2 changes: 1 addition & 1 deletion include/Ishiko/Concurrency/ThreadPool.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
// SPDX-License-Identifier: BSL-1.0

#ifndef GUARD_ISHIKO_CPP_CONCURRENCY_THREADPOOL_HPP
Expand Down
2 changes: 1 addition & 1 deletion include/Ishiko/Concurrency/linkoptions.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
// SPDX-License-Identifier: BSL-1.0

#ifndef GUARD_ISHIKO_CPP_CONCURRENCY_LINKOPTIONS_HPP
Expand Down
2 changes: 1 addition & 1 deletion include/Ishiko/Concurrency/windows/Thread.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
// SPDX-License-Identifier: BSL-1.0

#ifndef GUARD_ISHIKO_CPP_CONCURRENCY_WINDOWS_THREAD_HPP
Expand Down
2 changes: 1 addition & 1 deletion src/ThreadPool.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
// SPDX-License-Identifier: BSL-1.0

#include "ThreadPool.hpp"
2 changes: 1 addition & 1 deletion src/windows/Thread.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2000-2025 Xavier Leclercq
// SPDX-FileCopyrightText: 2000-2026 Xavier Leclercq
// SPDX-License-Identifier: BSL-1.0

#include "windows/Thread.hpp"
Expand Down
4 changes: 3 additions & 1 deletion tests/build-files/bakefile/IshikoConcurrencyTests.bkl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ program IshikoConcurrencyTests : IshikoConcurrency, IshikoTestFrameworkCore
if ($(toolset) == gnu)
{
cxx-compiler-options = "-std=c++14";
libs += IshikoTestFrameworkCore IshikoConfiguration IshikoXML IshikoFileSystem IshikoIO IshikoProcess IshikoTime IshikoText IshikoErrors IshikoBasePlatform;
libs += IshikoTestFrameworkCore IshikoConfiguration IshikoXML IshikoFileSystem IshikoIO IshikoProcess IshikoConcurrency IshikoTime IshikoText IshikoErrors IshikoBasePlatform;
libs += fmt boost_filesystem;
}

Expand All @@ -28,11 +28,13 @@ program IshikoConcurrencyTests : IshikoConcurrency, IshikoTestFrameworkCore
headers
{
../../src/ThreadPoolTests.hpp
../../src/ThreadTests.hpp
}

sources
{
../../src/main.cpp
../../src/ThreadPoolTests.cpp
../../src/ThreadTests.cpp
}
}
17 changes: 10 additions & 7 deletions tests/build-files/gnumake/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ endif
# Additionally, this makefile is customizable with the following
# settings:
#
# ISHIKO_CPP_CONCURRENCY_ROOT Path to the Ishiko/C++ Concurrency installation
# ISHIKO_CPP_BASEPLATFORM_ROOT Path to the Ishiko/C++ BasePlatform installation
# ISHIKO_CPP_CONCURRENCY_ROOT Path to the Ishiko/C++ Concurrency installation
# ISHIKO_CPP_ERRORS_ROOT Path to the Ishiko/C++ Errors installation
# ISHIKO_CPP_FMT_ROOT Path to the fmt installation
# ISHIKO_CPP_MEMORY_ROOT Path to the Ishiko/C++ Memory installation
Expand Down Expand Up @@ -74,10 +74,10 @@ endif
# Configurable settings:
#

# Path to the Ishiko/C++ Concurrency installation
ISHIKO_CPP_CONCURRENCY_ROOT ?= $(ISHIKO_CPP_ROOT)/concurrency
# Path to the Ishiko/C++ BasePlatform installation
ISHIKO_CPP_BASEPLATFORM_ROOT ?= $(ISHIKO_CPP_ROOT)/base-platform
# Path to the Ishiko/C++ Concurrency installation
ISHIKO_CPP_CONCURRENCY_ROOT ?= $(ISHIKO_CPP_ROOT)/concurrency
# Path to the Ishiko/C++ Errors installation
ISHIKO_CPP_ERRORS_ROOT ?= $(ISHIKO_CPP_ROOT)/errors
# Path to the fmt installation
Expand Down Expand Up @@ -113,14 +113,17 @@ ISHIKO_CPP_TESTFRAMEWORK_ROOT ?= $(ISHIKO_CPP_ROOT)/test-framework

all: $(_builddir)IshikoConcurrencyTests

$(_builddir)IshikoConcurrencyTests: $(_builddir)IshikoConcurrencyTests_main.o $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o
$(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoConcurrencyTests_main.o $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o -L$(ISHIKO_CPP_CONCURRENCY_ROOT)/lib -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread
$(_builddir)IshikoConcurrencyTests: $(_builddir)IshikoConcurrencyTests_main.o $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o $(_builddir)IshikoConcurrencyTests_ThreadTests.o
$(CXX) -o $@ $(LDFLAGS) $(_builddir)IshikoConcurrencyTests_main.o $(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o $(_builddir)IshikoConcurrencyTests_ThreadTests.o -L$(ISHIKO_CPP_BASEPLATFORM_ROOT)/lib -L$(ISHIKO_CPP_CONCURRENCY_ROOT)/lib -L$(ISHIKO_CPP_ERRORS_ROOT)/lib -L$(ISHIKO_CPP_FMT_ROOT)/lib -L$(ISHIKO_CPP_MEMORY_ROOT)/lib -L$(ISHIKO_CPP_BOOST_ROOT)/lib -L$(ISHIKO_CPP_TEXT_ROOT)/lib -L$(ISHIKO_CPP_CONFIGURATION_ROOT)/lib -L$(ISHIKO_CPP_IO_ROOT)/lib -L$(ISHIKO_CPP_FILESYSTEM_ROOT)/lib -L$(ISHIKO_CPP_TYPES_ROOT)/lib -L$(ISHIKO_CPP_DIFF_ROOT)/lib -L$(ISHIKO_CPP_XML_ROOT)/lib -L$(ISHIKO_CPP_PROCESS_ROOT)/lib -L$(ISHIKO_CPP_TIME_ROOT)/lib -L$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/lib -lIshikoTestFrameworkCore -lIshikoConfiguration -lIshikoXML -lIshikoFileSystem -lIshikoIO -lIshikoProcess -lIshikoConcurrency -lIshikoTime -lIshikoText -lIshikoErrors -lIshikoBasePlatform -lfmt -lboost_filesystem -pthread

$(_builddir)IshikoConcurrencyTests_main.o: ../../src/main.cpp
$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp
$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/main.cpp

$(_builddir)IshikoConcurrencyTests_ThreadPoolTests.o: ../../src/ThreadPoolTests.cpp
$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/ThreadPoolTests.cpp
$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/ThreadPoolTests.cpp

$(_builddir)IshikoConcurrencyTests_ThreadTests.o: ../../src/ThreadTests.cpp
$(CXX) -c -o $@ $(CPPFLAGS) $(CXXFLAGS) -MD -MP -pthread -DPUGIXML_HEADER_ONLY -I$(ISHIKO_CPP_BASEPLATFORM_ROOT)/include -I$(ISHIKO_CPP_CONCURRENCY_ROOT)/include -I$(ISHIKO_CPP_ERRORS_ROOT)/include -I$(ISHIKO_CPP_FMT_ROOT)/include -I$(ISHIKO_CPP_MEMORY_ROOT)/include -I$(ISHIKO_CPP_BOOST_ROOT)/include -I$(ISHIKO_CPP_TEXT_ROOT)/include -I$(ISHIKO_CPP_CONFIGURATION_ROOT)/include -I$(ISHIKO_CPP_IO_ROOT)/include -I$(ISHIKO_CPP_FILESYSTEM_ROOT)/include -I$(ISHIKO_CPP_TYPES_ROOT)/include -I$(ISHIKO_CPP_DIFF_ROOT)/include -I$(ISHIKO_CPP_PUGIXML_ROOT)/src -I$(ISHIKO_CPP_XML_ROOT)/include -I$(ISHIKO_CPP_PROCESS_ROOT)/include -I$(ISHIKO_CPP_TIME_ROOT)/include -I$(ISHIKO_CPP_TESTFRAMEWORK_ROOT)/include -std=c++14 ../../src/ThreadTests.cpp

clean:
rm -f $(_builddir)*.o
Expand Down
Loading