.

7 files changed, 27 insertions, 49 deletions

diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index 26dfbf6229a..babecdf735e 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -706,7 +706,6 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::~ACE_Strategy_Acceptor
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
 ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_signal (int, siginfo_t *, ucontext_t *)
 {
-  ACE_TRACE ("ACE_Strategy_Acceptor::handle_signal");
   ACE_Reactor::end_event_loop ();
   return 0;
 }
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index 14577fd867c..f1b0cf59719 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -237,10 +237,11 @@ ACE_MMAP_Memory_Pool::map_file (off_t file_offset)
   if (this->mmap_.map (file_offset, PROT_RDWR,
                        this->flags_, this->base_addr_, 0, this->sa_) == -1
       || this->base_addr_ != 0 && this->mmap_.addr () != this->base_addr_)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) addr = %u, base_addr = %u, file_offset = %u, %p\n"),
-                      this->mmap_.addr (), this->base_addr_,
-                       file_offset, this->backing_store_name_), -1);
+    return -1;
+  // ACE_ERROR_RETURN ((LM_ERROR,
+  //                   ASYS_TEXT ("(%P|%t) addr = %u, base_addr = %u, file_offset = %u, %p\n"),
+  //                   this->mmap_.addr (), this->base_addr_,
+  //                   file_offset, this->backing_store_name_), -1);
 
   return 0;
 }
@@ -374,12 +375,8 @@ base_addr_ = (void *)temp;
 int
 ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *)
 {
-  ACE_TRACE ("ACE_MMAP_Memory_Pool::handle_signal");
-
   if (signum != SIGSEGV)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("(%P|%t) ignoring signal %S\n"),
-                       signum), -1);
+    return -1;
   else
     ; // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("(%P|%t) received %S\n"), signum));
 
@@ -393,8 +390,9 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
     {
       // ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr));
       if (this->remap ((void *) siginfo->si_addr) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n",
-                           siginfo->si_addr), -1);
+        return -1;
+      // ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n",
+      // siginfo->si_addr), -1);
       return 0;
     }
 #else
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 9bb266c5951..1e3d7569750 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -716,16 +716,20 @@ ACE_Proactor::handle_signal (int, siginfo_t *, ucontext_t *)
   ACE_Time_Value timeout (0, 0);
   int result = 0;
 
-  while (1)
+  for (;;)
     {
       result = this->handle_events (timeout);
+
       if (result != 0 || errno == ETIME)
         break;
     }
 
   // If our handle_events failed, we'll report a failure to the
   // Reactor.
-  return result == -1 ? -1 : 0;
+  if (result == -1)
+    return -1;
+  else
+    return 0;
 }
 
 int
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 9d1780e9edd..78637656ef0 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -629,17 +629,7 @@ ACE_Service_Config::handle_signal (int sig,
                                    siginfo_t *,
                                    ucontext_t *)
 {
-  ACE_TRACE ("ACE_Service_Config::handle_signal");
-
-  if (ACE_Service_Config::signum_ != sig)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("error, signal %S does match %S\n"),
-                sig,
-                ACE_Service_Config::signum_));
-  if (ACE::debug ())
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("signal %S occurred\n"),
-                sig));
+  ACE_ASSERT (ACE_Service_Config::signum_ == sig);
   ACE_Service_Config::reconfig_occurred_ = 1;
 }
 
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index 5fa21efae46..506c0ed74b6 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -143,17 +143,8 @@ ACE_Service_Manager::get_handle (void) const
 }
 
 int
-ACE_Service_Manager::handle_signal (int sig, siginfo_t *, ucontext_t *)
+ACE_Service_Manager::handle_signal (int, siginfo_t *, ucontext_t *)
 {
-#if defined (ACE_NLOGGING)
-  ACE_UNUSED_ARG (sig);
-#endif /* ACE_NLOGGING */
-
-  ACE_TRACE ("ACE_Service_Manager::handle_signal");
-  if (this->debug_)
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("got %S\n"),
-                sig));
   return 0;
 }
 
diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp
index 1a91e1cf1bd..4c79dfff68f 100644
--- a/ace/Timer_Queue_Adapters.cpp
+++ b/ace/Timer_Queue_Adapters.cpp
@@ -118,9 +118,6 @@ ACE_Async_Timer_Queue_Adapter<TQ>::handle_signal (int signum,
                                                   siginfo_t *,
                                                   ucontext_t *)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("handling signal %S\n"),
-              signum));
   switch (signum)
     {
     case SIGALRM:
@@ -131,15 +128,9 @@ ACE_Async_Timer_Queue_Adapter<TQ>::handle_signal (int signum,
         // @@ We need to figure out how to implement interval timers...
         expired_timers = this->timer_queue_.expire ();
 
-        if (expired_timers > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("time = %d, timers expired = %d\n"),
-                      ACE_OS::time (),
-                      expired_timers));
-
-        // Only schedule a new timer if there is one in the list.
-        // @@ This code should also become smarter to avoid
-        // unnecessary calls to ualarm().
+        // Only schedule a new timer if there is one in the list.  @@
+        // This code should also become smarter to avoid unnecessary
+        // calls to ualarm().
         if (this->timer_queue_.is_empty () == 0)
           return this->schedule_ualarm ();
         else
@@ -147,7 +138,10 @@ ACE_Async_Timer_Queue_Adapter<TQ>::handle_signal (int signum,
         /* NOTREACHED */
       }
     default:
-      ACE_ERROR_RETURN ((LM_ERROR, "unexpected signal %S\n", signum), -1);
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "unexpected signal %S\n",
+                         signum),
+                        -1);
       /* NOTREACHED */
     }
 }
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 62df0699342..ddb03e7d922 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -1847,7 +1847,9 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
 		  result = buffer->eh_->handle_exception (ACE_INVALID_HANDLE);
 		  break;
 		default:
-		  ACE_ERROR ((LM_ERROR, ASYS_TEXT ("invalid mask = %d\n"), buffer->mask_));
+		  ACE_ERROR ((LM_ERROR,
+                              ASYS_TEXT ("invalid mask = %d\n"),
+                              buffer->mask_));
 		  break;
 		}
 	      if (result == -1)