*** empty log message ***

2 files changed, 143 insertions, 117 deletions

diff --git a/docs/tutorials/002/handler.h b/docs/tutorials/002/handler.h
index 17d8c876728..febbd882fe7 100644
--- a/docs/tutorials/002/handler.h
+++ b/docs/tutorials/002/handler.h
@@ -70,6 +70,11 @@ public:
   void destroy (void)
   {
     /*
+      Remove ourselves from the reactor
+     */
+    g_reactor->remove_handler(this,ACE_Event_Handler::READ_MASK|ACE_Event_Handler::DONT_CALL);
+
+    /*
       Cancel that timer we scheduled in open()
      */
     g_reactor->cancel_timer (this);
@@ -132,6 +137,14 @@ protected:
     return 0;
   }
 
+  /*
+    Clean ourselves up when handle_input() (or handle_timer()) returns -1
+   */
+  int handle_close(ACE_HANDLE, ACE_Reactor_Mask _mask)
+  {
+    this->destroy();
+    return 0;
+  }
 };
 
 #endif // LOGGING_HANDLER_H
diff --git a/docs/tutorials/002/page03.html b/docs/tutorials/002/page03.html
index 29bd85fa93e..7fe8c8ab611 100644
--- a/docs/tutorials/002/page03.html
+++ b/docs/tutorials/002/page03.html
@@ -20,138 +20,151 @@
 
 <P>
 <HR WIDTH="100%">
-<BR>&nbsp;
+<BR> 
 <PRE>#ifndef LOGGING_HANDLER_H
 #define LOGGING_HANDLER_H
 
 /*
-&nbsp; Since we used the template to create the acceptor, we don't know if there is a
-&nbsp; way to get to the reactor it uses.&nbsp; We'll take the easy way out and grab the
-&nbsp; global pointer.&nbsp; (There is a way to get back to the acceptor's reactor that
-&nbsp; we'll see later on.)
-&nbsp;*/
+  Since we used the template to create the acceptor, we don't know if there is a
+  way to get to the reactor it uses.  We'll take the easy way out and grab the
+  global pointer.  (There is a way to get back to the acceptor's reactor that
+  we'll see later on.)
+ */
 extern ACE_Reactor * g_reactor;
 
 /*
-&nbsp; This time we're deriving from ACE_Svc_Handler instead of ACE_Event_Handler.
-&nbsp; The big reason for this is because it already knows how to contain a SOCK_Stream
-&nbsp; and provides all of the method calls needed by the reactor.&nbsp; The second template
-&nbsp; parameter is for some advanced stuff we'll do with later servers.&nbsp; For now, just
-&nbsp; use it as is...
-&nbsp;*/
+  This time we're deriving from ACE_Svc_Handler instead of ACE_Event_Handler.
+  The big reason for this is because it already knows how to contain a SOCK_Stream
+  and provides all of the method calls needed by the reactor.  The second template
+  parameter is for some advanced stuff we'll do with later servers.  For now, just
+  use it as is...
+ */
 class Logging_Handler : public ACE_Svc_Handler &lt; ACE_SOCK_STREAM, ACE_NULL_SYNCH >
 {
 
 public:
 
-&nbsp; /*
-&nbsp;&nbsp;&nbsp; The Acceptor&lt;> template will open() us when there is a new client connection.
-&nbsp;&nbsp; */
-&nbsp; int open (void *)
-&nbsp; {
-&nbsp;&nbsp;&nbsp; ACE_INET_Addr addr;
-
-&nbsp;&nbsp;&nbsp; /*
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Ask the peer() (held in our baseclass) to tell us the address of the cient
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; which has connected.&nbsp; There may be valid reasons for this to fail where we
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; wouldn't want to drop the connection but I can't think of one.
-&nbsp;&nbsp;&nbsp;&nbsp; */
-&nbsp;&nbsp;&nbsp; if (this->peer ().get_remote_addr (addr) == -1)
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return -1;
-
-&nbsp;&nbsp;&nbsp; /*
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; The Acceptor&lt;> won't register us with it's reactor, so we have to do so
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ourselves.&nbsp; This is where we have to grab that global pointer.&nbsp; Notice
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; that we again use the READ_MASK so that handle_input() will be called
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; when the client does something.
-&nbsp;&nbsp;&nbsp;&nbsp; */
-&nbsp;&nbsp;&nbsp; if (g_reactor->register_handler (this, ACE_Event_Handler::READ_MASK) == -1)
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) can't register with reactor\n"), -1);
-
-&nbsp;&nbsp;&nbsp; /*
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Here's another new treat.&nbsp; We schedule a timer event.&nbsp; This particular one
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; will fire in two seconds and then every three seconds after that.&nbsp; It doesn't
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; serve any useful purpose in our application other than to show you how it
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; is done.
-&nbsp;&nbsp;&nbsp;&nbsp; */
-&nbsp;&nbsp;&nbsp; else if (g_reactor->schedule_timer (this, 0, ACE_Time_Value (2), ACE_Time_Value (3)) == -1)
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ERROR_RETURN ((LM_ERROR, "can'(%P|%t) t register with reactor\n"), -1);
-
-&nbsp;&nbsp;&nbsp; ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected with %s\n", addr.get_host_name() ));
-
-&nbsp;&nbsp;&nbsp; return 0;
-&nbsp; }
-
-&nbsp; /*
-&nbsp;&nbsp;&nbsp; This is a matter of style &amp; maybe taste.&nbsp; Instead of putting all of this stuff
-&nbsp;&nbsp;&nbsp; into a destructor, we put it here and request that everyone call destroy()
-&nbsp;&nbsp;&nbsp; instead of 'delete'.
-&nbsp;&nbsp; */
-&nbsp; void destroy (void)
-&nbsp; {
-&nbsp;&nbsp;&nbsp; /*
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Cancel that timer we scheduled in open()
-&nbsp;&nbsp;&nbsp;&nbsp; */
-&nbsp;&nbsp;&nbsp; g_reactor->cancel_timer (this);
-
-&nbsp;&nbsp;&nbsp; /*
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Shut down the connection to the client.
-&nbsp;&nbsp;&nbsp;&nbsp; */
-&nbsp;&nbsp;&nbsp; this->peer ().close ();
-
-&nbsp;&nbsp;&nbsp; /*
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Free our memory.
-&nbsp;&nbsp;&nbsp;&nbsp; */
-&nbsp;&nbsp;&nbsp; delete this;
-&nbsp; }
-
-&nbsp; /*
-&nbsp;&nbsp;&nbsp; If somebody doesn't like us, the will close() us.&nbsp; Actually, if our open() method
-&nbsp;&nbsp;&nbsp; returns -1, the Acceptor&lt;> will invoke close() on us for cleanup.
-&nbsp;&nbsp; */
-&nbsp; int close (u_long)
-&nbsp; {
-&nbsp;&nbsp;&nbsp; /*
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Clean up and go away.
-&nbsp;&nbsp;&nbsp;&nbsp; */
-&nbsp;&nbsp;&nbsp; this->destroy ();
-&nbsp;&nbsp;&nbsp; return 0;
-&nbsp; }
+  /*
+    The Acceptor&lt;> template will open() us when there is a new client connection.
+   */
+  int open (void *)
+  {
+    ACE_INET_Addr addr;
+
+    /*
+      Ask the peer() (held in our baseclass) to tell us the address of the cient
+      which has connected.  There may be valid reasons for this to fail where we
+      wouldn't want to drop the connection but I can't think of one.
+     */
+    if (this->peer ().get_remote_addr (addr) == -1)
+      return -1;
+
+    /*
+      The Acceptor&lt;> won't register us with it's reactor, so we have to do so
+      ourselves.  This is where we have to grab that global pointer.  Notice
+      that we again use the READ_MASK so that handle_input() will be called
+      when the client does something.
+     */
+    if (g_reactor->register_handler (this, ACE_Event_Handler::READ_MASK) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) can't register with reactor\n"), -1);
+
+    /*
+      Here's another new treat.  We schedule a timer event.  This particular one
+      will fire in two seconds and then every three seconds after that.  It doesn't
+      serve any useful purpose in our application other than to show you how it
+      is done.
+     */
+    else if (g_reactor->schedule_timer (this, 0, ACE_Time_Value (2), ACE_Time_Value (3)) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR, "can'(%P|%t) t register with reactor\n"), -1);
+
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) connected with %s\n", addr.get_host_name() ));
+
+    return 0;
+  }
+
+  /*
+    This is a matter of style &amp; maybe taste.  Instead of putting all of this stuff
+    into a destructor, we put it here and request that everyone call destroy()
+    instead of 'delete'.
+   */
+  void destroy (void)
+  {
+    /*
+      Remove ourselves from the reactor
+     */
+    g_reactor->remove_handler(this,ACE_Event_Handler::READ_MASK|ACE_Event_Handler::DONT_CALL);
+
+    /*
+      Cancel that timer we scheduled in open()
+     */
+    g_reactor->cancel_timer (this);
+
+    /*
+      Shut down the connection to the client.
+     */
+    this->peer ().close ();
+
+    /*
+      Free our memory.
+     */
+    delete this;
+  }
+
+  /*
+    If somebody doesn't like us, the will close() us.  Actually, if our open() method
+    returns -1, the Acceptor&lt;> will invoke close() on us for cleanup.
+   */
+  int close (u_long)
+  {
+    /*
+      Clean up and go away.
+     */
+    this->destroy ();
+    return 0;
+  }
 
 protected:
 
-&nbsp; /*
-&nbsp;&nbsp;&nbsp; Respond to input just like Tutorial 1.
-&nbsp;&nbsp; */
-&nbsp; int handle_input (ACE_HANDLE)
-&nbsp; {
-&nbsp;&nbsp;&nbsp; char buf[128];
-&nbsp;&nbsp;&nbsp; memset (buf, 0, sizeof (buf));
-
-&nbsp;&nbsp;&nbsp; switch (this->peer ().recv (buf, sizeof buf))
-&nbsp;&nbsp;&nbsp; {
-&nbsp;&nbsp;&nbsp; case -1:
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p bad read\n", "client logger"), -1);
-&nbsp;&nbsp;&nbsp; case 0:
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) closing log daemon (fd = %d)\n", this->get_handle ()), -1);
-&nbsp;&nbsp;&nbsp; default:
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_DEBUG ((LM_DEBUG, "(%P|%t) from client: %s", buf));
-&nbsp;&nbsp;&nbsp; }
-
-&nbsp;&nbsp;&nbsp; return 0;
-&nbsp; }
-
-&nbsp; /*
-&nbsp;&nbsp;&nbsp; When the timer expires, handle_timeout() will be called.&nbsp; The 'arg' is the value passed
-&nbsp;&nbsp;&nbsp; after 'this' in the schedule_timer() call.&nbsp; You can pass in anything there that you can
-&nbsp;&nbsp;&nbsp; cast to a void*.
-&nbsp;&nbsp; */
-&nbsp; int handle_timeout (const ACE_Time_Value &amp; tv, const void *arg)
-&nbsp; {
-&nbsp;&nbsp;&nbsp; ACE_DEBUG ((LM_DEBUG, "(%P|%t) handling timeout from this = %u\n", this));
-&nbsp;&nbsp;&nbsp; return 0;
-&nbsp; }
-
+  /*
+    Respond to input just like Tutorial 1.
+   */
+  int handle_input (ACE_HANDLE)
+  {
+    char buf[128];
+    memset (buf, 0, sizeof (buf));
+
+    switch (this->peer ().recv (buf, sizeof buf))
+    {
+    case -1:
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %p bad read\n", "client logger"), -1);
+    case 0:
+      ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) closing log daemon (fd = %d)\n", this->get_handle ()), -1);
+    default:
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) from client: %s", buf));
+    }
+
+    return 0;
+  }
+
+  /*
+    When the timer expires, handle_timeout() will be called.  The 'arg' is the value passed
+    after 'this' in the schedule_timer() call.  You can pass in anything there that you can
+    cast to a void*.
+   */
+  int handle_timeout (const ACE_Time_Value &amp; tv, const void *arg)
+  {
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) handling timeout from this = %u\n", this));
+    return 0;
+  }
+
+  /*
+    Clean ourselves up when handle_input() (or handle_timer()) returns -1
+   */
+  int handle_close(ACE_HANDLE, ACE_Reactor_Mask _mask)
+  {
+    this->destroy();
+    return 0;
+  }
 };
 
 #endif // LOGGING_HANDLER_H</PRE>