foo

1 files changed, 12 insertions, 15 deletions

diff --git a/examples/Service_Configurator/IPC-tests/server/server_test.cpp b/examples/Service_Configurator/IPC-tests/server/server_test.cpp
index f65523d956d..451f178e256 100644
--- a/examples/Service_Configurator/IPC-tests/server/server_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/server_test.cpp
@@ -1,31 +1,28 @@
-/* The main test driver for the dynamically configured server. */
 // $Id$
 
+// The main test driver for the dynamically configured server.
 
 #include "ace/Service_Config.h"
 
-sig_atomic_t finished = 0;
-
-static void
-handler (int)
-{
-  finished = 1;
-}
-
 int
 main (int argc, char *argv[])
 {
   ACE_Service_Config server_test;
 
-  ACE_Sig_Action sig ((ACE_SignalHandler) handler, SIGINT);
-
   if (server_test.open (argc, argv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "server_test.open"), -1);
 
-  for (;;)
-    if (server_test.run_reactor_event_loop () == -1 && finished)
-      break;
+  // Create an adapter to end the event loop.
+  ACE_Sig_Adapter sa (ACE_Sig_Handler_Ex (ACE_Service_Config::end_reactor_event_loop));
+
+  // Register a signal handler.
+  ACE_Service_Config::reactor ()->register_handler (SIGINT, sa);
+
+  // Run forever, performing the configured services until we are shut
+  // down by a SIGINT/SIGQUIT signal.
+
+  while (server_test.reactor_event_loop_done () == 0)
+    server_test.run_reactor_event_loop ();
 
-  /* NOTREACHED */
   return 0;
 }