diff options
Diffstat (limited to 'netsvcs/lib/TS_Server_Handler.cpp')
| -rw-r--r-- | netsvcs/lib/TS_Server_Handler.cpp | 80 |
1 files changed, 38 insertions, 42 deletions
diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp index d0a87fd4c84..74745f9d362 100644 --- a/netsvcs/lib/TS_Server_Handler.cpp +++ b/netsvcs/lib/TS_Server_Handler.cpp @@ -38,15 +38,15 @@ template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ int -ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) +ACE_TS_Server_Acceptor::parse_args (int argc, char *argv[]) { ACE_TRACE ("ACE_TS_Server_Acceptor::parse_args"); int service_port = ACE_DEFAULT_SERVER_PORT; - ACE_LOG_MSG->open (ACE_TEXT ("Time Service")); + ACE_LOG_MSG->open ("Time Service"); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0); + ACE_Get_Opt get_opt (argc, argv, "p:", 0); for (int c; (c = get_opt ()) != -1; ) { @@ -57,7 +57,7 @@ ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) break; default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n:\n[-p server-port]\n"), 1), + "%n:\n[-p server-port]\n%a", 1), -1); } } @@ -66,9 +66,9 @@ ACE_TS_Server_Acceptor::parse_args (int argc, ACE_TCHAR *argv[]) } int -ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[]) +ACE_TS_Server_Acceptor::init (int argc, char *argv[]) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Acceptor::init")); + ACE_TRACE ("ACE_TS_Server_Acceptor::init"); // Use the options hook to parse the command line arguments and set // options. @@ -79,11 +79,10 @@ ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[]) if (this->open (this->service_addr_, ACE_Reactor::instance (), 0, 0, 0, &this->scheduling_strategy_, - ACE_TEXT ("Time Server"), - ACE_TEXT ("ACE time service")) == -1) + "Time Server", "ACE time service") == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%n: %p on port %d\n"), - ACE_TEXT ("acceptor::open failed"), + "%n: %p on port %d\n", + "acceptor::open failed", this->service_addr_.get_port_number ()), -1); @@ -97,14 +96,14 @@ ACE_TS_Server_Acceptor::init (int argc, ACE_TCHAR *argv[]) // Figure out what port we're really bound to. if (this->acceptor ().get_local_addr (server_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_local_addr")), + "%p\n", + "get_local_addr"), -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("starting up Time Server at port %d on handle %d\n"), - server_addr.get_port_number (), - this->acceptor ().get_handle ())); + "starting up Time Server at port %d on handle %d\n", + server_addr.get_port_number (), + this->acceptor ().get_handle ())); return 0; } @@ -117,7 +116,7 @@ ACE_SVC_FACTORY_DEFINE (ACE_TS_Server_Acceptor) ACE_TS_Server_Handler::ACE_TS_Server_Handler (ACE_Thread_Manager *tm) : ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> (tm) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::ACE_TS_Server_Handler")); + ACE_TRACE ("ACE_TS_Server_Handler::ACE_TS_Server_Handler"); } // Activate this instance of the ACE_TS_Server_Handler (called by the @@ -126,27 +125,27 @@ ACE_TS_Server_Handler::ACE_TS_Server_Handler (ACE_Thread_Manager *tm) /* VIRTUAL */ int ACE_TS_Server_Handler::open (void *) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::open")); + ACE_TRACE ("ACE_TS_Server_Handler::open"); ACE_INET_Addr client_addr; // Determine the address of the client and display it. if (this->peer ().get_remote_addr (client_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("get_remote_addr")), + "%p\n", + "get_remote_addr"), -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) accepted connection from host %s on fd %d\n"), + "(%t) accepted connection from host %s on fd %d\n", client_addr.get_host_name (), this->peer ().get_handle ())); // Call down to our parent to register ourselves with the Reactor. if (ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::open (0) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("open")), + "%p\n", + "open"), -1); return 0; } @@ -154,22 +153,22 @@ ACE_TS_Server_Handler::open (void *) /* VIRTUAL */ int ACE_TS_Server_Handler::send_request (ACE_Time_Request &request) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::send_request")); + ACE_TRACE ("ACE_TS_Server_Handler::send_request"); void *buffer; ssize_t length = request.encode (buffer); if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("encode failed")), + "%p\n", + "encode failed"), -1); // Transmit request via a blocking send. if (this->peer ().send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("send_n failed")), + "%p\n", + "send_n failed"), -1); return 0; } @@ -180,7 +179,7 @@ ACE_TS_Server_Handler::send_request (ACE_Time_Request &request) /* VIRTUAL */ int ACE_TS_Server_Handler::abandon (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::abandon")); + ACE_TRACE ("ACE_TS_Server_Handler::abandon"); // Note we are using the time field to report the errno in case of // failure. @@ -192,7 +191,7 @@ ACE_TS_Server_Handler::abandon (void) /* VIRTUAL */ int ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::handle_timeout")); + ACE_TRACE ("ACE_TS_Server_Handler::handle_timeout"); return this->abandon (); } @@ -201,7 +200,7 @@ ACE_TS_Server_Handler::handle_timeout (const ACE_Time_Value &, const void *) /* VIRTUAL */ ACE_HANDLE ACE_TS_Server_Handler::get_handle (void) const { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::get_handle")); + ACE_TRACE ("ACE_TS_Server_Handler::get_handle"); return this->peer ().get_handle (); } @@ -210,7 +209,7 @@ ACE_TS_Server_Handler::get_handle (void) const /* VIRTUAL */ int ACE_TS_Server_Handler::dispatch (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::dispatch")); + ACE_TRACE ("ACE_TS_Server_Handler::dispatch"); // Get the system time and then create an ACE_Time_Request time_t t = ACE_OS::time (0); ACE_Time_Request rq (ACE_Time_Request::TIME_UPDATE, t); @@ -223,7 +222,7 @@ ACE_TS_Server_Handler::dispatch (void) /* VIRTUAL */ int ACE_TS_Server_Handler::recv_request (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::recv_request")); + ACE_TRACE ("ACE_TS_Server_Handler::recv_request"); ssize_t bytes_expected = this->time_request_.size (); // Since Time_Request messages are fixed size, read the entire @@ -235,12 +234,11 @@ ACE_TS_Server_Handler::recv_request (void) { case -1: /* FALLTHROUGH */ - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("****************** recv_request returned -1\n"))); + ACE_DEBUG ((LM_DEBUG, "****************** recv_request returned -1\n")); default: ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p got %d bytes, expected %d bytes\n"), - ACE_TEXT ("recv failed"), + "%p got %d bytes, expected %d bytes\n", + "recv failed", n, bytes_expected)); /* FALLTHROUGH */ @@ -257,9 +255,7 @@ ACE_TS_Server_Handler::recv_request (void) // Decode the request into host byte order. if (this->time_request_.decode () == -1) { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("%p\n"), - ACE_TEXT ("decode failed"))); + ACE_ERROR ((LM_ERROR, "%p\n", "decode failed")); return this->abandon (); } } @@ -272,7 +268,7 @@ ACE_TS_Server_Handler::recv_request (void) /* VIRTUAL */ int ACE_TS_Server_Handler::handle_input (ACE_HANDLE) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::handle_input")); + ACE_TRACE ("ACE_TS_Server_Handler::handle_input"); if (this->recv_request () == -1) return -1; @@ -282,8 +278,8 @@ ACE_TS_Server_Handler::handle_input (ACE_HANDLE) ACE_TS_Server_Handler::~ACE_TS_Server_Handler (void) { - ACE_TRACE (ACE_TEXT ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler")); + ACE_TRACE ("ACE_TS_Server_Handler::~ACE_TS_Server_Handler"); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("closing down Handle %d\n"), + "closing down Handle %d\n", this->get_handle ())); } |