Browse Source

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

JINMEI Tatuya 12 years ago
parent
commit
650655fd26

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>
 

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>
 

+ 1 - 1
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
 

+ 1 - 1
src/lib/util/threads/lock.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>
 

+ 2 - 2
src/lib/util/threads/lock.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>
 

+ 1 - 1
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>

+ 1 - 1
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>

+ 1 - 1
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>