diff options
Diffstat (limited to 'netsvcs/lib')
| -rw-r--r-- | netsvcs/lib/Client_Logging_Handler.cpp | 8 | ||||
| -rw-r--r-- | netsvcs/lib/Logging_Strategy.cpp | 15 | ||||
| -rw-r--r-- | netsvcs/lib/Name_Handler.cpp | 4 | ||||
| -rw-r--r-- | netsvcs/lib/Server_Logging_Handler.cpp | 4 | ||||
| -rw-r--r-- | netsvcs/lib/TS_Clerk_Handler.cpp | 31 | ||||
| -rw-r--r-- | netsvcs/lib/TS_Server_Handler.cpp | 2 | ||||
| -rw-r--r-- | netsvcs/lib/Token_Handler.cpp | 14 |
7 files changed, 29 insertions, 49 deletions
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp index fb05f51847b..746f6d6a130 100644 --- a/netsvcs/lib/Client_Logging_Handler.cpp +++ b/netsvcs/lib/Client_Logging_Handler.cpp @@ -87,7 +87,7 @@ ACE_Client_Logging_Handler::ACE_Client_Logging_Handler (const char rendezvous[]) // This is called when a <send> to the logging server fails... int -ACE_Client_Logging_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) +ACE_Client_Logging_Handler::handle_signal (int, siginfo_t *, ucontext_t *) { ACE_TRACE ("ACE_Client_Logging_Connector::handle_signal"); // return 0; @@ -175,7 +175,7 @@ ACE_Client_Logging_Handler::close (u_long) } int -ACE_Client_Logging_Handler::handle_output (ACE_HANDLE handle) +ACE_Client_Logging_Handler::handle_output (ACE_HANDLE) { return 0; } @@ -355,7 +355,7 @@ ACE_Client_Logging_Connector::resume (void) // Signal the server to shutdown gracefully. int -ACE_Client_Logging_Connector::handle_signal (int signum, siginfo_t *, ucontext_t *) +ACE_Client_Logging_Connector::handle_signal (int, siginfo_t *, ucontext_t *) { ACE_TRACE ("ACE_Client_Logging_Connector::handle_signal"); ACE_Service_Config::end_reactor_event_loop (); @@ -369,5 +369,5 @@ ACE_Client_Logging_Connector::handle_signal (int signum, siginfo_t *, ucontext_t ACE_SVC_FACTORY_DEFINE (ACE_Client_Logging_Connector) #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Connector<ACE_Client_Logging_Handler, ACE_SOCK_Connector, ACE_INET_Addr>; +template class ACE_Connector<ACE_Client_Logging_Handler, ACE_SOCK_CONNECTOR>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/netsvcs/lib/Logging_Strategy.cpp b/netsvcs/lib/Logging_Strategy.cpp index 43cea9ae7d7..e00171333e4 100644 --- a/netsvcs/lib/Logging_Strategy.cpp +++ b/netsvcs/lib/Logging_Strategy.cpp @@ -64,7 +64,6 @@ ACE_Logging_Strategy::parse_args (int argc, char *argv[]) { ACE_TRACE ("ACE_Logging_Strategy::parse_args"); char *temp; - u_long flag = 0; this->flags_ = 0; this->filename_ = ACE_DEFAULT_LOGFILE; @@ -129,17 +128,3 @@ ACE_Logging_Strategy::init (int argc, char *argv[]) // svc.conf file to dynamically initialize the state of the Logging_Strategy. ACE_SVC_FACTORY_DEFINE (ACE_Logging_Strategy) - -#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Strategy_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_Acceptor, ACE_INET_Addr>; -template class ACE_Schedule_All_Reactive_Strategy<ACE_TS_Server_Handler>; -#if defined (ACE_HAS_THREADS) -template class ACE_Svc_Handler<ACE_SOCK_Stream, ACE_INET_Addr, ACE_Null_Mutex, ACE_Null_Condition_Mutex>; -template class ACE_Task<ACE_Null_Mutex, ACE_Null_Condition_Mutex>; -template class ACE_Message_Queue<ACE_Null_Mutex, ACE_Null_Condition_Mutex>; -template class ACE_Module<ACE_Null_Mutex, ACE_Null_Condition_Mutex>; -template class ACE_Task_Exit<ACE_Null_Mutex, ACE_Null_Condition_Mutex>; -template class ACE_TSS<ACE_Task_Exit<ACE_Null_Mutex, ACE_Null_Condition_Mutex> >; -template class ACE_Thru_Task<ACE_Null_Mutex, ACE_Null_Condition_Mutex>; -#endif -#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp index 6cdc57f2e2a..09daccbbc7e 100644 --- a/netsvcs/lib/Name_Handler.cpp +++ b/netsvcs/lib/Name_Handler.cpp @@ -445,7 +445,7 @@ ACE_Name_Handler::recv_request (void) ssize_t length = ntohl (this->name_request_.length ()); // Do a sanity check on the length of the message. - if (length > sizeof this->name_request_) + if (length > (ssize_t) sizeof this->name_request_) { ACE_ERROR ((LM_ERROR, "length %d too long\n", length)); return this->abandon (); @@ -733,6 +733,6 @@ ACE_Name_Handler::~ACE_Name_Handler (void) } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOCK_Acceptor, ACE_INET_Addr>; +template class ACE_Strategy_Acceptor<ACE_Name_Handler, ACE_SOCK_ACCEPTOR>; template class ACE_Schedule_All_Reactive_Strategy<ACE_Name_Handler>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp index 1dd2be38b3d..a6a812452f0 100644 --- a/netsvcs/lib/Server_Logging_Handler.cpp +++ b/netsvcs/lib/Server_Logging_Handler.cpp @@ -446,8 +446,8 @@ ACE_Thr_Server_Logging_Handler::svc (void) #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) template class ACE_Strategy_Acceptor<ACE_Thr_Server_Logging_Handler, LOGGING_PEER_ACCEPTOR>; template class ACE_Schedule_All_Threaded_Strategy<ACE_Thr_Server_Logging_Handler>; -template class ACE_Strategy_Acceptor<ACE_Server_Logging_Handler<LOGGING_PEER_STREAM, unsigned long, ACE_Null_Mutex, ACE_Null_Condition_Mutex>, LOGGING_PEER_ACCEPTOR>; -template class ACE_Schedule_All_Reactive_Strategy<ACE_Server_Logging_Handler<LOGGING_PEER_STREAM, unsigned long, ACE_Null_Mutex, ACE_Null_Condition_Mutex> >; +template class ACE_Strategy_Acceptor<ACE_Server_Logging_Handler<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH>, LOGGING_PEER_ACCEPTOR>; +template class ACE_Schedule_All_Reactive_Strategy<ACE_Server_Logging_Handler<LOGGING_PEER_STREAM, u_long, ACE_NULL_SYNCH> >; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/netsvcs/lib/TS_Clerk_Handler.cpp b/netsvcs/lib/TS_Clerk_Handler.cpp index 1128fffc94e..bac46bb603e 100644 --- a/netsvcs/lib/TS_Clerk_Handler.cpp +++ b/netsvcs/lib/TS_Clerk_Handler.cpp @@ -185,7 +185,7 @@ private: int update_time (); // Update delta_time using times obtained from all servers - typedef ACE_Malloc <ACE_MMAP_Memory_Pool, ACE_Null_Mutex> MALLOC; + typedef ACE_Malloc <ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC; typedef ACE_Allocator_Adapter<MALLOC> ALLOCATOR; ALLOCATOR *shmem_; // Allocator (used for reading/writing system time from/to shared memory) @@ -223,11 +223,11 @@ private: ACE_TS_Clerk_Handler::ACE_TS_Clerk_Handler (ACE_TS_Clerk_Processor *processor, ACE_INET_Addr &addr) -: processor_ (processor), - remote_addr_ (addr), - state_ (ACE_TS_Clerk_Handler::IDLE), +: state_ (ACE_TS_Clerk_Handler::IDLE), timeout_ (ACE_DEFAULT_TIMEOUT), - max_timeout_ (ACE_TS_Clerk_Handler::MAX_RETRY_TIMEOUT) + max_timeout_ (ACE_TS_Clerk_Handler::MAX_RETRY_TIMEOUT), + remote_addr_ (addr), + processor_ (processor) { ACE_TRACE ("ACE_TS_Clerk_Handler::ACE_TS_Clerk_Handler"); this->time_info_.delta_time_ = 0; @@ -236,7 +236,7 @@ ACE_TS_Clerk_Handler::ACE_TS_Clerk_Handler (ACE_TS_Clerk_Processor *processor, // This is called when a <send> to a server fails... int -ACE_TS_Clerk_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *) +ACE_TS_Clerk_Handler::handle_signal (int, siginfo_t *, ucontext_t *) { ACE_TRACE ("ACE_TS_Clerk_Handler::handle_signal"); return 0; @@ -376,7 +376,7 @@ ACE_TS_Clerk_Handler::reinitiate_connection (void) // Receive a time update from a server int -ACE_TS_Clerk_Handler::handle_input (ACE_HANDLE handle) +ACE_TS_Clerk_Handler::handle_input (ACE_HANDLE) { ACE_TRACE ("ACE_TS_Clerk_Handler::handle_input"); // We're getting a time update message from a server @@ -405,8 +405,8 @@ ACE_TS_Clerk_Handler::handle_input (ACE_HANDLE handle) // Restart connection asynchronously when timeout occurs. int -ACE_TS_Clerk_Handler::handle_timeout (const ACE_Time_Value &tv, - const void *arg) +ACE_TS_Clerk_Handler::handle_timeout (const ACE_Time_Value &, + const void *) { ACE_TRACE ("ACE_TS_Clerk_Handler::handle_timeout"); ACE_DEBUG ((LM_DEBUG, @@ -535,8 +535,8 @@ ACE_TS_Clerk_Processor::alloc (void) // Query the servers for the latest time int -ACE_TS_Clerk_Processor::handle_timeout (const ACE_Time_Value &tv, - const void *arg) +ACE_TS_Clerk_Processor::handle_timeout (const ACE_Time_Value &, + const void *) { ACE_TRACE ("ACE_TS_Clerk_Processor::handle_timeout"); return this->update_time (); @@ -632,7 +632,7 @@ ACE_TS_Clerk_Processor::fini (void) } int -ACE_TS_Clerk_Processor::info (char **strp, size_t length) const +ACE_TS_Clerk_Processor::info (char **, size_t) const { ACE_TRACE ("ACE_TS_Clerk_Processor::info"); return 0; @@ -652,9 +652,6 @@ ACE_TS_Clerk_Processor::init (int argc, char *argv[]) // Ignore SIPPIPE so each Output_Channel can handle it. ACE_Sig_Action sig (ACE_SignalHandler (SIG_IGN), SIGPIPE); -// ACE_Sig_Set sig_set; -// sig_set.sig_add (SIGINT); - // Register ourselves to receive SIGINT and SIGPIPE // so we can shut down gracefully via signals. if (ACE_Service_Config::reactor ()->register_handler (SIGINT, @@ -809,7 +806,7 @@ ACE_TS_Clerk_Processor::resume (void) // Signal the server to shutdown gracefully. int -ACE_TS_Clerk_Processor::handle_signal (int signum, siginfo_t *, ucontext_t *) +ACE_TS_Clerk_Processor::handle_signal (int, siginfo_t *, ucontext_t *) { ACE_TRACE ("ACE_TS_Clerk_Processor::handle_signal"); ACE_Service_Config::end_reactor_event_loop (); @@ -822,5 +819,5 @@ ACE_TS_Clerk_Processor::handle_signal (int signum, siginfo_t *, ucontext_t *) ACE_SVC_FACTORY_DEFINE (ACE_TS_Clerk_Processor) #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Connector<ACE_TS_Clerk_Handler, ACE_SOCK_Connector, ACE_INET_Addr>; +template class ACE_Connector<ACE_TS_Clerk_Handler, ACE_SOCK_CONNECTOR>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/netsvcs/lib/TS_Server_Handler.cpp b/netsvcs/lib/TS_Server_Handler.cpp index da683b92439..848a18016bf 100644 --- a/netsvcs/lib/TS_Server_Handler.cpp +++ b/netsvcs/lib/TS_Server_Handler.cpp @@ -319,6 +319,6 @@ ACE_TS_Server_Handler::~ACE_TS_Server_Handler (void) } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Strategy_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_Acceptor, ACE_INET_Addr>; +template class ACE_Strategy_Acceptor<ACE_TS_Server_Handler, ACE_SOCK_ACCEPTOR>; template class ACE_Schedule_All_Reactive_Strategy<ACE_TS_Server_Handler>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp index 1208cdbd1a7..daf8486e534 100644 --- a/netsvcs/lib/Token_Handler.cpp +++ b/netsvcs/lib/Token_Handler.cpp @@ -104,13 +104,13 @@ private: // Keeps track of the synchronization options (i.e., the timeout // interval). + ACE_Token_Collection collection_; + // collection of the client's token proxies. + int timeout_id_; // ID returned by the Reactor that is used to kill registered timers // when a token operation times out. - ACE_Token_Collection collection_; - // collection of the client's token proxies. - ACE_Token_Request token_request_; // Cache request from the client. @@ -341,7 +341,7 @@ ACE_Token_Handler::send_reply (ACE_UINT32 err) n = this->peer ().send (buf, len); - if (n != len) + if (n != (ssize_t) len) ACE_ERROR_RETURN ((LM_ERROR, "%p, expected len = %d, actual len = %d\n", "send failed", len, n), -1); @@ -645,7 +645,7 @@ ACE_Token_Handler::recv_request (void) ssize_t length = this->token_request_.length (); // Do a sanity check on the length of the message. - if (length > sizeof this->token_request_) + if (length > (ssize_t) sizeof this->token_request_) { ACE_ERROR ((LM_ERROR, "length %d too long\n", length)); return this->abandon (1); @@ -875,8 +875,6 @@ ACE_TS_WLock::clone (void) const } #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION) -template class ACE_Strategy_Acceptor<ACE_Token_Handler, ACE_SOCK_Acceptor, ACE_INET_Addr>; +template class ACE_Strategy_Acceptor<ACE_Token_Handler, ACE_SOCK_ACCEPTOR>; template class ACE_Schedule_All_Reactive_Strategy<ACE_Token_Handler>; #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */ - - |