* sigproc.cc (wait_sig): Make sure that strace is activated on __SIGSTRACE by

calling new strace::activate function.
* strace.cc (strace::activate): Rename from strace::strace.
* strace.h (strace::activate): Define new function.
(strace::strace): Call activate.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5e8253c..734001f 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,13 @@
 2010-03-31  Christopher Faylor  <me+cygwin@cgf.cx>
 
+       * sigproc.cc (wait_sig): Make sure that strace is activated on
+       __SIGSTRACE by calling new strace::activate function.
+       * strace.cc (strace::activate): Rename from strace::strace.
+       * strace.h (strace::activate): Define new function.
+       (strace::strace): Call activate.
+
+2010-03-31  Christopher Faylor  <me+cygwin@cgf.cx>
+
        * fhandler.h (fhandler_base_overlapped): Temporarily (?) make
        select_pipe_info a friend until the fhandler_tty intertangling can be
        worked out.

diff --git a/winsup/cygwin/include/sys/strace.h b/winsup/cygwin/include/sys/strace.h
index 683cde0..376cf7a 100644 (file)
--- a/winsup/cygwin/include/sys/strace.h
+++ b/winsup/cygwin/include/sys/strace.h
@@ -39,7 +39,8 @@ class strace
   void write (unsigned category, const char *buf, int count);
   unsigned char _active;
 public:
-  strace ();
+  void activate ();
+  strace () {activate ();}
   int microseconds ();
   int version;
   int lmicrosec;

diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc
index cb70568..74e96ce 100644 (file)
--- a/winsup/cygwin/sigproc.cc
+++ b/winsup/cygwin/sigproc.cc
@@ -1224,6 +1224,7 @@ wait_sig (VOID *)
          talktome (&pack.si);
          break;
        case __SIGSTRACE:
+         strace.activate ();
          strace.hello ();
          break;
        case __SIGPENDING:

diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
index fb62e29..beba5b3 100644 (file)
--- a/winsup/cygwin/strace.cc
+++ b/winsup/cygwin/strace.cc
@@ -31,7 +31,8 @@ class strace NO_COPY strace;
 
 #ifndef NOSTRACE
 
-strace::strace ()
+void
+strace::activate ()
 {
   if (!dynamically_loaded && !_active && being_debugged ())
     {