[llvm-branch-commits] [lldb] r182518 - Merging r182166:

[Bill Wendling]

Author: void
Date: Wed May 22 16:23:13 2013
New Revision: 182518

URL: http://llvm.org/viewvc/llvm-project?rev=182518&view=rev
Log:
Merging r182166:
------------------------------------------------------------------------
r182166 | mkopec | 2013-05-17 15:21:08 -0700 (Fri, 17 May 2013) | 3 lines

The Linux process plugin wasn't returning the correct linux signals. This fixes that.
Thus, this patch also negates a previous fix for handling SIGCHLD.

------------------------------------------------------------------------

Modified:
    lldb/branches/release_33/   (props changed)
    lldb/branches/release_33/source/Plugins/Process/Linux/ProcessLinux.h
    lldb/branches/release_33/source/Plugins/Process/Linux/ProcessMonitor.cpp

Propchange: lldb/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 22 16:23:13 2013
@@ -1,2 +1,2 @@
 /lldb/branches/apple/python-GIL:156467-162159
-/lldb/trunk:182066,182153
+/lldb/trunk:182066,182153,182166

Modified: lldb/branches/release_33/source/Plugins/Process/Linux/ProcessLinux.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_33/source/Plugins/Process/Linux/ProcessLinux.h?rev=182518&r1=182517&r2=182518&view=diff
==============================================================================
--- lldb/branches/release_33/source/Plugins/Process/Linux/ProcessLinux.h (original)
+++ lldb/branches/release_33/source/Plugins/Process/Linux/ProcessLinux.h Wed May 22 16:23:13 2013
@@ -75,6 +75,15 @@ public:
     EnablePluginLogging(lldb_private::Stream *strm,
                         lldb_private::Args &command);
 
+    //------------------------------------------------------------------
+    // Plug-in process overrides
+    //------------------------------------------------------------------
+    virtual lldb_private::UnixSignals &
+    GetUnixSignals ()
+    {
+        return m_linux_signals;
+    }
+
 private:
 
     /// Linux-specific signal set.

Modified: lldb/branches/release_33/source/Plugins/Process/Linux/ProcessMonitor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_33/source/Plugins/Process/Linux/ProcessMonitor.cpp?rev=182518&r1=182517&r2=182518&view=diff
==============================================================================
--- lldb/branches/release_33/source/Plugins/Process/Linux/ProcessMonitor.cpp (original)
+++ lldb/branches/release_33/source/Plugins/Process/Linux/ProcessMonitor.cpp Wed May 22 16:23:13 2013
@@ -1492,17 +1492,6 @@ ProcessMonitor::MonitorSignal(ProcessMon
         return ProcessMessage::Crash(pid, reason, signo, fault_addr);
     }
 
-    if (signo == SIGCHLD) {
-        assert(monitor);
-        // TODO: Implement tracing of inferiors' children
-        // If we fail to deliver the signal then create a message with the signal
-        if (!monitor->Resume(pid, signo)) {
-            assert(0 && "SIGCHLD delivery failed");
-            message = ProcessMessage::Signal(pid, signo);
-        }
-        return message;
-    }
-
     // Everything else is "normal" and does not require any special action on
     // our part.
     return ProcessMessage::Signal(pid, signo);