Moved Event_Transceiver class to transceiver.h (new file) to build ok on

AIX (P15).
Unregister handler in ctor if anything fails to avoid crashing due to late
unregistration at shutdown.

2 files changed, 71 insertions, 52 deletions

diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 9076713c187..4576c1c0595 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -9,57 +9,10 @@
 #include "ace/SOCK_Connector.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Transceiver, transceiver, "$Id$")
-
-class Event_Transceiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //     Generate and receives messages from the event server.
-  //
-  // = DESCRIPTION
-  //     This class is both a consumer and supplier of events, i.e.,
-  //     it's a ``transceiver.''
-public:
-  // = Initialization method.
-  Event_Transceiver (int argc, char *argv[]);
-  // Performs the actual initialization.
-
-  Event_Transceiver (void);
-  // No-op constructor (required by the <ACE_Connector>).
-
-  // = Svc_Handler hook called by the <ACE_Connector>.
-  virtual int open (void *);
-  // Initialize the transceiver when we are connected.
-
-  // = Demultplexing hooks from the <ACE_Reactor>.
-  virtual int handle_input (ACE_HANDLE);
-  // Receive data from STDIN or socket.
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
-  // Close down via SIGINT.
-
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  // Close down the event loop.
+#include "transceiver.h"
 
-private:
-  int receiver (void);
-  // Reads data from socket and writes to ACE_STDOUT.
-
-  int transmitter (void);
-  // Writes data from ACE_STDIN to socket.
-
-  int parse_args (int argc, char *argv[]);
-  // Parse the command-line arguments.
-
-  u_short port_number_;
-  // Port number of event server.
-
-  char *host_name_;
-  // Name of event server.
+ACE_RCSID(Transceiver, transceiver, "$Id$")
 
-  char *role_;
-  // Are we playing the Consumer or Supplier role?
-};
 
 // Handle the command-line arguments.
 
@@ -175,9 +128,14 @@ Event_Transceiver::Event_Transceiver (int argc, char *argv[])
       // Establish the connection to the Event Server.
       if (connector.connect (etp,
                              server_addr) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    this->host_name_));
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "%p\n",
+                      this->host_name_));
+	  ACE_Reactor::instance()->remove_handler (sig_set);
+	  ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance(),
+						   ACE_Thread_Manager::instance());
+        }
     }
 }
 
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.h b/examples/ASX/Event_Server/Transceiver/transceiver.h
new file mode 100644
index 00000000000..3f89f37b3de
--- /dev/null
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.h
@@ -0,0 +1,61 @@
+/* -*- C++ -*- */
+// $Id$
+
+#ifndef ACE_TRANSCEIVER_H
+#define ACE_TRANSCEIVER_H
+
+#include "ace/SOCK_Stream.h"
+#include "ace/Svc_Handler.h"
+#include "ace/Synch.h"
+
+class Event_Transceiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+{
+  // = TITLE
+  //     Generate and receives messages from the event server.
+  //
+  // = DESCRIPTION
+  //     This class is both a consumer and supplier of events, i.e.,
+  //     it's a ``transceiver.''
+public:
+  // = Initialization method.
+  Event_Transceiver (int argc, char *argv[]);
+  // Performs the actual initialization.
+
+  Event_Transceiver (void);
+  // No-op constructor (required by the <ACE_Connector>).
+
+  // = Svc_Handler hook called by the <ACE_Connector>.
+  virtual int open (void *);
+  // Initialize the transceiver when we are connected.
+
+  // = Demultplexing hooks from the <ACE_Reactor>.
+  virtual int handle_input (ACE_HANDLE);
+  // Receive data from STDIN or socket.
+
+  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
+  // Close down via SIGINT.
+
+  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
+  // Close down the event loop.
+
+private:
+  int receiver (void);
+  // Reads data from socket and writes to ACE_STDOUT.
+
+  int transmitter (void);
+  // Writes data from ACE_STDIN to socket.
+
+  int parse_args (int argc, char *argv[]);
+  // Parse the command-line arguments.
+
+  u_short port_number_;
+  // Port number of event server.
+
+  char *host_name_;
+  // Name of event server.
+
+  char *role_;
+  // Are we playing the Consumer or Supplier role?
+};
+
+#endif /* ACE_TRANSCEIVER_H */