BIND 10 trac2899-2, updated. 3471a0a39ec45a25c96905ce634e142fd4a06902 [2899] renamed namespace for InterprocessSync "interprocess" for consistency.
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 9 22:33:02 UTC 2013
The branch, trac2899-2 has been updated
via 3471a0a39ec45a25c96905ce634e142fd4a06902 (commit)
from 2f81b4961e70a653a09dc24d8b07bd9eac1ecd04 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3471a0a39ec45a25c96905ce634e142fd4a06902
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Thu May 9 15:32:31 2013 -0700
[2899] renamed namespace for InterprocessSync "interprocess" for consistency.
-----------------------------------------------------------------------
Summary of changes:
src/lib/log/interprocess/interprocess_sync.h | 4 ++--
src/lib/log/interprocess/interprocess_sync_file.cc | 4 ++--
src/lib/log/interprocess/interprocess_sync_file.h | 4 ++--
src/lib/log/interprocess/interprocess_sync_null.cc | 4 ++--
src/lib/log/interprocess/interprocess_sync_null.h | 4 ++--
.../tests/interprocess_sync_file_unittest.cc | 2 +-
.../tests/interprocess_sync_null_unittest.cc | 2 +-
src/lib/log/logger.cc | 2 +-
src/lib/log/logger.h | 4 ++--
src/lib/log/logger_impl.cc | 7 ++++---
src/lib/log/logger_impl.h | 4 ++--
src/lib/log/logger_manager.cc | 2 +-
src/lib/log/tests/buffer_logger_test.cc | 2 +-
src/lib/log/tests/logger_example.cc | 2 +-
src/lib/log/tests/logger_lock_test.cc | 2 +-
src/lib/log/tests/logger_unittest.cc | 2 +-
16 files changed, 26 insertions(+), 25 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/log/interprocess/interprocess_sync.h b/src/lib/log/interprocess/interprocess_sync.h
index 6f31a01..10453cc 100644
--- a/src/lib/log/interprocess/interprocess_sync.h
+++ b/src/lib/log/interprocess/interprocess_sync.h
@@ -19,7 +19,7 @@
namespace isc {
namespace log {
-namespace internal {
+namespace interprocess {
class InterprocessSyncLocker; // forward declaration
@@ -144,7 +144,7 @@ protected:
InterprocessSync& sync_; ///< Ref to underlying sync object
};
-} // namespace internal
+} // namespace interprocess
} // namespace log
} // namespace isc
diff --git a/src/lib/log/interprocess/interprocess_sync_file.cc b/src/lib/log/interprocess/interprocess_sync_file.cc
index 64b1c42..7f8fcb4 100644
--- a/src/lib/log/interprocess/interprocess_sync_file.cc
+++ b/src/lib/log/interprocess/interprocess_sync_file.cc
@@ -27,7 +27,7 @@
namespace isc {
namespace log {
-namespace internal {
+namespace interprocess {
InterprocessSyncFile::~InterprocessSyncFile() {
if (fd_ != -1) {
@@ -129,6 +129,6 @@ InterprocessSyncFile::unlock() {
return (false);
}
-} // namespace internal
+} // namespace interprocess
} // namespace log
} // namespace isc
diff --git a/src/lib/log/interprocess/interprocess_sync_file.h b/src/lib/log/interprocess/interprocess_sync_file.h
index 1f9fdb1..cb07003 100644
--- a/src/lib/log/interprocess/interprocess_sync_file.h
+++ b/src/lib/log/interprocess/interprocess_sync_file.h
@@ -20,7 +20,7 @@
namespace isc {
namespace log {
-namespace internal {
+namespace interprocess {
/// \brief InterprocessSyncFileError
///
@@ -86,7 +86,7 @@ private:
int fd_; ///< The descriptor for the open file
};
-} // namespace internal
+} // namespace interprocess
} // namespace log
} // namespace isc
diff --git a/src/lib/log/interprocess/interprocess_sync_null.cc b/src/lib/log/interprocess/interprocess_sync_null.cc
index bb32ea9..226f722 100644
--- a/src/lib/log/interprocess/interprocess_sync_null.cc
+++ b/src/lib/log/interprocess/interprocess_sync_null.cc
@@ -16,7 +16,7 @@
namespace isc {
namespace log {
-namespace internal {
+namespace interprocess {
InterprocessSyncNull::~InterprocessSyncNull() {
}
@@ -39,6 +39,6 @@ InterprocessSyncNull::unlock() {
return (true);
}
-} // namespace internal
+} // namespace interprocess
} // namespace log
} // namespace isc
diff --git a/src/lib/log/interprocess/interprocess_sync_null.h b/src/lib/log/interprocess/interprocess_sync_null.h
index 5c74bbd..41dab50 100644
--- a/src/lib/log/interprocess/interprocess_sync_null.h
+++ b/src/lib/log/interprocess/interprocess_sync_null.h
@@ -19,7 +19,7 @@
namespace isc {
namespace log {
-namespace internal {
+namespace interprocess {
/// \brief Null Interprocess Sync Class
///
@@ -59,7 +59,7 @@ protected:
bool unlock();
};
-} // namespace internal
+} // namespace interprocess
} // namespace log
} // namespace isc
diff --git a/src/lib/log/interprocess/tests/interprocess_sync_file_unittest.cc b/src/lib/log/interprocess/tests/interprocess_sync_file_unittest.cc
index ea8f9ac..4df365e 100644
--- a/src/lib/log/interprocess/tests/interprocess_sync_file_unittest.cc
+++ b/src/lib/log/interprocess/tests/interprocess_sync_file_unittest.cc
@@ -20,7 +20,7 @@
#include <unistd.h>
using namespace std;
-using namespace isc::log::internal;
+using namespace isc::log::interprocess;
using isc::util::unittests::parentReadState;
namespace {
diff --git a/src/lib/log/interprocess/tests/interprocess_sync_null_unittest.cc b/src/lib/log/interprocess/tests/interprocess_sync_null_unittest.cc
index 2552a84..cc9795c 100644
--- a/src/lib/log/interprocess/tests/interprocess_sync_null_unittest.cc
+++ b/src/lib/log/interprocess/tests/interprocess_sync_null_unittest.cc
@@ -16,7 +16,7 @@
#include <gtest/gtest.h>
using namespace std;
-using namespace isc::log::internal;
+using namespace isc::log::interprocess;
namespace {
diff --git a/src/lib/log/logger.cc b/src/lib/log/logger.cc
index 1c65b38..a04267c 100644
--- a/src/lib/log/logger.cc
+++ b/src/lib/log/logger.cc
@@ -182,7 +182,7 @@ Logger::fatal(const isc::log::MessageID& ident) {
// Replace the interprocess synchronization object
void
-Logger::setInterprocessSync(isc::log::internal::InterprocessSync* sync) {
+Logger::setInterprocessSync(isc::log::interprocess::InterprocessSync* sync) {
getLoggerPtr()->setInterprocessSync(sync);
}
diff --git a/src/lib/log/logger.h b/src/lib/log/logger.h
index e4879cf..de2b304 100644
--- a/src/lib/log/logger.h
+++ b/src/lib/log/logger.h
@@ -27,7 +27,7 @@
namespace isc {
namespace log {
-namespace internal {
+namespace interprocess {
// Forward declaration to hide implementation details from normal
// applications.
class InterprocessSync;
@@ -266,7 +266,7 @@ public:
/// synchronizing output of log messages. It should be deletable and
/// the ownership is transferred to the logger. If NULL is passed,
/// a BadInterprocessSync exception is thrown.
- void setInterprocessSync(isc::log::internal::InterprocessSync* sync);
+ void setInterprocessSync(isc::log::interprocess::InterprocessSync* sync);
/// \brief Equality
///
diff --git a/src/lib/log/logger_impl.cc b/src/lib/log/logger_impl.cc
index 06a91b0..96f021d 100644
--- a/src/lib/log/logger_impl.cc
+++ b/src/lib/log/logger_impl.cc
@@ -53,7 +53,7 @@ namespace log {
LoggerImpl::LoggerImpl(const string& name) :
name_(expandLoggerName(name)),
logger_(log4cplus::Logger::getInstance(name_)),
- sync_(new internal::InterprocessSyncFile("logger"))
+ sync_(new interprocess::InterprocessSyncFile("logger"))
{
}
@@ -111,7 +111,8 @@ LoggerImpl::lookupMessage(const MessageID& ident) {
// Replace the interprocess synchronization object
void
-LoggerImpl::setInterprocessSync(isc::log::internal::InterprocessSync* sync) {
+LoggerImpl::setInterprocessSync(isc::log::interprocess::InterprocessSync* sync)
+{
if (sync == NULL) {
isc_throw(BadInterprocessSync,
"NULL was passed to setInterprocessSync()");
@@ -129,7 +130,7 @@ LoggerImpl::outputRaw(const Severity& severity, const string& message) {
// Use an interprocess sync locker for mutual exclusion from other
// processes to avoid log messages getting interspersed.
- internal::InterprocessSyncLocker locker(*sync_);
+ interprocess::InterprocessSyncLocker locker(*sync_);
if (!locker.lock()) {
LOG4CPLUS_ERROR(logger_, "Unable to lock logger lockfile");
diff --git a/src/lib/log/logger_impl.h b/src/lib/log/logger_impl.h
index 07b6815..d8dea26 100644
--- a/src/lib/log/logger_impl.h
+++ b/src/lib/log/logger_impl.h
@@ -177,7 +177,7 @@ public:
/// synchronizing output of log messages. It should be deletable and
/// the ownership is transferred to the logger implementation.
/// If NULL is passed, a BadInterprocessSync exception is thrown.
- void setInterprocessSync(isc::log::internal::InterprocessSync* sync);
+ void setInterprocessSync(isc::log::interprocess::InterprocessSync* sync);
/// \brief Equality
///
@@ -192,7 +192,7 @@ public:
private:
std::string name_; ///< Full name of this logger
log4cplus::Logger logger_; ///< Underlying log4cplus logger
- isc::log::internal::InterprocessSync* sync_;
+ isc::log::interprocess::InterprocessSync* sync_;
};
} // namespace log
diff --git a/src/lib/log/logger_manager.cc b/src/lib/log/logger_manager.cc
index 3f56d59..047c7dc 100644
--- a/src/lib/log/logger_manager.cc
+++ b/src/lib/log/logger_manager.cc
@@ -158,7 +158,7 @@ LoggerManager::readLocalMessageFile(const char* file) {
// the local state directory (to create lock files). So we switch to
// using a null interprocess sync object here.
logger.setInterprocessSync(
- new isc::log::internal::InterprocessSyncNull("logger"));
+ new isc::log::interprocess::InterprocessSyncNull("logger"));
try {
diff --git a/src/lib/log/tests/buffer_logger_test.cc b/src/lib/log/tests/buffer_logger_test.cc
index 9e43bc3..d703e04 100644
--- a/src/lib/log/tests/buffer_logger_test.cc
+++ b/src/lib/log/tests/buffer_logger_test.cc
@@ -59,7 +59,7 @@ main(int argc, char** argv) {
Logger logger("log");
// No need for file interprocess locking in this test
logger.setInterprocessSync(
- new isc::log::internal::InterprocessSyncNull("logger"));
+ new isc::log::interprocess::InterprocessSyncNull("logger"));
LOG_INFO(logger, LOG_BAD_SEVERITY).arg("info");
LOG_DEBUG(logger, 50, LOG_BAD_DESTINATION).arg("debug-50");
LOG_INFO(logger, LOG_BAD_SEVERITY).arg("info");
diff --git a/src/lib/log/tests/logger_example.cc b/src/lib/log/tests/logger_example.cc
index 8100712..daadb7c 100644
--- a/src/lib/log/tests/logger_example.cc
+++ b/src/lib/log/tests/logger_example.cc
@@ -45,7 +45,7 @@
using namespace isc::log;
using namespace std;
-using isc::log::internal::InterprocessSyncNull;
+using isc::log::interprocess::InterprocessSyncNull;
// Print usage information
diff --git a/src/lib/log/tests/logger_lock_test.cc b/src/lib/log/tests/logger_lock_test.cc
index 605c207..9b9ee17 100644
--- a/src/lib/log/tests/logger_lock_test.cc
+++ b/src/lib/log/tests/logger_lock_test.cc
@@ -26,7 +26,7 @@ using namespace std;
using namespace isc::log;
using isc::util::thread::Mutex;
-class MockLoggingSync : public isc::log::internal::InterprocessSync {
+class MockLoggingSync : public isc::log::interprocess::InterprocessSync {
public:
/// \brief Constructor
MockLoggingSync(const std::string& component_name) :
diff --git a/src/lib/log/tests/logger_unittest.cc b/src/lib/log/tests/logger_unittest.cc
index eef22a0..77a9d2a 100644
--- a/src/lib/log/tests/logger_unittest.cc
+++ b/src/lib/log/tests/logger_unittest.cc
@@ -390,7 +390,7 @@ TEST_F(LoggerTest, setInterprocessSync) {
EXPECT_THROW(logger.setInterprocessSync(NULL), BadInterprocessSync);
}
-class MockSync : public isc::log::internal::InterprocessSync {
+class MockSync : public isc::log::interprocess::InterprocessSync {
public:
/// \brief Constructor
MockSync(const std::string& component_name) :
More information about the bind10-changes
mailing list