[2332] renamed thread/lock.h to thread/sync.h as it's not only for locks now

diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index e73eb528dbfdc44fe36c00f656c0d795e637d0c6..315a7527de051ff9d2f0aea5f36fdb428f851864 100644 (file)
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -26,7 +26,7 @@
 #include <exceptions/exceptions.h>
 
 #include <util/buffer.h>
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 
 #include <dns/edns.h>
 #include <dns/exceptions.h>

diff --git a/src/bin/auth/benchmarks/query_bench.cc b/src/bin/auth/benchmarks/query_bench.cc
index 37976a3358ef56b46e71126cd14730bf165d8704..44aeb8da8e0c30713bc877159b746c68f1a65c03 100644 (file)
--- a/src/bin/auth/benchmarks/query_bench.cc
+++ b/src/bin/auth/benchmarks/query_bench.cc
@@ -18,7 +18,7 @@
 #include <bench/benchmark_util.h>
 
 #include <util/buffer.h>
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 
 #include <dns/message.h>
 #include <dns/name.h>

diff --git a/src/bin/auth/command.cc b/src/bin/auth/command.cc
index d26cf091de4627bf3c5d508606a6f2c173cc84b3..efd60f2645c496f6032dc1e512a2ce35735029f5 100644 (file)
--- a/src/bin/auth/command.cc
+++ b/src/bin/auth/command.cc
@@ -21,7 +21,7 @@
 #include <config/ccsession.h>
 #include <exceptions/exceptions.h>
 #include <dns/rrclass.h>
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 
 #include <string>
 

diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index 99080662ff86ef3ee8dd3766ec20a71cac5d750c..27ac04aea2d289cd66ccb4dfe24cdb7b3c2fc7f8 100644 (file)
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -18,7 +18,7 @@
 
 #include <util/buffer.h>
 #include <util/io/socketsession.h>
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 
 #include <dns/message.h>
 #include <dns/messagerenderer.h>

diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index e248e81483e8cf3cd181fdb1c2a21c1f543e4760..396b247491bb8bc139a54bb455d73678a7d2710e 100644 (file)
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -39,7 +39,7 @@
 #include <auth/datasrc_config.h>
 
 #include <util/unittests/mock_socketsession.h>
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 #include <dns/tests/unittest_util.h>
 #include <testutils/dnsmessage_test.h>
 #include <testutils/srv_test.h>

diff --git a/src/bin/auth/tests/command_unittest.cc b/src/bin/auth/tests/command_unittest.cc
index 8aa2322151a145b59d172f01c45644f7caa2808e..a245c3b53bba7193e0d4485b560994c390e4d0ec 100644 (file)
--- a/src/bin/auth/tests/command_unittest.cc
+++ b/src/bin/auth/tests/command_unittest.cc
@@ -16,7 +16,7 @@
 
 #include "datasrc_util.h"
 
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 
 #include <auth/auth_srv.h>
 #include <auth/auth_config.h>

diff --git a/src/bin/auth/tests/datasrc_config_unittest.cc b/src/bin/auth/tests/datasrc_config_unittest.cc
index 877f92166f67adc385d369d342e665ac26cfbb8e..2dc70d132f4ff4c051893f1705cfc41957c55cd7 100644 (file)
--- a/src/bin/auth/tests/datasrc_config_unittest.cc
+++ b/src/bin/auth/tests/datasrc_config_unittest.cc
@@ -16,7 +16,7 @@
 
 #include <config/tests/fake_session.h>
 #include <config/ccsession.h>
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 
 #include <gtest/gtest.h>
 

diff --git a/src/lib/util/threads/Makefile.am b/src/lib/util/threads/Makefile.am
index 7b9fb8f859a6284d0d703a686eccccb93eeb2540..121e4ab37fea13a674a1a4bf2b11579b85f5d549 100644 (file)
--- a/src/lib/util/threads/Makefile.am
+++ b/src/lib/util/threads/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(MULTITHREADING_FLAG)
 
 lib_LTLIBRARIES = libb10-threads.la
-libb10_threads_la_SOURCES  = lock.h lock.cc
+libb10_threads_la_SOURCES  = sync.h sync.cc
 libb10_threads_la_SOURCES += thread.h thread.cc
 libb10_threads_la_LIBADD = $(top_builddir)/src/lib/exceptions/libb10-exceptions.la
 

diff --git a/src/lib/util/threads/lock.cc b/src/lib/util/threads/sync.cc
similarity index 99%
rename from src/lib/util/threads/lock.cc
rename to src/lib/util/threads/sync.cc
index 5f66c10d734acbf90a3017b5d749c056c0ca1da2..c98a7a6b060d225eecdf68f24d033c3d12c71fd2 100644 (file)
--- a/src/lib/util/threads/lock.cc
+++ b/src/lib/util/threads/sync.cc
@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include "lock.h"
+#include "sync.h"
 
 #include <exceptions/exceptions.h>
 

diff --git a/src/lib/util/threads/lock.h b/src/lib/util/threads/sync.h
similarity index 99%
rename from src/lib/util/threads/lock.h
rename to src/lib/util/threads/sync.h
index cb3805ecb137342a30cb8abae1f9bcc2bdb4a175..ff56999f99e78fdc6425044323dc51dd5b31c425 100644 (file)
--- a/src/lib/util/threads/lock.h
+++ b/src/lib/util/threads/sync.h
@@ -12,8 +12,8 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#ifndef B10_THREAD_LOCK_H
-#define B10_THREAD_LOCK_H
+#ifndef B10_THREAD_SYNC_H
+#define B10_THREAD_SYNC_H
 
 #include <boost/noncopyable.hpp>
 

diff --git a/src/lib/util/threads/tests/condvar_unittest.cc b/src/lib/util/threads/tests/condvar_unittest.cc
index 57cc5d6d5a32ca5816e5c1bdfbd24e68ed8c440f..e3a534b55b7c9ed5c18a09ae89b7c7cc4ec1d5c5 100644 (file)
--- a/src/lib/util/threads/tests/condvar_unittest.cc
+++ b/src/lib/util/threads/tests/condvar_unittest.cc
@@ -14,7 +14,7 @@
 
 #include <exceptions/exceptions.h>
 
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 #include <util/threads/thread.h>
 
 #include <gtest/gtest.h>

diff --git a/src/lib/util/threads/tests/lock_unittest.cc b/src/lib/util/threads/tests/lock_unittest.cc
index 7e6fb53df73c7ef6888310e94d59717fc807ecd6..4ddb6b2422d600d0ff5a4a05c3226ead321c1eb2 100644 (file)
--- a/src/lib/util/threads/tests/lock_unittest.cc
+++ b/src/lib/util/threads/tests/lock_unittest.cc
@@ -12,7 +12,7 @@
 // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-#include <util/threads/lock.h>
+#include <util/threads/sync.h>
 #include <util/threads/thread.h>
 
 #include <gtest/gtest.h>

diff --git a/src/lib/util/threads/thread.cc b/src/lib/util/threads/thread.cc
index c1c9cdf028615e8e2b9cff1bedad81dca1486502..5608e4962e7a38e9c6e768b82224746204124e44 100644 (file)
--- a/src/lib/util/threads/thread.cc
+++ b/src/lib/util/threads/thread.cc
@@ -13,7 +13,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include "thread.h"
-#include "lock.h"
+#include "sync.h"
 
 #include <memory>
 #include <string>