Browse Source

[2899] renamed namespace for InterprocessSync "interprocess" for consistency.

JINMEI Tatuya 12 years ago
parent
commit
3471a0a39e

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

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

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

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

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

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

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

+ 1 - 1
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);
 }
 

+ 2 - 2
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
     ///

+ 4 - 3
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");

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

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

+ 1 - 1
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");

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

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

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