Commit 4b65dbc3 authored by Bill Wendling's avatar Bill Wendling
Browse files

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.

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

llvm-svn: 182518
parent 6ed251ef

lldb/source/Plugins/Process/Linux/ProcessLinux.h

+9 −0
Original line number Diff line number Diff line
@@ -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.

lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp

+0 −11
Original line number Diff line number Diff line
@@ -1492,17 +1492,6 @@ ProcessMonitor::MonitorSignal(ProcessMonitor *monitor, 
        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);