BIND 10 trac1704_2, updated. 9227b2de28f57892f5570ca0f30f0f6c651922be [1704] Add documentation for InterprocessSync and InterprocessSyncFile

[BIND 10 source code commits]

The branch, trac1704_2 has been updated
       via  9227b2de28f57892f5570ca0f30f0f6c651922be (commit)
      from  1d5bd47c50ca03b87972977bb3bdd8d798148698 (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 9227b2de28f57892f5570ca0f30f0f6c651922be
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri May 25 10:28:26 2012 +0530

    [1704] Add documentation for InterprocessSync and InterprocessSyncFile

-----------------------------------------------------------------------

Summary of changes:
 src/lib/util/interprocess_sync.h       |   54 +++++++++++++++++++++++++++-----
 src/lib/util/interprocess_sync_file.cc |    2 +-
 src/lib/util/interprocess_sync_file.h  |   31 +++++++++++++++---
 3 files changed, 74 insertions(+), 13 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/interprocess_sync.h b/src/lib/util/interprocess_sync.h
index c5fe11e..340dc5a 100644
--- a/src/lib/util/interprocess_sync.h
+++ b/src/lib/util/interprocess_sync.h
@@ -20,30 +20,64 @@
 namespace isc {
 namespace util {
 
-class InterprocessSyncLocker;
-
+class InterprocessSyncLocker; // forward declaration
+
+/// \brief Interprocess Sync Class
+///
+/// This class specifies an interface for mutual exclusion among
+/// co-operating processes. This is an abstract class and a real
+/// implementation such as InterprocessSyncFile should be used
+/// in code. Usage is as follows:
+///
+/// 1. Client instantiates a sync object of an implementation (such as
+/// InterprocessSyncFile).
+/// 2. Client then creates an automatic (stack) object of
+/// InterprocessSyncLocker around the sync object. Such an object
+/// destroys itself and releases any acquired lock when it goes out of extent.
+/// 3. Client calls lock() method on the InterprocessSyncLocker.
+/// 4. Client performs task that needs mutual exclusion.
+/// 5. Client frees lock with unlock(), or simply returns from the basic
+/// block which forms the scope for the InterprocessSyncLocker.
 class InterprocessSync {
-friend class InterprocessSyncLocker;
+  // InterprocessSyncLocker is the only code outside this class that
+  // should be allowed to call the lock(), tryLock() and unlock()
+  // methods.
+  friend class InterprocessSyncLocker;
+
 public:
     /// \brief Constructor
     ///
     /// Creates a interprocess synchronization object
-    InterprocessSync(const std::string& component_name) :
-        component_name_(component_name), is_locked_(false)
+    ///
+    /// \param name Name of the synchronization task. This has to be
+    /// identical among the various processes that need to be
+    /// synchronized for the same task.
+    InterprocessSync(const std::string& task_name) :
+        task_name_(task_name), is_locked_(false)
     {}
 
     /// \brief Destructor
     virtual ~InterprocessSync() {}
 
 protected:
+    /// \brief Acquire the lock (blocks if something else has acquired a
+    /// lock on the same task name)
     virtual bool lock() = 0;
+    /// \brief Try to acquire a lock (doesn't block)
     virtual bool tryLock() = 0;
+    /// \brief Release the lock
     virtual bool unlock() = 0;
 
-    const std::string component_name_;
-    bool is_locked_;
+    const std::string task_name_; ///< The task name
+    bool is_locked_;              ///< Is the lock taken?
 };
 
+/// \brief Interprocess Sync Locker Class
+///
+/// This class is used for making automatic stack objects to manage
+/// locks that are released automatically when the block is exited
+/// (RAII). It is meant to be used along with InterprocessSync objects. See
+/// the description of InterprocessSync.
 class InterprocessSyncLocker {
 public:
     InterprocessSyncLocker(InterprocessSync& sync) :
@@ -55,20 +89,24 @@ public:
         unlock();
     }
 
+    /// \brief Acquire the lock (blocks if something else has acquired a
+    /// lock on the same task name)
     bool lock() {
         return (sync_.lock());
     }
 
+    /// \brief Try to acquire a lock (doesn't block)
     bool tryLock() {
         return (sync_.tryLock());
     }
 
+    /// \brief Release the lock
     bool unlock() {
         return (sync_.unlock());
     }
 
 protected:
-    InterprocessSync& sync_;
+    InterprocessSync& sync_; ///< Ref to underlying sync object
 };
 
 } // namespace util
diff --git a/src/lib/util/interprocess_sync_file.cc b/src/lib/util/interprocess_sync_file.cc
index 4b82095..b9a2d07 100644
--- a/src/lib/util/interprocess_sync_file.cc
+++ b/src/lib/util/interprocess_sync_file.cc
@@ -53,7 +53,7 @@ InterprocessSyncFile::do_lock(int cmd, short l_type) {
             lockfile_path = env2;
         }
 
-        lockfile_path += "/" + component_name_ + "_lockfile";
+        lockfile_path += "/" + task_name_ + "_lockfile";
 
         // Open the lockfile in the constructor so it doesn't do the access
         // checks every time a message is logged.
diff --git a/src/lib/util/interprocess_sync_file.h b/src/lib/util/interprocess_sync_file.h
index cf8f4f1..7030747 100644
--- a/src/lib/util/interprocess_sync_file.h
+++ b/src/lib/util/interprocess_sync_file.h
@@ -21,10 +21,10 @@
 namespace isc {
 namespace util {
 
+/// \brief InterprocessSyncFileError
 ///
-/// \brief Exception that is thrown if it's not possible to open the
+/// Exception that is thrown if it's not possible to open the
 /// lock file.
-///
 class InterprocessSyncFileError : public Exception {
 public:
     InterprocessSyncFileError(const char* file, size_t line,
@@ -32,19 +32,42 @@ public:
         isc::Exception(file, line, what) {}
 };
 
+/// \brief File-based Interprocess Sync Class
+///
+/// This class specifies a concrete implementation for a file-based
+/// interprocess synchronization mechanism. Please see the
+/// InterprocessSync class documentation for usage.
+///
+/// Lock files are created typically in the local state directory
+/// (var). They are typically named like "<task_name>_lockfile".
+/// This implementation opens lock files lazily (only when
+/// necessary). It also leaves the lock files lying around as multiple
+/// processes may have locks on them.
 class InterprocessSyncFile : public InterprocessSync {
 public:
     /// \brief Constructor
-    InterprocessSyncFile(const std::string& component_name) :
-        InterprocessSync(component_name), fd_(-1)
+    ///
+    /// Creates a file-based interprocess synchronization object
+    ///
+    /// \param name Name of the synchronization task. This has to be
+    /// identical among the various processes that need to be
+    /// synchronized for the same task.
+    InterprocessSyncFile(const std::string& task_name) :
+        InterprocessSync(task_name), fd_(-1)
     {}
 
     /// \brief Destructor
     virtual ~InterprocessSyncFile();
 
 protected:
+    /// \brief Acquire the lock (blocks if something else has acquired a
+    /// lock on the same task name)
     bool lock();
+
+    /// \brief Try to acquire a lock (doesn't block)
     bool tryLock();
+
+    /// \brief Release the lock
     bool unlock();
 
 private: