From: Francis Dupont Date: Thu, 19 Sep 2019 14:18:15 +0000 (+0200) Subject: [914-move-to-c-11-thread-library-in-core-library-code] Upgraded thread/mutex code... X-Git-Tag: Kea-1.7.0~8 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=53e956d8de12ab467cbb2501b300c3dbcddde1f9;p=thirdparty%2Fkea.git [914-move-to-c-11-thread-library-in-core-library-code] Upgraded thread/mutex code in the core library to C++11 --- diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am index bdb86cd89e..8ddeabe3bd 100644 --- a/src/bin/agent/Makefile.am +++ b/src/bin/agent/Makefile.am @@ -54,7 +54,6 @@ kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/util/libkea-util.la kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la kea_ctrl_agent_LDADD += $(top_builddir)/src/lib/database/libkea-database.la diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am index 03b906f6eb..e1c27c0f8c 100644 --- a/src/bin/d2/Makefile.am +++ b/src/bin/d2/Makefile.am @@ -69,7 +69,6 @@ kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/util/libkea-util.la kea_dhcp_ddns_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la kea_dhcp_ddns_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am index 168f50c7b8..0a3ecf204b 100644 --- a/src/bin/d2/tests/Makefile.am +++ b/src/bin/d2/tests/Makefile.am @@ -91,7 +91,6 @@ d2_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la d2_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la d2_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la d2_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -d2_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la d2_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la d2_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la d2_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am index 28f6194411..b50dc9124a 100644 --- a/src/bin/dhcp4/Makefile.am +++ b/src/bin/dhcp4/Makefile.am @@ -73,7 +73,6 @@ kea_dhcp4_LDADD += $(top_builddir)/src/lib/process/libkea-process.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/util/libkea-util.la kea_dhcp4_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la kea_dhcp4_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) diff --git a/src/bin/dhcp4/tests/Makefile.am b/src/bin/dhcp4/tests/Makefile.am index f7968d3c74..3969c73099 100644 --- a/src/bin/dhcp4/tests/Makefile.am +++ b/src/bin/dhcp4/tests/Makefile.am @@ -159,7 +159,6 @@ dhcp4_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la dhcp4_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la dhcp4_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am index 88e184dc36..4574bbbb5c 100644 --- a/src/bin/dhcp6/Makefile.am +++ b/src/bin/dhcp6/Makefile.am @@ -72,7 +72,6 @@ kea_dhcp6_LDADD += $(top_builddir)/src/lib/process/libkea-process.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/util/libkea-util.la kea_dhcp6_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la kea_dhcp6_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am index 7b017efb73..7ef1952cd9 100644 --- a/src/bin/dhcp6/tests/Makefile.am +++ b/src/bin/dhcp6/tests/Makefile.am @@ -159,7 +159,6 @@ dhcp6_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la dhcp6_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la dhcp6_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am index dd90f66faf..7b44626585 100644 --- a/src/bin/lfc/Makefile.am +++ b/src/bin/lfc/Makefile.am @@ -54,7 +54,6 @@ kea_lfc_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la kea_lfc_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la kea_lfc_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la kea_lfc_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -kea_lfc_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la kea_lfc_LDADD += $(top_builddir)/src/lib/util/libkea-util.la kea_lfc_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la kea_lfc_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) diff --git a/src/bin/lfc/tests/Makefile.am b/src/bin/lfc/tests/Makefile.am index 0a11ec4b9b..02f8ed8e04 100644 --- a/src/bin/lfc/tests/Makefile.am +++ b/src/bin/lfc/tests/Makefile.am @@ -79,7 +79,6 @@ lfc_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la lfc_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la lfc_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la lfc_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -lfc_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la lfc_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la lfc_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la lfc_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) diff --git a/src/hooks/dhcp/high_availability/Makefile.am b/src/hooks/dhcp/high_availability/Makefile.am index baf203f934..c9954ad53b 100644 --- a/src/hooks/dhcp/high_availability/Makefile.am +++ b/src/hooks/dhcp/high_availability/Makefile.am @@ -54,7 +54,6 @@ libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp_ha_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am index ded680e4a2..808728e406 100644 --- a/src/hooks/dhcp/lease_cmds/Makefile.am +++ b/src/hooks/dhcp/lease_cmds/Makefile.am @@ -45,7 +45,6 @@ libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp_lease_cmds_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libdhcp_lease_cmds_la_LIBADD += $(LOG4CPLUS_LIBS) diff --git a/src/hooks/dhcp/lease_cmds/tests/Makefile.am b/src/hooks/dhcp/lease_cmds/tests/Makefile.am index 1795ee953e..bb0fa3d372 100644 --- a/src/hooks/dhcp/lease_cmds/tests/Makefile.am +++ b/src/hooks/dhcp/lease_cmds/tests/Makefile.am @@ -47,7 +47,6 @@ lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la lease_cmds_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la lease_cmds_unittests_LDADD += $(LOG4CPLUS_LIBS) diff --git a/src/hooks/dhcp/mysql_cb/Makefile.am b/src/hooks/dhcp/mysql_cb/Makefile.am index 6b79a64d29..f203ff37f0 100644 --- a/src/hooks/dhcp/mysql_cb/Makefile.am +++ b/src/hooks/dhcp/mysql_cb/Makefile.am @@ -49,7 +49,6 @@ libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp_mysql_cb_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/hooks/dhcp/mysql_cb/tests/Makefile.am b/src/hooks/dhcp/mysql_cb/tests/Makefile.am index dd36169920..d1cfb6e7cc 100644 --- a/src/hooks/dhcp/mysql_cb/tests/Makefile.am +++ b/src/hooks/dhcp/mysql_cb/tests/Makefile.am @@ -54,7 +54,6 @@ mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la mysql_cb_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la mysql_cb_unittests_LDADD += $(LOG4CPLUS_LIBS) diff --git a/src/hooks/dhcp/stat_cmds/Makefile.am b/src/hooks/dhcp/stat_cmds/Makefile.am index b054e936b3..b95a6d63c5 100644 --- a/src/hooks/dhcp/stat_cmds/Makefile.am +++ b/src/hooks/dhcp/stat_cmds/Makefile.am @@ -43,7 +43,6 @@ libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/stats/libkea-stats.la libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp_stat_cmds_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libdhcp_stat_cmds_la_LIBADD += $(LOG4CPLUS_LIBS) diff --git a/src/hooks/dhcp/stat_cmds/tests/Makefile.am b/src/hooks/dhcp/stat_cmds/tests/Makefile.am index fa87d653ad..aa9d1c3a1a 100644 --- a/src/hooks/dhcp/stat_cmds/tests/Makefile.am +++ b/src/hooks/dhcp/stat_cmds/tests/Makefile.am @@ -58,7 +58,6 @@ stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/dhcp_ddns/libkea-dhcp_ddns. stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/stats/libkea-stats.la stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la stat_cmds_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la stat_cmds_unittests_LDADD += $(LOG4CPLUS_LIBS) diff --git a/src/hooks/dhcp/user_chk/Makefile.am b/src/hooks/dhcp/user_chk/Makefile.am index 4f6ae80af2..a88fb628ec 100644 --- a/src/hooks/dhcp/user_chk/Makefile.am +++ b/src/hooks/dhcp/user_chk/Makefile.am @@ -42,7 +42,6 @@ libdhcp_user_chk_la_LDFLAGS += -rpath /nowhere libdhcp_user_chk_la_LIBADD = libduc.la libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp_user_chk_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libdhcp_user_chk_la_LIBADD += $(LOG4CPLUS_LIBS) diff --git a/src/hooks/dhcp/user_chk/tests/Makefile.am b/src/hooks/dhcp/user_chk/tests/Makefile.am index f2c7073bea..36ad55c7d8 100644 --- a/src/hooks/dhcp/user_chk/tests/Makefile.am +++ b/src/hooks/dhcp/user_chk/tests/Makefile.am @@ -48,7 +48,6 @@ libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp_user_chk_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libdhcp_user_chk_unittests_LDADD += $(LOG4CPLUS_LIBS) diff --git a/src/lib/asiodns/Makefile.am b/src/lib/asiodns/Makefile.am index be1f7d81dc..9da1c72336 100644 --- a/src/lib/asiodns/Makefile.am +++ b/src/lib/asiodns/Makefile.am @@ -24,7 +24,6 @@ libkea_asiodns_la_CPPFLAGS = $(AM_CPPFLAGS) libkea_asiodns_la_LIBADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_asiodns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/asiodns/tests/Makefile.am b/src/lib/asiodns/tests/Makefile.am index 5befee90f0..117fcc61c9 100644 --- a/src/lib/asiodns/tests/Makefile.am +++ b/src/lib/asiodns/tests/Makefile.am @@ -26,7 +26,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/asiolink/tests/Makefile.am b/src/lib/asiolink/tests/Makefile.am index 51c6e98422..d19c0ed094 100644 --- a/src/lib/asiolink/tests/Makefile.am +++ b/src/lib/asiolink/tests/Makefile.am @@ -37,7 +37,6 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDADD = $(top_builddir)/src/lib/asiolink/testutils/libasiolinktest.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/asiolink/testutils/test_server_unix_socket.cc b/src/lib/asiolink/testutils/test_server_unix_socket.cc index 68b3aa7298..ed0a217312 100644 --- a/src/lib/asiolink/testutils/test_server_unix_socket.cc +++ b/src/lib/asiolink/testutils/test_server_unix_socket.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2017-2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -300,17 +300,18 @@ TestServerUnixSocket::accept() { void TestServerUnixSocket::signalRunning() { { - isc::util::thread::Mutex::Locker lock(mutex_); + std::lock_guard lock(mutex_); running_ = true; } - condvar_.signal(); + condvar_.notify_one(); } void TestServerUnixSocket::waitForRunning() { - isc::util::thread::Mutex::Locker lock(mutex_); + std::lock_guard locker(mutex_); + std::unique_lock lock(mutex_, std::adopt_lock); while (!running_) { - condvar_.wait(mutex_); + condvar_.wait(lock); } } diff --git a/src/lib/asiolink/testutils/test_server_unix_socket.h b/src/lib/asiolink/testutils/test_server_unix_socket.h index 3deb59fd96..d5aec7575a 100644 --- a/src/lib/asiolink/testutils/test_server_unix_socket.h +++ b/src/lib/asiolink/testutils/test_server_unix_socket.h @@ -1,4 +1,4 @@ -// Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2017-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,13 +10,13 @@ #include #include #include -#include -#include #include #include #include #include #include +#include +#include namespace isc { namespace asiolink { @@ -151,14 +151,14 @@ private: /// Mutex is used in situations when server's IO service is being run in a /// thread to synchronize this thread with a main thread using /// @ref signalRunning and @ref waitForRunning. - isc::util::thread::Mutex mutex_; + std::mutex mutex_; /// @brief Conditional variable used by the server. /// /// Conditional variable is used in situations when server's IO service is /// being run in a thread to synchronize this thread with a main thread /// using @ref signalRunning and @ref waitForRunning. - isc::util::thread::CondVar condvar_; + std::condition_variable condvar_; }; /// @brief Pointer to the @ref TestServerUnixSocket. diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am index b02a87b401..8c7f7788e4 100644 --- a/src/lib/cc/tests/Makefile.am +++ b/src/lib/cc/tests/Makefile.am @@ -31,7 +31,6 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) run_unittests_LDADD = $(top_builddir)/src/lib/cc/libkea-cc.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la -run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/config/Makefile.am b/src/lib/config/Makefile.am index 22bec16a0f..0fff792e72 100644 --- a/src/lib/config/Makefile.am +++ b/src/lib/config/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = . tests +UBDIRS = . tests AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib AM_CPPFLAGS += $(BOOST_INCLUDES) @@ -22,7 +22,6 @@ libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_cfgclient_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_cfgclient_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) diff --git a/src/lib/config/tests/Makefile.am b/src/lib/config/tests/Makefile.am index 69e2854578..47a918f556 100644 --- a/src/lib/config/tests/Makefile.am +++ b/src/lib/config/tests/Makefile.am @@ -35,7 +35,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la run_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/config_backend/tests/Makefile.am b/src/lib/config_backend/tests/Makefile.am index 0ab44250c3..9e254b5959 100644 --- a/src/lib/config_backend/tests/Makefile.am +++ b/src/lib/config_backend/tests/Makefile.am @@ -29,7 +29,6 @@ libcb_unittests_LDADD = $(top_builddir)/src/lib/database/libkea-database.la libcb_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libcb_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libcb_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libcb_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libcb_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libcb_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libcb_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD) diff --git a/src/lib/cql/Makefile.am b/src/lib/cql/Makefile.am index 24934959bb..77de76b6eb 100644 --- a/src/lib/cql/Makefile.am +++ b/src/lib/cql/Makefile.am @@ -16,7 +16,6 @@ libkea_cql_la_LIBADD = $(top_builddir)/src/lib/database/libkea-database.la libkea_cql_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la libkea_cql_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_cql_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_cql_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_cql_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_cql_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_cql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) diff --git a/src/lib/database/Makefile.am b/src/lib/database/Makefile.am index c764564787..85249f53af 100644 --- a/src/lib/database/Makefile.am +++ b/src/lib/database/Makefile.am @@ -25,7 +25,6 @@ libkea_database_la_SOURCES += server_selector.cc server_selector.h libkea_database_la_LIBADD = $(top_builddir)/src/lib/cc/libkea-cc.la libkea_database_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_database_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_database_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_database_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_database_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_database_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) diff --git a/src/lib/database/tests/Makefile.am b/src/lib/database/tests/Makefile.am index f8548924ef..5a3433681c 100644 --- a/src/lib/database/tests/Makefile.am +++ b/src/lib/database/tests/Makefile.am @@ -35,7 +35,6 @@ libdatabase_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutil libdatabase_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libdatabase_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libdatabase_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libdatabase_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdatabase_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libdatabase_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libdatabase_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD) diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am index fcd92c2ccb..ed9d813e0f 100644 --- a/src/lib/dhcp/Makefile.am +++ b/src/lib/dhcp/Makefile.am @@ -78,7 +78,6 @@ libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la libkea_dhcp___la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc index c7d4bdd227..8420ead396 100644 --- a/src/lib/dhcp/iface_mgr.cc +++ b/src/lib/dhcp/iface_mgr.cc @@ -42,7 +42,6 @@ using namespace std; using namespace isc::asiolink; using namespace isc::util; -using namespace isc::util::thread; using namespace isc::util::io; using namespace isc::util::io::internal; diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h index 450ff6d395..ef17f92745 100644 --- a/src/lib/dhcp/iface_mgr.h +++ b/src/lib/dhcp/iface_mgr.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include @@ -1385,7 +1385,7 @@ private: PacketQueueMgr6Ptr packet_queue_mgr6_; /// DHCP packet receiver. - isc::util::thread::WatchedThreadPtr dhcp_receiver_; + isc::util::WatchedThreadPtr dhcp_receiver_; }; }; // namespace isc::dhcp diff --git a/src/lib/dhcp/packet_queue.h b/src/lib/dhcp/packet_queue.h index 07bb7ffb4c..aea1c95e2a 100644 --- a/src/lib/dhcp/packet_queue.h +++ b/src/lib/dhcp/packet_queue.h @@ -1,4 +1,4 @@ -// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -11,7 +11,6 @@ #include #include #include -#include #include #include diff --git a/src/lib/dhcp/packet_queue_ring.h b/src/lib/dhcp/packet_queue_ring.h index 315e2a0375..24b8890a26 100644 --- a/src/lib/dhcp/packet_queue_ring.h +++ b/src/lib/dhcp/packet_queue_ring.h @@ -1,4 +1,4 @@ -// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,11 +8,11 @@ #define PACKET_QUEUE_RING_H #include -#include #include #include #include +#include namespace isc { @@ -105,7 +105,7 @@ public: /// @param to specifies the end of the queue to which the packet /// should be added. virtual void pushPacket(PacketTypePtr& packet, const QueueEnd& to=QueueEnd::BACK) { - isc::util::thread::Mutex::Locker lock(mutex_); + std::lock_guard lock(mutex_); if (to == QueueEnd::BACK) { queue_.push_back(packet); } else { @@ -123,12 +123,12 @@ public: /// @return A pointer to dequeued packet, or an empty pointer /// if the queue is empty. virtual PacketTypePtr popPacket(const QueueEnd& from = QueueEnd::FRONT) { - isc::util::thread::Mutex::Locker lock(mutex_); PacketTypePtr packet; if (queue_.empty()) { return (packet); } + std::lock_guard lock(mutex_); if (from == QueueEnd::FRONT) { packet = queue_.front(); queue_.pop_front(); @@ -210,7 +210,7 @@ private: boost::circular_buffer queue_; /// @brief Mutex for protecting queue accesses. - isc::util::thread::Mutex mutex_; + std::mutex mutex_; }; diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am index bc162d84ad..33d74f2529 100644 --- a/src/lib/dhcp/tests/Makefile.am +++ b/src/lib/dhcp/tests/Makefile.am @@ -112,7 +112,6 @@ libdhcp___unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libdhcp___unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/dhcp_ddns/Makefile.am b/src/lib/dhcp_ddns/Makefile.am index 44d09010f3..88522aa8a8 100644 --- a/src/lib/dhcp_ddns/Makefile.am +++ b/src/lib/dhcp_ddns/Makefile.am @@ -32,7 +32,6 @@ libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcp_ddns_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_dhcp_ddns_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) diff --git a/src/lib/dhcp_ddns/tests/Makefile.am b/src/lib/dhcp_ddns/tests/Makefile.am index a75b3a44ab..8e13c9faec 100644 --- a/src/lib/dhcp_ddns/tests/Makefile.am +++ b/src/lib/dhcp_ddns/tests/Makefile.am @@ -40,7 +40,6 @@ libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcp_ddns_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libdhcp_ddns_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am index b8b8ad0b1e..c0d4c0a717 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am @@ -205,7 +205,6 @@ libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_dhcpsrv_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_dhcpsrv_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) diff --git a/src/lib/dhcpsrv/benchmarks/Makefile.am b/src/lib/dhcpsrv/benchmarks/Makefile.am index 2cd3a63b84..3716a72f06 100644 --- a/src/lib/dhcpsrv/benchmarks/Makefile.am +++ b/src/lib/dhcpsrv/benchmarks/Makefile.am @@ -97,7 +97,6 @@ run_benchmarks_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la run_benchmarks_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la run_benchmarks_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la run_benchmarks_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -run_benchmarks_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la run_benchmarks_LDADD += $(top_builddir)/src/lib/util/libkea-util.la run_benchmarks_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am index ed2b92a67c..d9cac94776 100644 --- a/src/lib/dhcpsrv/tests/Makefile.am +++ b/src/lib/dhcpsrv/tests/Makefile.am @@ -187,7 +187,6 @@ libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.l libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libdhcpsrv_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libdhcpsrv_unittests_LDADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am index 8de3d25a49..dff86776e6 100644 --- a/src/lib/eval/Makefile.am +++ b/src/lib/eval/Makefile.am @@ -32,7 +32,6 @@ libkea_eval_la_LIBADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_eval_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_eval_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_eval_la_LIBADD += $(LOG4CPLUS_LIBS) $(CRYPTO_LIBS) $(BOOST_LIBS) diff --git a/src/lib/eval/tests/Makefile.am b/src/lib/eval/tests/Makefile.am index e29351271d..f9d5a9e5a5 100644 --- a/src/lib/eval/tests/Makefile.am +++ b/src/lib/eval/tests/Makefile.am @@ -37,7 +37,6 @@ libeval_unittests_LDADD += $(top_builddir)/src/lib/dns/libkea-dns++.la libeval_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libkea-cryptolink.la libeval_unittests_LDADD += $(top_builddir)/src/lib/hooks/libkea-hooks.la libeval_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libeval_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libeval_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libeval_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libeval_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la diff --git a/src/lib/hooks/Makefile.am b/src/lib/hooks/Makefile.am index 2f0a23b55b..e0930e80a1 100644 --- a/src/lib/hooks/Makefile.am +++ b/src/lib/hooks/Makefile.am @@ -41,7 +41,6 @@ libkea_hooks_la_CPPFLAGS = $(AM_CPPFLAGS) libkea_hooks_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined -version-info 7:3:0 libkea_hooks_la_LIBADD = libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la libkea_hooks_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/hooks/tests/Makefile.am b/src/lib/hooks/tests/Makefile.am index 74951c108c..a84aef361e 100644 --- a/src/lib/hooks/tests/Makefile.am +++ b/src/lib/hooks/tests/Makefile.am @@ -8,11 +8,10 @@ AM_CXXFLAGS = $(KEA_CXXFLAGS) # Kea libraries against which the test user libraries are linked. HOOKS_LIB = $(top_builddir)/src/lib/hooks/libkea-hooks.la LOG_LIB = $(top_builddir)/src/lib/log/libkea-log.la -THREADS_LIB = $(top_builddir)/src/lib/util/threads/libkea-threads.la UTIL_LIB = $(top_builddir)/src/lib/util/libkea-util.la EXCEPTIONS_LIB = $(top_builddir)/src/lib/exceptions/libkea-exceptions.la -ALL_LIBS = $(HOOKS_LIB) $(LOG_LIB) $(THREADS_LIB) $(UTIL_LIB) $(EXCEPTIONS_LIB) $(LOG4CPLUS_LIBS) +ALL_LIBS = $(HOOKS_LIB) $(LOG_LIB) $(UTIL_LIB) $(EXCEPTIONS_LIB) $(LOG4CPLUS_LIBS) # Files to clean include the file created by testing. CLEANFILES = *.gcno *.gcda $(builddir)/marker_file.dat diff --git a/src/lib/http/Makefile.am b/src/lib/http/Makefile.am index f01375d050..5dd2c363e9 100644 --- a/src/lib/http/Makefile.am +++ b/src/lib/http/Makefile.am @@ -46,7 +46,6 @@ libkea_http_la_LIBADD = libkea_http_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_http_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la libkea_http_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_http_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_http_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_http_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_http_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) diff --git a/src/lib/http/tests/Makefile.am b/src/lib/http/tests/Makefile.am index 6aa79c6e45..fc9c8b427d 100644 --- a/src/lib/http/tests/Makefile.am +++ b/src/lib/http/tests/Makefile.am @@ -45,7 +45,6 @@ libhttp_unittests_LDADD = $(top_builddir)/src/lib/http/libkea-http.la libhttp_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libhttp_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libhttp_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libhttp_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libhttp_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libhttp_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libhttp_unittests_LDADD += $(LOG4CPLUS_LIBS) diff --git a/src/lib/log/Makefile.am b/src/lib/log/Makefile.am index 95331a5721..60eb9425a9 100644 --- a/src/lib/log/Makefile.am +++ b/src/lib/log/Makefile.am @@ -46,7 +46,6 @@ libkea_log_la_CXXFLAGS += -Wno-unused-parameter -Wno-deprecated-declarations endif libkea_log_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES) libkea_log_la_LIBADD = $(top_builddir)/src/lib/log/interprocess/libkea-log_interprocess.la -libkea_log_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_log_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_log_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_log_la_LIBADD += $(LOG4CPLUS_LIBS) diff --git a/src/lib/log/compiler/Makefile.am b/src/lib/log/compiler/Makefile.am index acf2a245f9..ff414b85ea 100644 --- a/src/lib/log/compiler/Makefile.am +++ b/src/lib/log/compiler/Makefile.am @@ -17,7 +17,6 @@ bin_PROGRAMS = kea-msg-compiler kea_msg_compiler_SOURCES = message.cc kea_msg_compiler_LDADD = $(top_builddir)/src/lib/log/libkea-log.la -kea_msg_compiler_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la kea_msg_compiler_LDADD += $(top_builddir)/src/lib/util/libkea-util.la kea_msg_compiler_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la kea_msg_compiler_LDADD += $(LOG4CPLUS_LIBS) diff --git a/src/lib/log/logger_impl.cc b/src/lib/log/logger_impl.cc index c4c594eea5..8f9e1eaa16 100644 --- a/src/lib/log/logger_impl.cc +++ b/src/lib/log/logger_impl.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2011-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -152,7 +152,7 @@ void LoggerImpl::outputRaw(const Severity& severity, const string& message) { // Use a mutex locker for mutual exclusion from other threads in // this process. - isc::util::thread::Mutex::Locker mutex_locker(LoggerManager::getMutex()); + std::lock_guard mutex_locker(LoggerManager::getMutex()); // Use an interprocess sync locker for mutual exclusion from other // processes to avoid log messages getting interspersed. diff --git a/src/lib/log/logger_manager.cc b/src/lib/log/logger_manager.cc index 10c10ffc2f..dc7a506d9a 100644 --- a/src/lib/log/logger_manager.cc +++ b/src/lib/log/logger_manager.cc @@ -206,9 +206,9 @@ LoggerManager::reset() { LoggerManagerImpl::reset(initSeverity(), initDebugLevel()); } -isc::util::thread::Mutex& +std::mutex& LoggerManager::getMutex() { - static isc::util::thread::Mutex mutex; + static std::mutex mutex; return (mutex); } diff --git a/src/lib/log/logger_manager.h b/src/lib/log/logger_manager.h index 7a5d32344c..1ddea6dd01 100644 --- a/src/lib/log/logger_manager.h +++ b/src/lib/log/logger_manager.h @@ -1,4 +1,4 @@ -// Copyright (C) 2011-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2011-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,11 +8,12 @@ #define LOGGER_MANAGER_H #include -#include #include #include +#include + // Generated if, when updating the logging specification, an unknown // destination is encountered. class UnknownLoggingDestination : public isc::Exception { @@ -138,7 +139,7 @@ public: /// \brief Return a process-global mutex that's used for mutual /// exclusion among threads of a single process during logging /// calls. - static isc::util::thread::Mutex& getMutex(); + static std::mutex& getMutex(); private: /// \brief Initialize Processing diff --git a/src/lib/log/tests/Makefile.am b/src/lib/log/tests/Makefile.am index 83f78e31cb..3a3d1bfc99 100644 --- a/src/lib/log/tests/Makefile.am +++ b/src/lib/log/tests/Makefile.am @@ -23,7 +23,6 @@ logger_example_SOURCES = logger_example.cc logger_example_CPPFLAGS = $(AM_CPPFLAGS) logger_example_LDFLAGS = $(AM_LDFLAGS) logger_example_LDADD = $(top_builddir)/src/lib/log/libkea-log.la -logger_example_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la logger_example_LDADD += $(top_builddir)/src/lib/util/libkea-util.la logger_example_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la logger_example_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS) @@ -33,7 +32,6 @@ init_logger_test_SOURCES = init_logger_test.cc init_logger_test_CPPFLAGS = $(AM_CPPFLAGS) init_logger_test_LDFLAGS = $(AM_LDFLAGS) init_logger_test_LDADD = $(top_builddir)/src/lib/log/libkea-log.la -init_logger_test_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la init_logger_test_LDADD += $(top_builddir)/src/lib/util/libkea-util.la init_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la init_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS) @@ -43,7 +41,6 @@ buffer_logger_test_SOURCES = buffer_logger_test.cc buffer_logger_test_CPPFLAGS = $(AM_CPPFLAGS) buffer_logger_test_LDFLAGS = $(AM_LDFLAGS) buffer_logger_test_LDADD = $(top_builddir)/src/lib/log/libkea-log.la -buffer_logger_test_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la buffer_logger_test_LDADD += $(top_builddir)/src/lib/util/libkea-util.la buffer_logger_test_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la buffer_logger_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS) @@ -54,7 +51,6 @@ logger_lock_test_SOURCES += log_test_messages.cc log_test_messages.h logger_lock_test_CPPFLAGS = $(AM_CPPFLAGS) logger_lock_test_LDFLAGS = $(AM_LDFLAGS) logger_lock_test_LDADD = $(top_builddir)/src/lib/log/libkea-log.la -logger_lock_test_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la logger_lock_test_LDADD += $(top_builddir)/src/lib/util/libkea-util.la logger_lock_test_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la logger_lock_test_LDADD += $(AM_LDADD) $(LOG4CPLUS_LIBS) @@ -72,7 +68,6 @@ TESTSLDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) TESTSLDADD = $(AM_LDADD) TESTSLDADD += $(top_builddir)/src/lib/log/libkea-log.la -TESTSLDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la TESTSLDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la TESTSLDADD += $(top_builddir)/src/lib/util/libkea-util.la TESTSLDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/log/tests/logger_lock_test.cc b/src/lib/log/tests/logger_lock_test.cc index cb044c8d0b..9908800eca 100644 --- a/src/lib/log/tests/logger_lock_test.cc +++ b/src/lib/log/tests/logger_lock_test.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2012-2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2012-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -13,12 +13,43 @@ #include #include -#include +#include #include +#include + using namespace std; using namespace isc::log; -using isc::util::thread::Mutex; + +/// \brief RAII safe mutex checker. +class CheckMutex : boost::noncopyable { +public: + /// \brief Exception thrown when the mutex is already locked. + struct AlreadyLocked : public isc::InvalidParameter { + AlreadyLocked(const char* file, size_t line, const char* what) : + isc::InvalidParameter(file, line, what) + {} + }; + + /// \brief Constructor. + /// + /// \throw AlreadyLocked if the mutex is already locked. + CheckMutex(mutex& mutex) : mutex_(mutex) { + if (!mutex.try_lock()) { + isc_throw(AlreadyLocked, "The mutex is already locked"); + } + } + + /// \brief Destructor. + /// + /// Unlocks the mutex. + ~CheckMutex() { + mutex_.unlock(); + } + +private: + mutex& mutex_; +}; class MockLoggingSync : public isc::log::interprocess::InterprocessSync { public: @@ -32,9 +63,8 @@ protected: // We first check if the logger acquired a lock on the // LoggerManager mutex. try { - // This lock attempt is non-blocking. - Mutex::Locker locker(LoggerManager::getMutex(), false); - } catch (Mutex::Locker::AlreadyLocked&) { + CheckMutex check(LoggerManager::getMutex()); + } catch (const CheckMutex::AlreadyLocked&) { cout << "FIELD1 FIELD2 LOGGER_LOCK_TEST: MUTEXLOCK\n"; } diff --git a/src/lib/mysql/Makefile.am b/src/lib/mysql/Makefile.am index 6ff0a90d75..3794f03f0d 100644 --- a/src/lib/mysql/Makefile.am +++ b/src/lib/mysql/Makefile.am @@ -16,7 +16,6 @@ libkea_mysql_la_LIBADD = $(top_builddir)/src/lib/database/libkea-database.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_mysql_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_mysql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) diff --git a/src/lib/mysql/tests/Makefile.am b/src/lib/mysql/tests/Makefile.am index f2d6ed2142..f11254e3c7 100644 --- a/src/lib/mysql/tests/Makefile.am +++ b/src/lib/mysql/tests/Makefile.am @@ -31,7 +31,6 @@ libmysql_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la libmysql_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libmysql_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libmysql_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libmysql_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libmysql_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libmysql_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libmysql_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD) diff --git a/src/lib/pgsql/Makefile.am b/src/lib/pgsql/Makefile.am index 7bb6219479..2a4881d483 100644 --- a/src/lib/pgsql/Makefile.am +++ b/src/lib/pgsql/Makefile.am @@ -16,7 +16,6 @@ libkea_pgsql_la_LIBADD = $(top_builddir)/src/lib/database/libkea-database.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_pgsql_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_pgsql_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) diff --git a/src/lib/pgsql/tests/Makefile.am b/src/lib/pgsql/tests/Makefile.am index 60cc915276..b8aa9bb80c 100644 --- a/src/lib/pgsql/tests/Makefile.am +++ b/src/lib/pgsql/tests/Makefile.am @@ -29,7 +29,6 @@ libpgsql_unittests_LDADD += $(top_builddir)/src/lib/database/libkea-database.la libpgsql_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libpgsql_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libpgsql_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libpgsql_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libpgsql_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libpgsql_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libpgsql_unittests_LDADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(GTEST_LDADD) diff --git a/src/lib/stats/tests/Makefile.am b/src/lib/stats/tests/Makefile.am index ba89d01436..8d32baaa06 100644 --- a/src/lib/stats/tests/Makefile.am +++ b/src/lib/stats/tests/Makefile.am @@ -25,7 +25,6 @@ libstats_unittests_CXXFLAGS = $(AM_CXXFLAGS) libstats_unittests_LDADD = $(top_builddir)/src/lib/stats/libkea-stats.la libstats_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libstats_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -libstats_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libstats_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la libstats_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libstats_unittests_LDADD += $(LOG4CPLUS_LIBS) $(GTEST_LDADD) $(BOOST_LIBS) diff --git a/src/lib/util/Makefile.am b/src/lib/util/Makefile.am index 8612f56c0b..29ce03ee11 100644 --- a/src/lib/util/Makefile.am +++ b/src/lib/util/Makefile.am @@ -30,6 +30,7 @@ libkea_util_la_SOURCES += strutil.h strutil.cc libkea_util_la_SOURCES += time_utilities.h time_utilities.cc libkea_util_la_SOURCES += versioned_csv_file.h versioned_csv_file.cc libkea_util_la_SOURCES += watch_socket.cc watch_socket.h +libkea_util_la_SOURCES += watched_thread.cc watched_thread.h libkea_util_la_SOURCES += encode/base16_from_binary.h libkea_util_la_SOURCES += encode/base32hex.h encode/base64.h libkea_util_la_SOURCES += encode/base32hex_from_binary.h @@ -71,7 +72,8 @@ libkea_util_include_HEADERS = \ strutil.h \ time_utilities.h \ versioned_csv_file.h \ - watch_socket.h + watch_socket.h \ + watched_thread.h libkea_util_encode_includedir = $(pkgincludedir)/util/encode libkea_util_encode_include_HEADERS = \ @@ -98,5 +100,4 @@ libkea_util_random_include_HEADERS = \ libkea_util_threads_includedir = $(pkgincludedir)/util/threads libkea_util_threads_include_HEADERS = \ threads/sync.h \ - threads/thread.h \ - threads/watched_thread.h + threads/thread.h diff --git a/src/lib/util/tests/Makefile.am b/src/lib/util/tests/Makefile.am index 2361540dda..b8b4eeedcb 100644 --- a/src/lib/util/tests/Makefile.am +++ b/src/lib/util/tests/Makefile.am @@ -58,6 +58,7 @@ run_unittests_SOURCES += signal_set_unittest.cc run_unittests_SOURCES += stopwatch_unittest.cc run_unittests_SOURCES += versioned_csv_file_unittest.cc run_unittests_SOURCES += watch_socket_unittests.cc +run_unittests_SOURCES += watched_thread_unittest.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) diff --git a/src/lib/util/threads/tests/watched_thread_unittest.cc b/src/lib/util/tests/watched_thread_unittest.cc similarity index 97% rename from src/lib/util/threads/tests/watched_thread_unittest.cc rename to src/lib/util/tests/watched_thread_unittest.cc index 593e50951c..f95c6e9610 100644 --- a/src/lib/util/threads/tests/watched_thread_unittest.cc +++ b/src/lib/util/tests/watched_thread_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -6,7 +6,7 @@ #include -#include +#include #include #include @@ -16,11 +16,10 @@ using namespace std; using namespace isc; using namespace isc::util; -using namespace isc::util::thread; namespace { -/// @brief Test Fixture for testing isc:util::thread::WatchedThread +/// @brief Test Fixture for testing isc:util::WatchedThread class WatchedThreadTest : public ::testing::Test { public: /// @brief Maximum number of passes allowed in worker event loop diff --git a/src/lib/util/threads/Makefile.am b/src/lib/util/threads/Makefile.am index 14b5e76e59..deb3693e92 100644 --- a/src/lib/util/threads/Makefile.am +++ b/src/lib/util/threads/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS += $(BOOST_INCLUDES) lib_LTLIBRARIES = libkea-threads.la libkea_threads_la_SOURCES = sync.h sync.cc libkea_threads_la_SOURCES += thread.h thread.cc -libkea_threads_la_SOURCES += watched_thread.h watched_thread.cc libkea_threads_la_LIBADD = $(top_builddir)/src/lib/util/libkea-util.la libkea_threads_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la diff --git a/src/lib/util/threads/tests/Makefile.am b/src/lib/util/threads/tests/Makefile.am index 2975ab6764..81c5e5ef08 100644 --- a/src/lib/util/threads/tests/Makefile.am +++ b/src/lib/util/threads/tests/Makefile.am @@ -24,7 +24,6 @@ run_unittests_SOURCES = run_unittests.cc run_unittests_SOURCES += thread_unittest.cc run_unittests_SOURCES += lock_unittest.cc run_unittests_SOURCES += condvar_unittest.cc -run_unittests_SOURCES += watched_thread_unittest.cc run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) diff --git a/src/lib/util/threads/watched_thread.cc b/src/lib/util/watched_thread.cc similarity index 86% rename from src/lib/util/threads/watched_thread.cc rename to src/lib/util/watched_thread.cc index 9f6b891a41..ab9c30bb6e 100644 --- a/src/lib/util/threads/watched_thread.cc +++ b/src/lib/util/watched_thread.cc @@ -1,15 +1,14 @@ -// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. #include -#include +#include namespace isc { namespace util { -namespace thread { void WatchedThread::start(const boost::function& thread_main) { @@ -17,7 +16,7 @@ WatchedThread::start(const boost::function& thread_main) { clearReady(READY); clearReady(TERMINATE); last_error_ = "no error"; - thread_.reset(new Thread(thread_main)); + thread_.reset(new std::thread(thread_main)); } int @@ -54,7 +53,7 @@ void WatchedThread::stop() { if (thread_) { markReady(TERMINATE); - thread_->wait(); + thread_->join(); thread_.reset(); } @@ -73,6 +72,5 @@ std::string WatchedThread::getLastError() { return (last_error_); } -} // end of namespace isc::util::thread } // end of namespace isc::util } // end of namespace isc diff --git a/src/lib/util/threads/watched_thread.h b/src/lib/util/watched_thread.h similarity index 94% rename from src/lib/util/threads/watched_thread.h rename to src/lib/util/watched_thread.h index 6a6855b387..b05294dc28 100644 --- a/src/lib/util/threads/watched_thread.h +++ b/src/lib/util/watched_thread.h @@ -1,4 +1,4 @@ -// Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2018-2019 Internet Systems Consortium, Inc. ("ISC") // // This Source Code Form is subject to the terms of the Mozilla Public // License, v. 2.0. If a copy of the MPL was not distributed with this @@ -8,13 +8,17 @@ #define WATCHED_THREAD_H #include -#include #include +#include + +#include namespace isc { namespace util { -namespace thread { + +/// @brief Thread pointer type. +typedef boost::shared_ptr ThreadPtr; /// @brief Provides a thread and controls for monitoring its activities /// @@ -116,13 +120,12 @@ public: WatchSocket sockets_[TERMINATE + 1]; /// @brief Current thread instance - thread::ThreadPtr thread_ ; + ThreadPtr thread_ ; }; /// @brief Defines a pointer to a WatchedThread typedef boost::shared_ptr WatchedThreadPtr; -}; // namespace isc::util::thread }; // namespace isc::util }; // namespace isc diff --git a/src/lib/yang/Makefile.am b/src/lib/yang/Makefile.am index 6ab0ddc390..f4ecbdcb53 100644 --- a/src/lib/yang/Makefile.am +++ b/src/lib/yang/Makefile.am @@ -34,7 +34,6 @@ libkea_yang_la_SOURCES += yang_models.h yang_revisions.h libkea_yang_la_LIBADD = $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libkea_yang_la_LIBADD += $(top_builddir)/src/lib/cc/libkea-cc.la libkea_yang_la_LIBADD += $(top_builddir)/src/lib/log/libkea-log.la -libkea_yang_la_LIBADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la libkea_yang_la_LIBADD += $(top_builddir)/src/lib/util/libkea-util.la libkea_yang_la_LIBADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la libkea_yang_la_LIBADD += $(LOG4CPLUS_LIBS) $(BOOST_LIBS) $(SYSREPO_LIBS) diff --git a/src/lib/yang/tests/Makefile.am b/src/lib/yang/tests/Makefile.am index 60cf09a6a1..00107d0899 100644 --- a/src/lib/yang/tests/Makefile.am +++ b/src/lib/yang/tests/Makefile.am @@ -47,7 +47,6 @@ run_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la run_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la run_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la run_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la -run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libkea-threads.la run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la run_unittests_LDADD += $(top_builddir)/src/lib/util/libkea-util.la run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/libkea-exceptions.la