* exceptions.cc (set_process_mask_delta): Conditionalize debugging output.

* sigproc.cc (proc_subproc): Make strace output a little more verbose.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 7d127a0..29e6595 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,11 @@
 2005-08-28  Christopher Faylor  <cgf@timesys.com>
 
+       * exceptions.cc (set_process_mask_delta): Conditionalize debugging
+       output.
+       * sigproc.cc (proc_subproc): Make strace output a little more verbose.
+
+2005-08-28  Christopher Faylor  <cgf@timesys.com>
+
        * cygtls.h (__ljfault): Declare.
        (_cygtls::return_from_fault): Use __ljfault.
        * exceptions.cc (set_signal_mask): Revert previous checkin.

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index eaad588..852b501 100644 (file)
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -978,8 +978,10 @@ set_process_mask_delta ()
 extern "C" void __stdcall
 set_signal_mask (sigset_t newmask, sigset_t& oldmask)
 {
+#ifdef CGF
   if (GetCurrentThreadId () == sigtid)
     small_printf ("********* waiting in signal thread\n");
+#endif
   mask_sync.acquire (INFINITE);
   newmask &= ~SIG_NONMASKABLE;
   sigset_t mask_bits = oldmask & ~newmask;

diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index 382b226..74ffed1 100644 (file)
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -306,7 +306,7 @@ proc_subproc (DWORD what, DWORD val)
       if (val)
        sigproc_printf ("clear waiting threads");
       else
-       sigproc_printf ("looking for processes to reap");
+       sigproc_printf ("looking for processes to reap, nprocs %d", nprocs);
       clearing = val;
 
     scan_wait: