ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@uci.edu>

1 files changed, 60 insertions, 60 deletions

diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index dfc6a05f473..36298bd161d 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -219,14 +219,14 @@ int
 Svc_Handler::open (void *)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) opening Svc_Handler %d with handle %d\n"),
+              ACE_TEXT ("(%P|%t) opening Svc_Handler %d with handle %d\n"),
               this,
               this->peer ().get_handle ()));
   // Enable non-blocking I/O.
   if (this->peer ().enable (ACE_NONBLOCK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) %p\n"),
-                       ASYS_TEXT ("enable")),
+                       ACE_TEXT ("(%P|%t) %p\n"),
+                       ACE_TEXT ("enable")),
                       -1);
   return 0;
 }
@@ -235,7 +235,7 @@ int
 Svc_Handler::recycle (void *)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) recycling Svc_Handler %d with handle %d\n"),
+              ACE_TEXT ("(%P|%t) recycling Svc_Handler %d with handle %d\n"),
               this,
               this->peer ().get_handle ()));
   return 0;
@@ -249,8 +249,8 @@ Svc_Handler::send_data (void)
   for (char *c = ACE_ALPHABET; *c != '\0'; c++)
     if (this->peer ().send_n (c, 1) == -1)
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("(%P|%t) %p\n"),
-                  ASYS_TEXT ("send_n")));
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("send_n")));
 }
 
 void
@@ -273,8 +273,8 @@ Svc_Handler::recv_data (void)
                           handle_set,
                           0, 0, 0) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("(%P|%t) %p\n"),
-                    ASYS_TEXT ("select")));
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("select")));
       else
         {
           char c;
@@ -295,26 +295,26 @@ Svc_Handler::recv_data (void)
           if (r_bytes == 0)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ASYS_TEXT ("(%P|%t) reached end of input, connection closed by client\n")));
+                          ACE_TEXT ("(%P|%t) reached end of input, connection closed by client\n")));
 
               // Close endpoint handle (but don't close <this> yet
               // since we're going to recycle it for the next
               // iteration).
               if (new_stream.close () == -1)
                 ACE_ERROR ((LM_ERROR,
-                            ASYS_TEXT ("(%P|%t) %p\n"),
-                            ASYS_TEXT ("close")));
+                            ACE_TEXT ("(%P|%t) %p\n"),
+                            ACE_TEXT ("close")));
               break;
             }
           else if (r_bytes == -1)
             {
               if (errno == EWOULDBLOCK)
                 ACE_DEBUG ((LM_DEBUG,
-                            ASYS_TEXT ("(%P|%t) no input available, going back to reading\n")));
+                            ACE_TEXT ("(%P|%t) no input available, going back to reading\n")));
               else
                 ACE_ERROR ((LM_ERROR,
-                            ASYS_TEXT ("(%P|%t) %p\n"),
-                            ASYS_TEXT ("recv_n")));
+                            ACE_TEXT ("(%P|%t) %p\n"),
+                            ACE_TEXT ("recv_n")));
             }
         }
     }
@@ -326,8 +326,8 @@ Svc_Handler::close (u_long side)
   // Only run this protocol if we're the write-side (i.e., "1").
   if (side == 1 && this->peer ().close () == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("(%P|%t) %p\n"),
-                ASYS_TEXT ("close_writer")));
+                ACE_TEXT ("(%P|%t) %p\n"),
+                ACE_TEXT ("close_writer")));
   // Trigger the shutdown.
   return this->handle_close ();
 }
@@ -336,7 +336,7 @@ int
 Svc_Handler::idle (u_long flags)
 {
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) idling Svc_Handler %d with handle %d\n"),
+              ACE_TEXT ("(%P|%t) idling Svc_Handler %d with handle %d\n"),
               this,
               this->peer ().get_handle ()));
   return ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::idle (flags);
@@ -360,8 +360,8 @@ timed_blocking_connect (CONNECTOR &con,
                    server_addr,
                    options) == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("(%P|%t) %p\n"),
-                ASYS_TEXT ("connection failed")));
+                ACE_TEXT ("(%P|%t) %p\n"),
+                ACE_TEXT ("connection failed")));
   else
     {
       // Send the data to the server.
@@ -370,8 +370,8 @@ timed_blocking_connect (CONNECTOR &con,
       // Close the connection completely.
       if (svc_handler->close (1) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("(%P|%t) %p\n"),
-                    ASYS_TEXT ("close")));
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("close")));
     }
 }
 
@@ -387,8 +387,8 @@ blocking_connect (CONNECTOR &con,
   if (con.connect (svc_handler,
                    server_addr) == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("(%P|%t) %p\n"),
-                ASYS_TEXT ("connection failed")));
+                ACE_TEXT ("(%P|%t) %p\n"),
+                ACE_TEXT ("connection failed")));
   else
     {
       // Send the data to the server.
@@ -397,8 +397,8 @@ blocking_connect (CONNECTOR &con,
       // Close the connection completely.
       if (svc_handler->close (1) == -1)
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("(%P|%t) %p\n"),
-                    ASYS_TEXT ("close")));
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("close")));
     }
 }
 
@@ -422,8 +422,8 @@ cached_connect (STRAT_CONNECTOR &con,
                        server_addr) == -1)
         {
           ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("(%P|%t) %p\n"),
-                      ASYS_TEXT ("connection failed")));
+                      ACE_TEXT ("(%P|%t) %p\n"),
+                      ACE_TEXT ("connection failed")));
           return;
         }
 
@@ -467,7 +467,7 @@ client_connections (void *arg)
 
   // Run the timed-blocking test.
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) **** starting timed-blocking connect\n")));
+              ACE_TEXT ("(%P|%t) **** starting timed-blocking connect\n")));
   timed_blocking_connect (*info->connector_,
                           *info->server_addr_);
 
@@ -478,7 +478,7 @@ client_connections (void *arg)
 
   // Run the blocking test.
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) **** starting blocking connect\n")));
+              ACE_TEXT ("(%P|%t) **** starting blocking connect\n")));
   blocking_connect (*info->connector_,
                     *info->server_addr_);
 
@@ -489,7 +489,7 @@ client_connections (void *arg)
 
   // Run the cached blocking test.
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) **** starting cached blocking connect\n")));
+              ACE_TEXT ("(%P|%t) **** starting cached blocking connect\n")));
   cached_connect (*info->strat_connector_,
                   *info->server_addr_);
   return 0;
@@ -534,8 +534,8 @@ client (void *arg)
        (void *) &info,
        THR_NEW_LWP) == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("(%P|%t) %p\n%a"),
-                ASYS_TEXT ("client thread spawn failed")));
+                ACE_TEXT ("(%P|%t) %p\n%a"),
+                ACE_TEXT ("client thread spawn failed")));
 
   // Wait for the threads to exit.
   client_manager.wait ();
@@ -553,7 +553,7 @@ server (void *arg)
 {
 #if defined (VXWORKS)
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) server stack size is %u\n"),
+              ACE_TEXT ("(%P|%t) server stack size is %u\n"),
               ACE_OS::thr_min_stack ()));
 #endif /* VXWORKS */
 
@@ -593,17 +593,17 @@ server (void *arg)
           if (errno == ETIMEDOUT)
             {
               ACE_DEBUG ((LM_DEBUG,
-                          ASYS_TEXT ("accept timed out\n")));
+                          ACE_TEXT ("accept timed out\n")));
               return 0;
             }
           else
             ACE_ERROR_RETURN ((LM_ERROR,
-                               ASYS_TEXT ("(%P|%t) %p\n"),
-                               ASYS_TEXT ("accept failed, shutting down")),
+                               ACE_TEXT ("(%P|%t) %p\n"),
+                               ACE_TEXT ("accept failed, shutting down")),
                               0);
         }
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) client %s connected from %d\n"),
+                  ACE_TEXT ("(%P|%t) client %s connected from %d\n"),
                   cli_addr.get_host_name (),
                   cli_addr.get_port_number ()));
 
@@ -639,13 +639,13 @@ spawn_processes (ACCEPTOR *acceptor,
   // on the same port number for clients to connect.
   for (i = 0; i < n_servers; i++)
     {
-      pid_t pid = ACE_OS::fork (ASYS_TEXT ("child"));
+      pid_t pid = ACE_OS::fork (ACE_TEXT ("child"));
       switch (pid)
         {
         case -1:
           ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("(%P|%t) %p\n%a"),
-                      ASYS_TEXT ("fork failed")));
+                      ACE_TEXT ("(%P|%t) %p\n%a"),
+                      ACE_TEXT ("fork failed")));
           ACE_OS::exit (-1);
           /* NOTREACHED */
         case 0:             // In the child.
@@ -670,7 +670,7 @@ spawn_processes (ACCEPTOR *acceptor,
     // Shutdown the servers.
     if (ACE_OS::kill (children[i], SIGTERM) == -1)
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("(%P|%t) %p for %d\n"),
+                  ACE_TEXT ("(%P|%t) %p for %d\n"),
                   children[i]));
 
   pid_t child;
@@ -680,7 +680,7 @@ spawn_processes (ACCEPTOR *acceptor,
       child = ACE_OS::wait ();
       if (child != -1)
         ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("(%P|%t) reaping %d\n"),
+                    ACE_TEXT ("(%P|%t) reaping %d\n"),
                     child));
     }
   while (child != -1);
@@ -720,9 +720,9 @@ spawn_threads (ACCEPTOR *acceptor,
 
   for (i = 0; i < n_servers; ++i)
     {
-      ACE_NEW_RETURN (server_name[i], ASYS_TCHAR[32], -1);
+      ACE_NEW_RETURN (server_name[i], ACE_TCHAR[32], -1);
       ACE_OS::sprintf (server_name[i],
-                       ASYS_TEXT ("server%u"),
+                       ACE_TEXT ("server%u"),
                        i);
       stack_size[i] = 40000;
       ACE_NEW_RETURN (stack[i], char[stack_size[i]], -1);
@@ -731,7 +731,7 @@ spawn_threads (ACCEPTOR *acceptor,
       ACE_OS::memset (stack[i], 0xEE, stack_size[i]);
     }
 
-  ASYS_TCHAR *client_name = ASYS_TEXT ("Conn client");
+  ACE_TCHAR *client_name = ACE_TEXT ("Conn client");
 #endif /* VXWORKS */
 
   if (ACE_Thread_Manager::instance ()->spawn_n
@@ -755,8 +755,8 @@ spawn_threads (ACCEPTOR *acceptor,
 #endif /* VXWORKS */
        ) == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("(%P|%t) %p\n%a"),
-                ASYS_TEXT ("server thread create failed")));
+                ACE_TEXT ("(%P|%t) %p\n%a"),
+                ACE_TEXT ("server thread create failed")));
 
   if (ACE_Thread_Manager::instance ()->spawn
       ((ACE_THR_FUNC) client,
@@ -767,8 +767,8 @@ spawn_threads (ACCEPTOR *acceptor,
 #endif /* VXWORKS */
        ) == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("(%P|%t) %p\n%a"),
-                ASYS_TEXT ("client thread create failed")));
+                ACE_TEXT ("(%P|%t) %p\n%a"),
+                ACE_TEXT ("client thread create failed")));
 
   // Wait for the threads to exit.
   // But, wait for a limited time because sometimes the test hangs on Irix.
@@ -778,10 +778,10 @@ spawn_threads (ACCEPTOR *acceptor,
     {
       if (errno == ETIME)
         ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("maximum wait time of %d msec exceeded\n"),
+                    ACE_TEXT ("maximum wait time of %d msec exceeded\n"),
                                max_wait.msec ()));
       else
-        ACE_OS::perror (ASYS_TEXT ("wait"));
+        ACE_OS::perror (ACE_TEXT ("wait"));
 
       status = -1;
     }
@@ -802,12 +802,12 @@ spawn_threads (ACCEPTOR *acceptor,
 #endif /* ! ACE_LACKS_FORK && ACE_HAS_THREADS */
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
-  ACE_START_TEST (ASYS_TEXT ("Conn_Test"));
+  ACE_START_TEST (ACE_TEXT ("Conn_Test"));
   int status = 0;
 
-  ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("c:i:s:"));
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("c:i:s:"));
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
@@ -831,28 +831,28 @@ main (int argc, ASYS_TCHAR *argv[])
       || acceptor.acceptor ().get_local_addr (server_addr) == -1)
     {
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("(%P|%t) %p\n"),
-                  ASYS_TEXT ("open")));
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("open")));
       ACE_ASSERT (0);
     }
   else
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("(%P|%t) starting server at port %d\n"),
+                  ACE_TEXT ("(%P|%t) starting server at port %d\n"),
                   server_addr.get_port_number ()));
 
 #if !defined (ACE_LACKS_FORK)
       if (spawn_processes (&acceptor,
                            &server_addr) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("(%P|%r) %p\n"),
-                           ASYS_TEXT ("spawn_processes")),
+                           ACE_TEXT ("(%P|%r) %p\n"),
+                           ACE_TEXT ("spawn_processes")),
                           1);
 #elif defined (ACE_HAS_THREADS)
       status = spawn_threads (&acceptor, &server_addr);
 #else  /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */
       ACE_ERROR ((LM_ERROR,
-                  ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"),
+                  ACE_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"),
                   1));
 #endif /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */
     }