Moved a few methods from ACE to ACE_Event_Handler

22 files changed, 311 insertions, 138 deletions

diff --git a/ChangeLog-98b b/ChangeLog-98b
index 6f39123b4a0..d838e8c9503 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,40 @@
+Thu Jul 30 14:56:59 1998  Gonzalo A. Diethelm  <gonzo@cs.wustl.edu>
+
+	* ace/ACE.h: 
+	* ace/ACE.cpp: 
+	* ace/Event_Handler.h: 
+	* ace/Event_Handler.cpp: 
+	Moved the following static functions:
+	
+	  register_stdin_handler
+	  remove_stdin_handler
+	  read_adapter
+
+	from class ACE to class ACE_Event_Handler. That breaks a
+	dependency from ACE to higher-level classes.
+
+	* netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp: 
+	* netsvcs/clients/Naming/Client/Client_Test.cpp: 
+	* examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp: 
+	* examples/Timer_Queue/Async_Timer_Queue_Test.dsp: 
+	* examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp: 
+	* examples/Timer_Queue/Thread_Timer_Queue_Test.dsp: 
+	* examples/Reactor/Ntalker/ntalker.cpp: 
+	* examples/Reactor/Misc/test_demuxing.cpp: 
+	* examples/Reactor/Misc/notification.cpp: 
+	* examples/Connection/blocking/SPIPE-connector.cpp: 
+	* examples/ASX/UPIPE_Event_Server/event_server.cpp: 
+	* examples/ASX/Event_Server/Transceiver/transceiver.cpp: 
+	* examples/ASX/Event_Server/Event_Server/event_server.cpp: 
+	* apps/Gateway/Peer/Peer.cpp: 
+	* apps/Gateway/Gateway/Gateway.cpp: 
+	All these were modified by the above change.
+
+	* ace/OS.h: 
+	* ace/OS.i: 
+	Added a strnew function that works as strdup but uses new instead
+	of malloc to allocate memory.
+
 Thu Jul 30 16:54:20 1998  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * ACE version 4.5.26 released.
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 07dadc9d28b..42d6ee6f0f8 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -4,8 +4,6 @@
 #include "ace/IPC_SAP.h"
 #include "ace/Handle_Set.h"
 #include "ace/ACE.h"
-#include "ace/Thread_Manager.h"
-#include "ace/Reactor.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/INET_Addr.h"
 #include "ace/SString.h"
@@ -129,72 +127,6 @@ ACE::process_active (pid_t pid)
 #endif /* ACE_WIN32 */
 }
 
-#if !defined (ACE_HAS_WINCE)
-int
-ACE::register_stdin_handler (ACE_Event_Handler *eh,
-                             ACE_Reactor *reactor,
-                             ACE_Thread_Manager *thr_mgr,
-                             int flags)
-{
-#if defined (ACE_WIN32)
-  ACE_UNUSED_ARG (reactor);
-
-  eh->reactor (reactor);
-  return thr_mgr->spawn (&ACE::read_adapter, (void *) eh, flags);
-#else
-  // Keep compilers happy.
-  ACE_UNUSED_ARG (flags);
-  ACE_UNUSED_ARG (thr_mgr);
-  return reactor->register_handler (ACE_STDIN,
-                                    eh,
-                                    ACE_Event_Handler::READ_MASK);
-#endif /* ACE_WIN32 */
-}
-
-int
-ACE::remove_stdin_handler (ACE_Reactor *reactor,
-                           ACE_Thread_Manager *thr_mgr)
-{
-#if defined (ACE_WIN32)
-  ACE_UNUSED_ARG (reactor);
-  ACE_UNUSED_ARG (thr_mgr);
-
-  // What should we do here?
-  ACE_NOTSUP_RETURN (-1);
-#else
-  // Keep compilers happy.
-  ACE_UNUSED_ARG (thr_mgr);
-  return reactor->remove_handler (ACE_STDIN,
-                                  ACE_Event_Handler::READ_MASK);
-#endif /* ACE_WIN32 */
-}
-
-// Used to read from non-socket ACE_HANDLEs in our own thread to work
-// around Win32 limitations that don't allow us to select() on
-// non-sockets (such as ACE_STDIN).  This is commonly used in
-// situations where the Reactor is used to demultiplex read events on
-// ACE_STDIN on UNIX.  Note that <event_handler> must be a subclass of
-// <ACE_Event_Handler>.  If the <get_handle> method of this event
-// handler returns <ACE_INVALID_HANDLE> we default to reading from
-// ACE_STDIN.
-
-void *
-ACE::read_adapter (void *args)
-{
-  ACE_Event_Handler *this_ptr = (ACE_Event_Handler *) args;
-  ACE_HANDLE handle = ACE_STDIN;
-
-  while (this_ptr->handle_input (handle) != -1)
-    continue;
-
-  this_ptr->handle_close (handle,
-                          ACE_Event_Handler::READ_MASK);
-  this_ptr->reactor ()->notify ();
-
-  return 0;
-}
-#endif /* ACE_HAS_WINCE */
-
 // Split a string up into 'token'-delimited pieces, ala Perl's
 // "split".
 
diff --git a/ace/ACE.h b/ace/ACE.h
index 41b0b26fce5..864d8ed3aa1 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -21,9 +21,6 @@
 
 // Forward declarations.
 class ACE_Time_Value;
-class ACE_Thread_Manager;
-class ACE_Reactor;
-class ACE_Event_Handler;
 class ACE_INET_Addr;
 
 class ACE_Export ACE
@@ -506,30 +503,6 @@ public:
 
   // = Shield us from Win32's inability to select on STDIN.
 
-#if !defined (ACE_HAS_WINCE)
-  static void *read_adapter (void *event_handler);
-  // Used to read from non-socket ACE_HANDLEs in our own thread to
-  // work around Win32 limitations that don't allow us to select() on
-  // non-sockets (such as ACE_STDIN).  This is commonly used in
-  // situations where the Reactor is used to demultiplex read events
-  // on ACE_STDIN on UNIX.  Note that <event_handler> must be a
-  // subclass of <ACE_Event_Handler>.  If the <get_handle> method of
-  // this event handler returns <ACE_INVALID_HANDLE> we default to
-  // reading from ACE_STDIN.
-
-  static int register_stdin_handler (ACE_Event_Handler *eh,
-                                     ACE_Reactor *reactor,
-                                     ACE_Thread_Manager *thr_mgr,
-                                     int flags = THR_DETACHED);
-  // Abstracts away from the differences between Win32 and ACE with
-  // respect to reading from ACE_STDIN (which is non-select()'able on
-  // Win32.
-
-  static int remove_stdin_handler (ACE_Reactor *reactor,
-                                   ACE_Thread_Manager *thr_mgr);
-  // Performs the inverse of the <register_stdin_handler> method.
-#endif /* ACE_HAS_WINCE */
-
   // = Miscelleous functions.
   static size_t round_to_pagesize (off_t length);
   // Rounds the request to a multiple of the page size.
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index ae5be389702..fdad741b680 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -4,6 +4,8 @@
 #define ACE_BUILD_DLL
 #include "ace/Event_Handler.h"
 #include "ace/Message_Block.h"
+#include "ace/Reactor.h"
+#include "ace/Thread_Manager.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Event_Handler.i"
@@ -144,6 +146,74 @@ ACE_Event_Handler::reactor (void) const
   return this->reactor_;
 }
 
+#if !defined (ACE_HAS_WINCE)
+
+// Used to read from non-socket ACE_HANDLEs in our own thread to work
+// around Win32 limitations that don't allow us to select() on
+// non-sockets (such as ACE_STDIN).  This is commonly used in
+// situations where the Reactor is used to demultiplex read events on
+// ACE_STDIN on UNIX.  Note that <event_handler> must be a subclass of
+// <ACE_Event_Handler>.  If the <get_handle> method of this event
+// handler returns <ACE_INVALID_HANDLE> we default to reading from
+// ACE_STDIN.
+
+void *
+ACE_Event_Handler::read_adapter (void *args)
+{
+  ACE_Event_Handler *this_ptr = (ACE_Event_Handler *) args;
+  ACE_HANDLE handle = ACE_STDIN;
+
+  while (this_ptr->handle_input (handle) != -1)
+    continue;
+
+  this_ptr->handle_close (handle,
+                          ACE_Event_Handler::READ_MASK);
+  this_ptr->reactor ()->notify ();
+
+  return 0;
+}
+
+int
+ACE_Event_Handler::register_stdin_handler (ACE_Event_Handler *eh,
+					   ACE_Reactor *reactor,
+					   ACE_Thread_Manager *thr_mgr,
+					   int flags)
+{
+#if defined (ACE_WIN32)
+  ACE_UNUSED_ARG (reactor);
+
+  eh->reactor (reactor);
+  return thr_mgr->spawn (&read_adapter, (void *) eh, flags);
+#else
+  // Keep compilers happy.
+  ACE_UNUSED_ARG (flags);
+  ACE_UNUSED_ARG (thr_mgr);
+  return reactor->register_handler (ACE_STDIN,
+                                    eh,
+                                    ACE_Event_Handler::READ_MASK);
+#endif /* ACE_WIN32 */
+}
+
+int
+ACE_Event_Handler::remove_stdin_handler (ACE_Reactor *reactor,
+					 ACE_Thread_Manager *thr_mgr)
+{
+#if defined (ACE_WIN32)
+  ACE_UNUSED_ARG (reactor);
+  ACE_UNUSED_ARG (thr_mgr);
+
+  // What should we do here?
+  ACE_NOTSUP_RETURN (-1);
+#else
+  // Keep compilers happy.
+  ACE_UNUSED_ARG (thr_mgr);
+  return reactor->remove_handler (ACE_STDIN,
+                                  ACE_Event_Handler::READ_MASK);
+#endif /* ACE_WIN32 */
+}
+
+#endif /* ACE_HAS_WINCE */
+
 ACE_Notification_Buffer::ACE_Notification_Buffer (void) 
 {
   ACE_TRACE ("ACE_Notification_Buffer::ACE_Notification_Buffer");
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index 84a9bfe63b9..221e7811633 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -22,6 +22,7 @@
 // Forward declaration.
 class ACE_Message_Block;
 class ACE_Reactor;
+class ACE_Thread_Manager;
 
 typedef u_long ACE_Reactor_Mask;
 
@@ -115,6 +116,30 @@ public:
   virtual void reactor (ACE_Reactor *reactor);
   virtual ACE_Reactor *reactor (void) const;
 
+#if !defined (ACE_HAS_WINCE)
+  static void *read_adapter (void *event_handler);
+  // Used to read from non-socket ACE_HANDLEs in our own thread to
+  // work around Win32 limitations that don't allow us to select() on
+  // non-sockets (such as ACE_STDIN).  This is commonly used in
+  // situations where the Reactor is used to demultiplex read events
+  // on ACE_STDIN on UNIX.  Note that <event_handler> must be a
+  // subclass of <ACE_Event_Handler>.  If the <get_handle> method of
+  // this event handler returns <ACE_INVALID_HANDLE> we default to
+  // reading from ACE_STDIN.
+
+  static int register_stdin_handler (ACE_Event_Handler *eh,
+                                     ACE_Reactor *reactor,
+                                     ACE_Thread_Manager *thr_mgr,
+                                     int flags = THR_DETACHED);
+  // Abstracts away from the differences between Win32 and ACE with
+  // respect to reading from ACE_STDIN (which is non-select()'able on
+  // Win32.
+
+  static int remove_stdin_handler (ACE_Reactor *reactor,
+                                   ACE_Thread_Manager *thr_mgr);
+  // Performs the inverse of the <register_stdin_handler> method.
+#endif /* ACE_HAS_WINCE */
+
 protected:
   ACE_Event_Handler (void);
   // Force ACE_Event_Handler to be an abstract base class.
diff --git a/ace/OS.h b/ace/OS.h
index a03491d040a..4ef8b5249bf 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -4862,7 +4862,8 @@ public:
   static const char *strnstr (const char *s,
                               const char *t,
                               size_t len);
-  static char *strdup (const char *s);
+  static char *strdup (const char *s); // Uses malloc
+  static char *strnew (const char *s); // Uses new
   static size_t strlen (const char *s);
   static char *strncpy (char *s,
                         const char *t,
@@ -4956,7 +4957,8 @@ public:
   static const wchar_t *strnstr (const wchar_t *s,
                                  const wchar_t *t,
                                  size_t len);
-  static wchar_t *strdup (const wchar_t *s);
+  static wchar_t *strdup (const wchar_t *s); // Uses malloc
+  static wchar_t *strnew (const wchar_t *s); // Uses new
   static int sprintf (wchar_t *buf,
                       const wchar_t *format,
                       ...);
diff --git a/ace/OS.i b/ace/OS.i
index 8e8f0f4d7bb..039f032ff8d 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -1375,6 +1375,17 @@ ACE_OS::strdup (const char *s)
 #endif /* VXWORKS */
 }
 
+ACE_INLINE char *
+ACE_OS::strnew (const char *s)
+{
+  // ACE_TRACE ("ACE_OS::strnew");
+  char *t = new char [::strlen(s) + 1];
+  if (t == 0)
+    return 0;
+  else
+    return ACE_OS::strcpy (t, s);
+}
+
 #if !defined (ACE_HAS_WINCE)
 ACE_INLINE int
 ACE_OS::vsprintf (char *buffer, const char *format, va_list argptr)
@@ -9064,13 +9075,24 @@ ACE_OS::strdup (const wchar_t *s)
 {
   // ACE_TRACE ("ACE_OS::strdup");
 #   if defined (__BORLANDC__)
-  wchar_t *buffer = (wchar_t *) malloc (strlen (s) * sizeof (wchar_t) + 1);
+  wchar_t *buffer = (wchar_t *) malloc (::strlen (s) * sizeof (wchar_t) + 1);
   return ::wcscpy (buffer, s);
 #   else
   return ::wcsdup (s);
 #   endif /* __BORLANDC__ */
 }
 
+ACE_INLINE wchar_t *
+ACE_OS::strnew (const wchar_t *s)
+{
+  // ACE_TRACE ("ACE_OS::strnew");
+  wchar_t *t = new wchar_t [::wcslen(s) + 1];
+  if (t == 0)
+    return 0;
+  else
+    return ACE_OS::strcpy (t, s);
+}
+
 ACE_INLINE int
 ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr)
 {
diff --git a/apps/Gateway/Gateway/Gateway.cpp b/apps/Gateway/Gateway/Gateway.cpp
index a6d6c3660d3..9fa8f5ae4f0 100644
--- a/apps/Gateway/Gateway/Gateway.cpp
+++ b/apps/Gateway/Gateway/Gateway.cpp
@@ -93,9 +93,9 @@ Gateway::init (int argc, char *argv[])
 
   // Register this handler to receive events on stdin.  We use this to
   // shutdown the Gateway gracefully.
-  if (ACE::register_stdin_handler (this,
-				   ACE_Reactor::instance (),
-				   ACE_Thread_Manager::instance ()) == -1)
+  if (ACE_Event_Handler::register_stdin_handler (this,
+						 ACE_Reactor::instance (),
+						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%t) %p\n",
                        "register_stdin_handler"),
@@ -140,8 +140,8 @@ Gateway::fini (void)
 {
   // Remove the handler that receive events on stdin.  Otherwise, we
   // will crash on shutdown.
-  ACE::remove_stdin_handler (ACE_Reactor::instance (),
-                             ACE_Thread_Manager::instance ());
+  ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance (),
+					   ACE_Thread_Manager::instance ());
 
   // Close down the event channel.
   this->event_channel_.close ();
diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp
index 134f7b8f7e8..c6c4f0d0b6a 100644
--- a/apps/Gateway/Peer/Peer.cpp
+++ b/apps/Gateway/Peer/Peer.cpp
@@ -481,9 +481,9 @@ Peer_Handler::await_connection_id (void)
   ACE_OS::rewind (stdin);
 
   // Register this handler to receive test events on stdin.
-  if (ACE::register_stdin_handler (this,
-                                   ACE_Reactor::instance (),
-                                   ACE_Thread_Manager::instance ()) == -1)
+  if (ACE_Event_Handler::register_stdin_handler (this,
+						 ACE_Reactor::instance (),
+						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", "register_stdin_handler"), -1);
 
   return 0;
diff --git a/examples/ASX/Event_Server/Event_Server/event_server.cpp b/examples/ASX/Event_Server/Event_Server/event_server.cpp
index 4fa59126d64..023d2427e14 100644
--- a/examples/ASX/Event_Server/Event_Server/event_server.cpp
+++ b/examples/ASX/Event_Server/Event_Server/event_server.cpp
@@ -62,9 +62,9 @@ Event_Server::Event_Server (void)
   // received.
 {  
   // Register to trap STDIN from the user.
-  if (ACE::register_stdin_handler (this,
-				   ACE_Reactor::instance (),
-				   ACE_Thread_Manager::instance ()) == -1)
+  if (ACE_Event_Handler::register_stdin_handler (this,
+						 ACE_Reactor::instance (),
+						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR,
                 "%p\n",
                 "register_stdin_handler"));
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 186603ff841..640955c1f8c 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -155,9 +155,9 @@ Event_Transceiver::Event_Transceiver (int argc, char *argv[])
       // We need to register <this> here before we're connected since
       // otherwise <get_handle> will return the connection socket
       // handle for the peer.
-      else if (ACE::register_stdin_handler (this,
-                                            ACE_Reactor::instance (),
-                                            ACE_Thread_Manager::instance ()) == -1)
+      else if (ACE_Event_Handler::register_stdin_handler (this,
+							  ACE_Reactor::instance (),
+							  ACE_Thread_Manager::instance ()) == -1)
         ACE_ERROR ((LM_ERROR,
                     "%p\n",
                     "register_stdin_handler"));
diff --git a/examples/ASX/UPIPE_Event_Server/event_server.cpp b/examples/ASX/UPIPE_Event_Server/event_server.cpp
index d7d788939d5..08a339b4b03 100644
--- a/examples/ASX/UPIPE_Event_Server/event_server.cpp
+++ b/examples/ASX/UPIPE_Event_Server/event_server.cpp
@@ -29,9 +29,9 @@ Quit_Handler::Quit_Handler (void)
   : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
 {  
   // Register to trap input from the user.
-  if (ACE::register_stdin_handler (this,
-				   ACE_Reactor::instance (),
-				   ACE_Thread_Manager::instance ()) == -1)
+  if (ACE_Event_Handler::register_stdin_handler (this,
+						 ACE_Reactor::instance (),
+						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
   // Register to trap the SIGINT signal.
   else if (ACE_Reactor::instance ()->register_handler 
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index 9aa410f1351..f439e2fc008 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -27,9 +27,9 @@ Peer_Handler::open (void *)
   if (iterations_ == 0)
     {
       this->display_menu ();
-      if (ACE::register_stdin_handler (this,
-				      ACE_Reactor::instance (),
-					  ACE_Thread_Manager::instance ()) == -1)
+      if (ACE_Event_Handler::register_stdin_handler (this,
+						     ACE_Reactor::instance (),
+						     ACE_Thread_Manager::instance ()) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_stdin_handler"), -1);
       else
 	return 0;
diff --git a/examples/Reactor/Misc/notification.cpp b/examples/Reactor/Misc/notification.cpp
index 6d0e409c257..b04957efc69 100644
--- a/examples/Reactor/Misc/notification.cpp
+++ b/examples/Reactor/Misc/notification.cpp
@@ -94,9 +94,9 @@ Thread_Handler::Thread_Handler (int delay,
   interval_.set (interval);
   this->id_ = 0;
 
-  if (ACE::register_stdin_handler (this,
-				   ACE_Reactor::instance (),
-				   ACE_Thread_Manager::instance ()) == -1)
+  if (ACE_Event_Handler::register_stdin_handler (this,
+						 ACE_Reactor::instance (),
+						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
   else if (ACE_Reactor::instance ()->register_handler (sig_set, this) == -1)
     ACE_ERROR ((LM_ERROR, "(%t) %p\n", "register_handler"));
diff --git a/examples/Reactor/Misc/test_demuxing.cpp b/examples/Reactor/Misc/test_demuxing.cpp
index 26bc841a313..6974ed2509a 100644
--- a/examples/Reactor/Misc/test_demuxing.cpp
+++ b/examples/Reactor/Misc/test_demuxing.cpp
@@ -164,9 +164,9 @@ public:
 
 STDIN_Handler::STDIN_Handler (void)
 {
-  if (ACE::register_stdin_handler (this,
-				   ACE_Reactor::instance (),
-				   ACE_Thread_Manager::instance ()) == -1)
+  if (ACE_Event_Handler::register_stdin_handler (this,
+						 ACE_Reactor::instance (),
+						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR,
                 "%p\n",
                 "register_stdin_handler"));
diff --git a/examples/Reactor/Ntalker/ntalker.cpp b/examples/Reactor/Ntalker/ntalker.cpp
index 24cb84e43d9..04fd808b0a2 100644
--- a/examples/Reactor/Ntalker/ntalker.cpp
+++ b/examples/Reactor/Ntalker/ntalker.cpp
@@ -165,9 +165,9 @@ Handler::Handler (u_short udp_port,
                 "%p\n",
                 "can't register with Reactor\n"));
   // Register the STDIN handler.
-  else if (ACE::register_stdin_handler (this,
-                                        ACE_Reactor::instance (),
-                                        ACE_Thread_Manager::instance ()) == -1)
+  else if (ACE_Event_Handler::register_stdin_handler (this,
+                                        		ACE_Reactor::instance (),
+                                        		ACE_Thread_Manager::instance ()) == -1)
       ACE_ERROR ((LM_ERROR,
                   "%p\n",
                   "register_stdin_handler"));
diff --git a/examples/Timer_Queue/Async_Timer_Queue_Test.dsp b/examples/Timer_Queue/Async_Timer_Queue_Test.dsp
new file mode 100644
index 00000000000..b906aa1a6d7
--- /dev/null
+++ b/examples/Timer_Queue/Async_Timer_Queue_Test.dsp
@@ -0,0 +1,104 @@
+# Microsoft Developer Studio Project File - Name="Async_Timer_Queue_Test" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=Async_Timer_Queue_Test - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "Async_Timer_Queue_Test.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "Async_Timer_Queue_Test.mak"\

+ CFG="Async_Timer_Queue_Test - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "Async_Timer_Queue_Test - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Async_Timer_Queue_Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "Async_Timer_Queue_Test - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

+

+!ELSEIF  "$(CFG)" == "Async_Timer_Queue_Test - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Async_Ti"

+# PROP BASE Intermediate_Dir "Async_Ti"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD BASE RSC /l 0x409 /d "_DEBUG"

+# ADD RSC /l 0x409 /d "_DEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

+

+!ENDIF 

+

+# Begin Target

+

+# Name "Async_Timer_Queue_Test - Win32 Release"

+# Name "Async_Timer_Queue_Test - Win32 Debug"

+# Begin Source File

+

+SOURCE=.\Async_Timer_Queue_Test.cpp

+

+!IF  "$(CFG)" == "Async_Timer_Queue_Test - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "Async_Timer_Queue_Test - Win32 Debug"

+

+# ADD CPP /I "..\.."

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\main_async.cpp

+# End Source File

+# End Target

+# End Project

diff --git a/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp b/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
index e00a2c8a295..90f598c1283 100644
--- a/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
+++ b/examples/Timer_Queue/Reactor_Timer_Queue_Test.cpp
@@ -182,9 +182,9 @@ Reactor_Timer_Queue_Test_Driver::init (void)
 
   ACE_Reactor::instance ()->set_timer_queue (&timer_queue_);
 
-  ACE::register_stdin_handler (&thandler_,
-                               ACE_Reactor::instance (),
-                               ACE_Thread_Manager::instance ());
+  ACE_Event_Handler::register_stdin_handler (&thandler_,
+                               			ACE_Reactor::instance (),
+                               			ACE_Thread_Manager::instance ());
 
   // print the menu of options.
   this->display_menu ();
diff --git a/examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp b/examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp
index 1ac9b814492..7e37586b4fb 100644
--- a/examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp
+++ b/examples/Timer_Queue/Reactor_Timer_Queue_Test.dsp
@@ -85,7 +85,11 @@ LINK32=link.exe
 # Name "Reactor_Timer_Queue_Test - Win32 Debug"

 # Begin Source File

 

-SOURCE=.\Reactor_Timer_Queue.cpp

+SOURCE=.\main_reactor.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Reactor_Timer_Queue_Test.cpp

 # End Source File

 # End Target

 # End Project

diff --git a/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp b/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp
index ba10267c6b2..567b7d1ccae 100644
--- a/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp
+++ b/examples/Timer_Queue/Thread_Timer_Queue_Test.dsp
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -86,6 +86,10 @@ LINK32=link.exe
 # Name "Thread_Timer_Queue_Test - Win32 Debug"

 # Begin Source File

 

+SOURCE=.\main_thread.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Thread_Timer_Queue_Test.cpp

 # End Source File

 # End Target

diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index dec43fae5a1..68b07d322ef 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -120,9 +120,9 @@ Client_Test::open (void)
 {
   this->display_menu ();
 
-  if (ACE::register_stdin_handler (this,
-                                  ACE_Reactor::instance (),
-                                  ACE_Thread_Manager::instance ()) == -1)
+  if (ACE_Event_Handler::register_stdin_handler (this,
+						 ACE_Reactor::instance (),
+						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_stdin_handler"), -1);
   return 0;
 }
diff --git a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
index 91bcdecc75d..b165015dc0e 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
+++ b/netsvcs/clients/Naming/Dump_Restore/Dump_Restore.cpp
@@ -35,9 +35,9 @@ Dump_Restore::Dump_Restore (int argc, char *argv[])
 
   this->display_menu ();
 
-  if (ACE::register_stdin_handler (this,
-                                  ACE_Reactor::instance (),
-                                  ACE_Thread_Manager::instance ()) == -1)
+  if (ACE_Event_Handler::register_stdin_handler (this,
+						 ACE_Reactor::instance (),
+						 ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
 }