[914-move-to-c-11-thread-library-in-core-library-code] Upgraded thread/mutex code...

diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index bdb86cd89e75db5c07b3e971e8edfabf69a0d5ca..8ddeabe3bd9d535e5d0829fe2bdc3fd680a84f4b 100644 (file)
--- 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 03b906f6eb0f6eb06c5a1f5bfaf04fa1908831ec..e1c27c0f8cca9e7a3da56d5b19d6d3a9107d36d3 100644 (file)
--- 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 168f50c7b8ef65a5f8837fcef632a82ee00a9525..0a3ecf204b97dd0c05abdbfbfe8df84f714ccb62 100644 (file)
--- 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 28f61944110aa4d356f906fea72d23c1cc5ee0b3..b50dc9124a452803c69eadc2b542b59b433ead13 100644 (file)
--- 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 f7968d3c74ad349afb5aedbb377ffe8b90feea50..3969c73099cadb0b8f690425942d4133d68b761f 100644 (file)
--- 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 88e184dc36c480b2a394654cb10b0c0fdd8f0648..4574bbbb5ce122bbbe6f773c8c3f6ddc5819e2a0 100644 (file)
--- 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 7b017efb73bcbcf81b0da0bba725f92ac6e02b43..7ef1952cd9cf2a4632d624b8c84f1045c26bfb09 100644 (file)
--- 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 dd90f66faf9a35ebcdf43be8a6f3ee1f3ea7ae01..7b44626585e7940ba73385ed5fab6b3b84b0fcb8 100644 (file)
--- 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 0a11ec4b9b449d0be249e9a4adbe009bf011a0c1..02f8ed8e0417589c4b0502fc647fe6dcd3bc0ed3 100644 (file)
--- 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 baf203f934ced7506f2cbab2b1b6f25237889a59..c9954ad53b7927ba21327a6b0c2250eb911ba4cf 100644 (file)
--- 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 ded680e4a20c25047a70d5ff991e7172d9f820cb..808728e40663672ec43558d5553a1de9fb3155f5 100644 (file)
--- 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 1795ee953ee625684a17a7a721e24e58b4a81e6b..bb0fa3d37264ade36ec7c78e0f87b0f0cebedb00 100644 (file)
--- 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 6b79a64d29ec58b0b6f3dc7e054e02312c03e265..f203ff37f0baadd39bea77bc146723ffb948691a 100644 (file)
--- 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 dd3616992095fd6f661b055ff45848f0b1079b4d..d1cfb6e7cc01bc6c42cbf358f30efaee426e24b3 100644 (file)
--- 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 b054e936b374317de20ad1559a66efeede92ab52..b95a6d63c52eebd31f0d9da57219c82ab213b16a 100644 (file)
--- 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 fa87d653ad1a18f95c0002d90e1ef6dde4f3e7bc..aa9d1c3a1aff0ef5c7e1a16a470a7d015fd3048b 100644 (file)
--- 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 4f6ae80af24c8ede74589da70b8bbe8b1677fbf7..a88fb628ec0e30646ca889c10b2773a7d26efb58 100644 (file)
--- 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 f2c7073bea12841bf91471f8991e76575cf28dd8..36ad55c7d8a3f9dc0278aba6dc1eb6099fdeaf72 100644 (file)
--- 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 be1f7d81dc3c7f201010bc0a1dcbc24c6a9bb842..9da1c7233673966ddfe517c72e47712f3b39c6ca 100644 (file)
--- 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 5befee90f0054854d2e891cf75023c252e051097..117fcc61c9fe8eb89c45e984eb168bc80efa71e6 100644 (file)
--- 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 51c6e984223843ed5fc04dea0416391abc07b932..d19c0ed094c74a89fe8cf84201fb09db1097da91 100644 (file)
--- 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 68b3aa7298137b22c8a9b7dade125a4935557eca..ed0a217312c689b4805909306c96b915b2843725 100644 (file)
--- 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<std::mutex> lock(mutex_);
         running_ = true;
     }
-    condvar_.signal();
+    condvar_.notify_one();
 }
 
 void
 TestServerUnixSocket::waitForRunning() {
-    isc::util::thread::Mutex::Locker lock(mutex_);
+    std::lock_guard<std::mutex> locker(mutex_);
+    std::unique_lock<std::mutex> 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 3deb59fd9646ed65daff0b17256f280451a3ce72..d5aec7575aabc7c2146f51cd3e7e51fccfad2d76 100644 (file)
--- 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 <config.h>
 #include <asiolink/interval_timer.h>
 #include <asiolink/io_service.h>
-#include <util/threads/thread.h>
-#include <util/threads/sync.h>
 #include <boost/shared_ptr.hpp>
 #include <gtest/gtest.h>
 #include <list>
 #include <stdint.h>
 #include <string>
+#include <mutex>
+#include <condition_variable>
 
 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 b02a87b4011d83cf10ef269169bdc247a68d1dd1..8c7f7788e4a2116fe41956e1c86630be11db61cf 100644 (file)
--- 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 22bec16a0f14c90410df83deadd6a0be23438b85..0fff792e724c4f758a3295d8e006a11e719adcf2 100644 (file)
--- 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 69e28545789d73f2e6a4a8af5a700695793eecc9..47a918f556fb46018d0058937f72924c6c3fc8e1 100644 (file)
--- 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 0ab44250c33b1e09aeb93cd7e953686c8b9cbaf4..9e254b5959748df5e61be0911176bd034be585b7 100644 (file)
--- 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 24934959bb432c394822528a9b2469492423a1c9..77de76b6eb6bfb117c87fe4d88fe105343216e11 100644 (file)
--- 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 c764564787b5ff9e9d056609c58b20f3dc6240b7..85249f53af65b126d97db547eb1a9caa2791e37d 100644 (file)
--- 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 f8548924efdf8c8cc6fc8463abc698f580ec114d..5a3433681c5f1c9402dcf026507f1d45245fe3d4 100644 (file)
--- 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 fcd92c2ccb3d40a036d31ce2dd0ca21db4937967..ed9d813e0f596ef32cc59d0a1769551d888898da 100644 (file)
--- 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 c7d4bdd2278de08b4b03abd34ae2a0ddecd5ad3b..8420ead396e367b6a9ec7c17fe65e1e1c788fe50 100644 (file)
--- 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 450ff6d3956a022cbb725cee0832b2575d782e30..ef17f927454746be5354594d39d031574c162e25 100644 (file)
--- a/src/lib/dhcp/iface_mgr.h
+++ b/src/lib/dhcp/iface_mgr.h
@@ -18,7 +18,7 @@
 #include <dhcp/pkt_filter6.h>
 #include <util/optional.h>
 #include <util/watch_socket.h>
-#include <util/threads/watched_thread.h>
+#include <util/watched_thread.h>
 
 #include <boost/function.hpp>
 #include <boost/noncopyable.hpp>
@@ -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 07bb7ffb4cbea2d0ea0e471e7772895049e4549c..aea1c95e2abbdc5b3247bd8c8cbcbfd9b6e98f87 100644 (file)
--- 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 <dhcp/socket_info.h>
 #include <dhcp/pkt4.h>
 #include <dhcp/pkt6.h>
-#include <util/threads/sync.h>
 
 #include <boost/function.hpp>
 #include <boost/circular_buffer.hpp>

diff --git a/src/lib/dhcp/packet_queue_ring.h b/src/lib/dhcp/packet_queue_ring.h
index 315e2a0375721466b9f95d9b81ea040fb28161fb..24b8890a269b085d4dc3e93584a7553627f764db 100644 (file)
--- 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 <dhcp/packet_queue.h>
-#include <util/threads/sync.h>
 
 #include <boost/function.hpp>
 #include <boost/circular_buffer.hpp>
 #include <sstream>
+#include <mutex>
 
 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<std::mutex> 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<std::mutex> lock(mutex_);
         if (from == QueueEnd::FRONT) {
             packet = queue_.front();
             queue_.pop_front();
@@ -210,7 +210,7 @@ private:
     boost::circular_buffer<PacketTypePtr> 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 bc162d84ad4593cdf243c20d8ff69a6ef90d2e22..33d74f2529c4e75e6d08c89742e8325c80081373 100644 (file)
--- 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 44d09010f3e6f03b180a2bb0dc5280d50c365c75..88522aa8a89d0454c8c02404a3f327ce0dbda73b 100644 (file)
--- 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 a75b3a44ab1191594793d3dda2f3cbcfe565419a..8e13c9faec6a4c131b4eb156d97e4a5d4850da40 100644 (file)
--- 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 b8b8ad0b1e1183f097541953ea284147dc3d835b..c0d4c0a717d6fed02339038a3a2174ff09637ab6 100644 (file)
--- 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 2cd3a63b84ed844724c6cd7dded9f3bbf59d321e..3716a72f0626751bb21bc4690656145c1ed2534b 100644 (file)
--- 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 ed2b92a67ce33bb687e2046b97d287a1e4f0e4d0..d9cac94776fa096b9da89fee85c20e181f6ae346 100644 (file)
--- 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 8de3d25a49b2246d8719a2bba32d06dbd9d1a7fc..dff86776e6112855ba8c729574f86c955d83f3ae 100644 (file)
--- 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 e29351271d192762927f5a082f7e94c033432c54..f9d5a9e5a5a434eccc0e943713c6293cb6cc8aef 100644 (file)
--- 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 2f0a23b55b60ed14666f466068c93b8c6e997763..e0930e80a15945ec6ec977bc1f78dac40f2590e1 100644 (file)
--- 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 74951c108c5958e515fd1239598a2d1929254366..a84aef361e55b9eb2cf4a6f37e02d39c7dee1917 100644 (file)
--- 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 f01375d050e722148245123fe484ba57614a9797..5dd2c363e9dd9a24ac54d89e9d7a21a04ef75fd4 100644 (file)
--- 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 6aa79c6e45c5efbca3a41237d131886d6e61419e..fc9c8b427d4d49b5d2b911ad74be62ec854c317a 100644 (file)
--- 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 95331a57217acb97633f15632a2470f4cdc8d9cc..60eb9425a9f4c27dfcfff53e63ef33f21f0ff63f 100644 (file)
--- 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 acf2a245f9073379e07dd06e35021c385fcac7e8..ff414b85ea3fedddf4e253f7ca3b60b61ca5b13e 100644 (file)
--- 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 c4c594eea5a008ca5184a7033f516bc57c9c0538..8f9e1eaa165ae636de33f15513eb44e8764087cf 100644 (file)
--- 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<std::mutex> 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 10c10ffc2ff790dddc668062cc34f9704d3fbb0f..dc7a506d9a5412143d125fa0d61351935029db7b 100644 (file)
--- 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 7a5d32344c5032385ac46aae5b3fc718390d957d..1ddea6dd015f9e8847fae82094967a11fff97aa6 100644 (file)
--- 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 <exceptions/exceptions.h>
-#include <util/threads/sync.h>
 #include <log/logger_specification.h>
 
 #include <boost/noncopyable.hpp>
 
+#include <mutex>
+
 // 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 83f78e31cb90d17b4c6ba18585866c5592cd4416..3a3d1bfc99ede9c0e4835fa18944eb2a2bb03dde 100644 (file)
--- 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 cb044c8d0ba9dc2049633a111d328602376dfbfd..9908800eca166f5965b9260a551f9ec89bb532b7 100644 (file)
--- 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 <log/interprocess/interprocess_sync.h>
 #include <log/tests/log_test_messages.h>
 
-#include <util/threads/sync.h>
+#include <mutex>
 #include <iostream>
 
+#include <boost/noncopyable.hpp>
+
 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 6ff0a90d752e60aff3a8d63256b5c5c61efcff5c..3794f03f0de641bd0356e600e50b8eedfd91c120 100644 (file)
--- 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 f2d6ed2142a5ffed2e727ef4908f90feba03556e..f11254e3c7a3aad189c7a1d230bbb706b9b4b4ae 100644 (file)
--- 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 7bb62194798d6f66b301a81bb32430abec951cd7..2a4881d48385652fd6f9ec51cdc3e5f953daf9b8 100644 (file)
--- 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 60cc915276d12417a0758b7a5abf23c18cb0f395..b8aa9bb80cd9e37e7709635cc7ddaadbb651cbf8 100644 (file)
--- 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 ba89d01436c5b306001976196c5d28069c524eb1..8d32baaa06fc5515f0a6527ed180dc849e3a2151 100644 (file)
--- 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 8612f56c0be143abc2fdf27d39aa4388ea518ba0..29ce03ee110395ce5de3f3b993442e80c74da284 100644 (file)
--- 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 2361540dda4fb86dda9bb0fbef9c00a0055121f0..b8b4eeedcb5a10774b906f250f3e2ebde91c4108 100644 (file)
--- 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 593e50951cb9cf070afe1c9e99cddfc4ddae824d..f95c6e96107dc8f1cdecdfbb4bbaa56f0d4e1e79 100644 (file)
--- 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 <config.h>
 
-#include <util/threads/watched_thread.h>
+#include <util/watched_thread.h>
 
 #include <boost/bind.hpp>
 #include <gtest/gtest.h>
@@ -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 14b5e76e595b786102473068bee978e5480265bc..deb3693e929d3f8361e07b5fd830110d63cf7d23 100644 (file)
--- 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 2975ab676454d01376878d64633570517aeb3919..81c5e5ef08def908cf02bf37e7225b286612e8d1 100644 (file)
--- 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 9f6b891a414400f6795e2664db937613da22dc4d..ab9c30bb6e80917084eaf9f7ed9c165af1cd9cb2 100644 (file)
--- 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 <config.h>
-#include <util/threads/watched_thread.h>
+#include <util/watched_thread.h>
 
 namespace isc {
 namespace util {
-namespace thread {
 
 void
 WatchedThread::start(const boost::function<void()>& thread_main) {
@@ -17,7 +16,7 @@ WatchedThread::start(const boost::function<void()>& 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 6a6855b3870ebb021489e370185239bc138179e1..b05294dc28f91cc4537b5fd6ed2d57e52fba3ebc 100644 (file)
--- 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 <util/watch_socket.h>
-#include <util/threads/thread.h>
 
 #include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+
+#include <thread>
 
 namespace isc {
 namespace util {
-namespace thread {
+
+/// @brief Thread pointer type.
+typedef boost::shared_ptr<std::thread> 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<WatchedThread> 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 6ab0ddc390846a3164e953920e54b079cb66d241..f4ecbdcb53957f6d1f03f29687d5fa1daec6de2a 100644 (file)
--- 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 60cf09a6a13c1598bec66b57e2a8e59a368bf069..00107d0899f31f6be6ccc2ba374b73e83e7d912e 100644 (file)
--- 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