From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 17 Oct 2012 16:05:37 +0000 (-0700)
Subject: [2332] renamed thread/lock.h to thread/sync.h as it's not only for locks now
X-Git-Tag: trac2402_base~19^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=650655fd267d652ec1b0d5e57a261ab767ada447;p=thirdparty%2Fkea.git

[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 e73eb528db..315a7527de 100644
--- 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 37976a3358..44aeb8da8e 100644
--- 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 d26cf091de..efd60f2645 100644
--- 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 99080662ff..27ac04aea2 100644
--- 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 e248e81483..396b247491 100644
--- 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 8aa2322151..a245c3b53b 100644
--- 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 877f92166f..2dc70d132f 100644
--- 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 7b9fb8f859..121e4ab37f 100644
--- 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 5f66c10d73..c98a7a6b06 100644
--- 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 cb3805ecb1..ff56999f99 100644
--- 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 57cc5d6d5a..e3a534b55b 100644
--- 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 7e6fb53df7..4ddb6b2422 100644
--- 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 c1c9cdf028..5608e4962e 100644
--- 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>