Mon Jan 8 10:45:30 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 29 insertions, 6 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 97de7dfd44b..c4344b3dcd7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,19 @@
+Mon Jan  8 10:45:30 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Select_Reactor_Base.h:
+          Doxygen improvements
+
+        * ace/Select_Reactor_Base.h:
+          Changed the way we set the default for the
+          ACE_Select_Reactor_Notify::open call, instead of just hardcoding
+          the default 0, use the ACE_DISABLE_NOTIFY_PIPE_DEFAULT define
+          which is set by default to 0, but which we can set from a
+          config file to 1 to disable the notification pipe.
+
+        * ace/config-posix-nonetworking.h:
+          Set ACE_DISABLE_NOTIFY_PIPE_DEFAULT to 1. The notification pipe
+          doesn't work when networking is fully disabled.
+
 Mon Jan  8 00:10:52 UTC 2007  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * bin/tao_orb_tests.lst:
diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h
index 9f49dbd0d00..9ec4e642210 100644
--- a/ACE/ace/Select_Reactor_Base.h
+++ b/ACE/ace/Select_Reactor_Base.h
@@ -39,6 +39,10 @@
 # include "ace/Array_Base.h"
 #endif  /* ACE_WIN32 */
 
+#if !defined (ACE_DISABLE_NOTIFY_PIPE_DEFAULT)
+# define ACE_DISABLE_NOTIFY_PIPE_DEFAULT 0
+#endif /* ACE_DISABLE_NOTIFY_PIPE_DEFAULT */
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Add useful typedefs to simplify the following code.
@@ -140,7 +144,7 @@ public:
   /// Initialize.
   virtual int open (ACE_Reactor_Impl *,
                     ACE_Timer_Queue * = 0,
-                    int disable_notify_pipe = 0);
+                    int disable_notify_pipe = ACE_DISABLE_NOTIFY_PIPE_DEFAULT);
 
   /// Destroy.
   virtual int close (void);
@@ -256,7 +260,7 @@ protected:
   //   more notifications to be stored than would otherwise be the case.
 
   /// Keeps track of allocated arrays of type
-  /// <ACE_Notification_Buffer>.
+  /// ACE_Notification_Buffer.
   ACE_Unbounded_Queue <ACE_Notification_Buffer *> alloc_queue_;
 
   /// Keeps track of all pending notifications.
@@ -321,7 +325,7 @@ public:
   /// Default "do-nothing" constructor.
   ACE_Select_Reactor_Handler_Repository (ACE_Select_Reactor_Impl &);
 
-  /// Initialize a repository of the appropriate <size>.
+  /// Initialize a repository of the appropriate @a size.
   /**
    * On Unix platforms, the size parameter should be as large as the
    * maximum number of file descriptors allowed for a given process.
@@ -394,7 +398,7 @@ private:
   map_type::iterator find_eh (ACE_HANDLE handle);
 
 private:
-  /// Reference to our <Select_Reactor>.
+  /// Reference to our @c Select_Reactor.
   ACE_Select_Reactor_Impl &select_reactor_;
 
 #ifndef ACE_WIN32
@@ -425,7 +429,7 @@ public:
 
   // = Iteration methods.
 
-  /// Pass back the <next_item> that hasn't been seen in the Set.
+  /// Pass back the @a next_item that hasn't been seen in the Set.
   /// Returns @c false when all items have been seen, else @c true.
   bool next (ACE_Event_Handler* & next_item);
 
@@ -456,7 +460,7 @@ private:
  *
  * @brief This class simply defines how Select_Reactor's basic interface
  * functions should look like and provides a common base class for
- * <Select_Reactor> using various locking mechanism.
+ * @c Select_Reactor using various locking mechanism.
  */
 class ACE_Export ACE_Select_Reactor_Impl : public ACE_Reactor_Impl
 {
diff --git a/ACE/ace/config-posix-nonetworking.h b/ACE/ace/config-posix-nonetworking.h
index 42119c3e6cb..d87b20c340b 100644
--- a/ACE/ace/config-posix-nonetworking.h
+++ b/ACE/ace/config-posix-nonetworking.h
@@ -80,4 +80,7 @@
 # define ACE_LACKS_UNIX_SYSLOG
 # define ACE_LACKS_TCP_NODELAY
 
+// Missing ACE features
+# define ACE_DISABLE_NOTIFY_PIPE_DEFAULT 1
+
 #endif /* ACE_CONFIG_POSIX_NONETWORKING_H */