Patch #1882 2007-02-11 20:20
pecan
Debugging Console for Linux- Download
- 1882-Debugging_Cons.patch (6.8 KB)
Index: debuggergdb.cpp
===================================================================
--- debuggergdb.cpp (revision 3676)
+++ debuggergdb.cpp (working copy)
@@ -233,6 +233,10 @@
{
NotifyMissingFile(_T("debugger.zip"));
}
+ // vars for Linux console //(pecan 2007/2/06)
+ m_bIsConsole = false;
+ m_nConsolePid = 0;
+ m_ConsoleTty = wxEmptyString;
}
DebuggerGDB::~DebuggerGDB()
@@ -1021,6 +1025,21 @@
m_State.GetDriver()->Prepare(target && target->GetTargetType() == ttConsoleOnly);
m_State.ApplyBreakpoints();
+ #ifdef __WXGTK__ //(pecan 2007/2/05)
+ // create xterm and issue tty "/dev/pts/#" to GDB where
+ // # is the tty for the newly created xterm
+ m_bIsConsole = (target && target->GetTargetType() == ttConsoleOnly);
+ if (m_bIsConsole)
+ {
+ if (RunNixConsole() > 0 )
+ { wxString gdbTtyCmd;
+ gdbTtyCmd << wxT("tty ") << m_ConsoleTty;
+ m_State.GetDriver()->QueueCommand(new DebuggerCmd(m_State.GetDriver(), gdbTtyCmd, true));
+ DebugLog(wxString::Format( _("Queued:[%s]"), gdbTtyCmd.c_str()) );
+ }
+ }//if
+ #endif//def __WXGTK__
+
// Don't issue 'run' if attaching to a process (Bug #1391904)
if (m_PidToAttach == 0)
m_State.GetDriver()->Start(m_BreakOnEntry);
@@ -1503,12 +1522,21 @@
void DebuggerGDB::Stop()
{
+ // m_Process is PipedProcess I/O; m_Pid is debugger pid
if (m_pProcess && m_Pid)
{
if (IsStopped())
{
RunCommand(CMD_STOP);
m_pProcess->CloseOutput();
+ #ifdef __WXGTK__
+ // kill any linux console //(pecan 2007/2/06)
+ if ( m_bIsConsole && (m_nConsolePid > 0) )
+ {
+ ::wxKill(m_nConsolePid);
+ m_nConsolePid = 0;
+ }
+ #endif
}
else
{
@@ -2214,3 +2242,108 @@
{
Configure();
}
+// ----------------------------------------------------------------------------
+int DebuggerGDB::RunNixConsole()
+// ----------------------------------------------------------------------------
+{//(pecan 2007/3/09)
+
+ // start the xterm and put the shell to sleep with -e sleep 80000
+ // fetch the xterm tty so we can issue to gdb a "tty /dev/pts/#"
+ // redirecting program stdin/stdout/stderr to the xterm console.
+
+ #ifndef __WXMSW__
+ wxString cmd;
+ wxString title = wxT("Program Console");
+ m_nConsolePid = 0;
+ // for non-win platforms, use m_ConsoleTerm to run the console app
+ wxString term = Manager::Get()->GetConfigManager(_T("app"))->Read(_T("/console_terminal"), DEFAULT_CONSOLE_TERM);
+ term.Replace(_T("$TITLE"), _T("'") + title + _T("'"));
+ cmd << term << _T(" ");
+ cmd << wxT("sleep ");
+ cmd << wxString::Format(wxT("%d"),80000 + ::wxGetProcessId());
+
+ Manager::Get()->GetMacrosManager()->ReplaceEnvVars(cmd);
+ DebugLog(wxString::Format( _("Executing: %s"), cmd.c_str()) );
+ //start xterm -e sleep {some unique # of seconds}
+ m_nConsolePid = wxExecute(cmd, wxEXEC_ASYNC);
+ if (m_nConsolePid <= 0) return -1;
+
+ // Issue the PS command to get the /dev/tty device name
+ // First, wait for the xterm to settle down, else PS won't see the sleep task
+ Manager::Yield();
+ ::wxSleep(1);
+ m_ConsoleTty = GetConsoleTty(m_nConsolePid);
+ if (not m_ConsoleTty.IsEmpty() )
+ { // show what we found as tty
+ DebugLog(wxString::Format(wxT("GetConsoleTTY[%s]ConsolePid[%d]"),m_ConsoleTty.c_str(),m_nConsolePid));
+ return m_nConsolePid;
+ }
+ // failed to find the console tty
+ DebugLog( wxT("Console Execution error:failed to find console tty."));
+ if (m_nConsolePid != 0)::wxKill(m_nConsolePid);
+ m_nConsolePid = 0;
+ #endif//ndef __WWXMSW__
+ return -1;
+}
+// ----------------------------------------------------------------------------
+wxString DebuggerGDB::GetConsoleTty(int ConsolePid)
+// ----------------------------------------------------------------------------
+{//(pecan 2007/3/09)
+
+ // execute the ps x -o command and read PS output to get the /dev/tty field
+
+ unsigned long ConsPid = ConsolePid;
+ wxString psCmd;
+ wxArrayString psOutput;
+ wxArrayString psErrors;
+
+ psCmd << wxT("ps x -o tty,pid,command");
+ DebugLog(wxString::Format( _("Executing: %s"), psCmd.c_str()) );
+ int result = wxExecute(psCmd, psOutput, psErrors, wxEXEC_SYNC);
+ psCmd.Clear();
+ if (result != 0)
+ { psCmd << wxT("Result of ps x:") << result;
+ DebugLog(wxString::Format( _("Execution Error:"), psCmd.c_str()) );
+ return wxEmptyString;
+ }
+
+ wxString ConsTtyStr;
+ wxString ConsPidStr;
+ ConsPidStr << ConsPid;
+ //find task with our unique sleep time
+ wxString uniqueSleepTimeStr;
+ uniqueSleepTimeStr << wxT("sleep ") << wxString::Format(wxT("%d"),80000 + ::wxGetProcessId());
+ // search the output of "ps pid" command
+ in
download for full patch...
History
pecan 2007-02-11 20:22
This patch provides a debugging console facility for Linux.
The user should also apply Patch 1881 to avoid crashes when the program is killed with the stop button.
pecan 2007-02-11 21:01
Corrected Patch. The previous patch had two extra lines from path 1881 in it by mistake Index: debuggergdb.cpp =================================================================== --- debuggergdb.cpp (revision 3590) +++ debuggergdb.cpp (working copy) @@ -233,6 +233,11 @@ { NotifyMissingFile(_T("debugger.zip")); } + // vars for Linux console //(pecan 2007/2/06) + m_bIsConsole = false; + m_nConsolePid = 0; + m_ConsoleTty = wxEmptyString; + } DebuggerGDB::~DebuggerGDB() @@ -1021,6 +1026,21 @@ m_State.GetDriver()->Prepare(target && target->GetTargetType() == ttConsoleOnly); m_State.ApplyBreakpoints(); + #ifdef __WXGTK__ //(pecan 2007/2/05) + // create xterm and issue tty "/dev/pts/#" to GDB where + // # is the tty for the newly created xterm + m_bIsConsole = (target && target->GetTargetType() == ttConsoleOnly); + if (m_bIsConsole) + { + if (RunNixConsole() > 0 ) + { wxString gdbTtyCmd; + gdbTtyCmd << wxT("tty ") << m_ConsoleTty; + m_State.GetDriver()->QueueCommand(new DebuggerCmd(m_State.GetDriver(), gdbTtyCmd, true)); + DebugLog(wxString::Format( _("Queued:[%s]"), gdbTtyCmd.c_str()) ); + } + }//if + #endif//def __WXGTK__ + // Don't issue 'run' if attaching to a process (Bug #1391904) if (m_PidToAttach == 0) m_State.GetDriver()->Start(m_BreakOnEntry); @@ -1503,12 +1523,21 @@ void DebuggerGDB::Stop() { + // m_Process is PipedProcess I/O; m_Pid is debugger pid if (m_pProcess && m_Pid) { if (IsStopped()) { RunCommand(CMD_STOP); m_pProcess->CloseOutput(); + #ifdef __WXGTK__ + // kill any linux console //(pecan 2007/2/06) + if ( m_bIsConsole && (m_nConsolePid > 0) ) + { + ::wxKill(m_nConsolePid); + m_nConsolePid = 0; + } + #endif } else { @@ -1521,7 +1550,8 @@ _("Debug"), wxOK | wxICON_EXCLAMATION); else #endif - wxKill(pid, wxSIGINT); + if (pid > 0) + wxKill(pid, wxSIGINT); #else m_pProcess->CloseOutput(); wxKillError err = m_pProcess->Kill(m_Pid, wxSIGKILL); @@ -2198,3 +2228,95 @@ { Configure(); } +// ---------------------------------------------------------------------------- +int DebuggerGDB::RunNixConsole() +// ---------------------------------------------------------------------------- +{ + // start the xterm and put the shell to sleep with -e sleep 80000 + // fetch the xterm tty so we can issue to gdb a "tty /dev/pts/#" + // redirecting program stdin/stdout/stderr to the xterm console. + + #ifndef __WXMSW__ + wxString cmd; + wxString title = wxT("Program Console"); + m_nConsolePid = 0; + // for non-win platforms, use m_ConsoleTerm to run the console app + wxString term = Manager::Get()->GetConfigManager(_T("app"))->Read(_T("/console_terminal"), DEFAULT_CONSOLE_TERM); + //term.Replace(_T("$TITLE"), _T("'") + _T("*nixConsole") + _T("'")); + term.Replace(_T("$TITLE"), _T("'") + title + _T("'")); + cmd << term << _T(" "); + cmd << wxT("sleep "); + cmd << 80000 + ::wxGetProcessId(); //make a unique sleep command + + Manager::Get()->GetMacrosManager()->ReplaceEnvVars(cmd); + //Manager::Get()->GetMessageManager()->Log(m_PageIndex, _("Executing: %s"), cmd.c_str() ); + DebugLog(wxString::Format( _("Executing: %s"), cmd.c_str()) ); + //start xterm -e sleep {some unique # of seconds} + m_nConsolePid = wxExecute(cmd, wxEXEC_ASYNC); + if (m_nConsolePid <= 0) return -1; + + // Issue the PS command with to get the /dev/tty device name + // First, wait for the xterm to settle down, else PS won't see the sleep task + Manager::Yield(); + ::wxSleep(1); + m_ConsoleTty = GetConsoleTty(m_nConsolePid); + if (not m_ConsoleTty.IsEmpty() ) + return m_nConsolePid; + // failed to find the console tty + DebugLog( wxT("Console Execution error:failed to find console tty.")); + ::wxKill(m_nConsolePid); + m_nConsolePid = 0; + #endif//ndef __WWXMSW__ + return -1; +} +// ---------------------------------------------------------------------------- +wxString DebuggerGDB::GetConsoleTty(int ConsolePid) +// ---------------------------------------------------------------------------- +{ + // execute the ps -x command and read PS output to get the /dev/tty field + + unsigned long ConsPid = ConsolePid; + wxString psCmd; + wxArrayString psOutput; + wxArrayString psErrors; + + psCmd << wxT("ps x"); + DebugLog(wxString::Format( _("Executing: %s"), psCmd.c_str()) ); + int result = wxExecute(psCmd, psOutput, psErrors, wxEXEC_SYNC); + psCmd.Clear(); + if (result != 0) + { psCmd << wxT("Result of ps x:") << result; + DebugLog(wxString::Format( _("Execution Error:"), psCmd.c_str()) ); + return wxEmptyString; + } + + wxString ConsTtyStr; + wxString ConsPidStr; + ConsPidStr << ConsPid; + //find task with our unique sleep time + wxString uniqueSleepTimeStr; + uniqueSleepTimeStr << wxT("sleep ") << 80000 + ::wxGetProcessId(); + // search the output of "ps pid" command + int knt = psOutput.GetCount(); + for (int i=knt-1; i>-1; --i) + { psCmd = psOutput.Item(i); + DebugLog(wxString::Format( _("PS result: %s"), psCmd.c_str()) ); + // find the pts/# or tty/# or whatever it's called + // by seaching the output or out "ps x" command. + // The output of ps looks like: + // PID TTY STAT TIME COMMAND + // 8779 pts/3 Ss+ 0:00 sleep 600000 + //if (psCmd.Contains(ConsPidStr)) + if (psCmd.Contains(uniqueSleepTimeStr)) + { ConsTtyStr = psCmd.Mid( ConsPidStr.Length()+2); + ConsTtyStr = wxT("/dev/")+ConsTtyStr.BeforeFirst(' '); + DebugLog(wxString::Format( _("TTY is[%s]"), ConsTtyStr.c_str()) ); + return ConsTtyStr; + }//if + }//for + + knt = psErrors.GetCount(); + for (int i=0; i<knt; ++i) + DebugLog(wxString::Format( _("PS Error:%s"), psErrors.Item(i).c_str()) ); + return wxEmptyString; +} Index: debuggergdb.h =================================================================== --- debuggergdb.h (revision 3590) +++ debuggergdb.h (working copy) @@ -205,6 +205,13 @@ int m_HookId; // project loader hook ID + // Linux console support + int RunNixConsole(); + wxString GetConsoleTty(int ConsolePid); + bool m_bIsConsole; + int m_nConsolePid; + wxString m_ConsoleTty; + DECLARE_EVENT_TABLE() };
pecan 2007-03-02 18:23
Update Linux Console patch for SVN 3536 Index: debuggergdb.cpp =================================================================== --- debuggergdb.cpp (revision 3659) +++ debuggergdb.cpp (working copy) @@ -233,6 +233,10 @@ { NotifyMissingFile(_T("debugger.zip")); } + // vars for Linux console //(pecan 2007/2/06) + m_bIsConsole = false; + m_nConsolePid = 0; + m_ConsoleTty = wxEmptyString; } DebuggerGDB::~DebuggerGDB() @@ -1021,6 +1025,21 @@ m_State.GetDriver()->Prepare(target && target->GetTargetType() == ttConsoleOnly); m_State.ApplyBreakpoints(); + #ifdef __WXGTK__ //(pecan 2007/2/05) + // create xterm and issue tty "/dev/pts/#" to GDB where + // # is the tty for the newly created xterm + m_bIsConsole = (target && target->GetTargetType() == ttConsoleOnly); + if (m_bIsConsole) + { + if (RunNixConsole() > 0 ) + { wxString gdbTtyCmd; + gdbTtyCmd << wxT("tty ") << m_ConsoleTty; + m_State.GetDriver()->QueueCommand(new DebuggerCmd(m_State.GetDriver(), gdbTtyCmd, true)); + DebugLog(wxString::Format( _("Queued:[%s]"), gdbTtyCmd.c_str()) ); + } + }//if + #endif//def __WXGTK__ + // Don't issue 'run' if attaching to a process (Bug #1391904) if (m_PidToAttach == 0) m_State.GetDriver()->Start(m_BreakOnEntry); @@ -1503,12 +1522,21 @@ void DebuggerGDB::Stop() { + // m_Process is PipedProcess I/O; m_Pid is debugger pid if (m_pProcess && m_Pid) { if (IsStopped()) { RunCommand(CMD_STOP); m_pProcess->CloseOutput(); + #ifdef __WXGTK__ + // kill any linux console //(pecan 2007/2/06) + if ( m_bIsConsole && (m_nConsolePid > 0) ) + { + ::wxKill(m_nConsolePid); + m_nConsolePid = 0; + } + #endif } else { @@ -2196,3 +2224,101 @@ { Configure(); } +// ---------------------------------------------------------------------------- +int DebuggerGDB::RunNixConsole() +// ---------------------------------------------------------------------------- +{ + // start the xterm and put the shell to sleep with -e sleep 80000 + // fetch the xterm tty so we can issue to gdb a "tty /dev/pts/#" + // redirecting program stdin/stdout/stderr to the xterm console. + + #ifndef __WXMSW__ + wxString cmd; + wxString title = wxT("Program Console"); + m_nConsolePid = 0; + // for non-win platforms, use m_ConsoleTerm to run the console app + wxString term = Manager::Get()->GetConfigManager(_T("app"))->Read(_T("/console_terminal"), DEFAULT_CONSOLE_TERM); + //term.Replace(_T("$TITLE"), _T("'") + _T("*nixConsole") + _T("'")); + term.Replace(_T("$TITLE"), _T("'") + title + _T("'")); + cmd << term << _T(" "); + cmd << wxT("sleep "); + cmd << 80000 + ::wxGetProcessId(); //make a unique sleep command + + Manager::Get()->GetMacrosManager()->ReplaceEnvVars(cmd); + //Manager::Get()->GetMessageManager()->Log(m_PageIndex, _("Executing: %s"), cmd.c_str() ); + DebugLog(wxString::Format( _("Executing: %s"), cmd.c_str()) ); + //start xterm -e sleep {some unique # of seconds} + m_nConsolePid = wxExecute(cmd, wxEXEC_ASYNC); + if (m_nConsolePid <= 0) return -1; + + // Issue the PS command to get the /dev/tty device name + // First, wait for the xterm to settle down, else PS won't see the sleep task + Manager::Yield(); + ::wxSleep(1); + m_ConsoleTty = GetConsoleTty(m_nConsolePid); + if (not m_ConsoleTty.IsEmpty() ) + return m_nConsolePid; + // failed to find the console tty + DebugLog( wxT("Console Execution error:failed to find console tty.")); + ::wxKill(m_nConsolePid); + m_nConsolePid = 0; + #endif//ndef __WWXMSW__ + return -1; +} +// ---------------------------------------------------------------------------- +wxString DebuggerGDB::GetConsoleTty(int ConsolePid) +// ---------------------------------------------------------------------------- +{ + // execute the ps -xo command and read PS output to get the /dev/tty field + + unsigned long ConsPid = ConsolePid; + wxString psCmd; + wxArrayString psOutput; + wxArrayString psErrors; + + psCmd << wxT("ps x -o tty,pid,command"); + DebugLog(wxString::Format( _("Executing: %s"), psCmd.c_str()) ); + int result = wxExecute(psCmd, psOutput, psErrors, wxEXEC_SYNC); + psCmd.Clear(); + if (result != 0) + { psCmd << wxT("Result of ps x:") << result; + DebugLog(wxString::Format( _("Execution Error:"), psCmd.c_str()) ); + return wxEmptyString; + } + + wxString ConsTtyStr; + wxString ConsPidStr; + ConsPidStr << ConsPid; + //find task with our unique sleep time + wxString uniqueSleepTimeStr; + uniqueSleepTimeStr << wxT("sleep ") << 80000 + ::wxGetProcessId(); + // search the output of "ps pid" command + int knt = psOutput.GetCount(); + for (int i=knt-1; i>-1; --i) + { psCmd = psOutput.Item(i); + DebugLog(wxString::Format( _("PS result: %s"), psCmd.c_str()) ); + // find the pts/# or tty/# or whatever it's called + // by seaching the output or out "ps x" command. + // The output of ps looks like: + // TT PID COMMAND + // pts/0 13342 /bin/sh ./run.sh + // pts/0 13343 /home/pecan/devel/trunk/src/devel/codeblocks + // pts/0 13361 /usr/bin/gdb -nx -fullname -quiet -args ./conio + // pts/0 13362 xterm -font -*-*-*-*-*-*-20-*-*-*-*-*-*-* -T Program Console -e sleep 93343 + // pts/2 13363 sleep 93343 + // ? 13365 /home/pecan/proj/conio/conio + // pts/1 13370 ps x -o tty,pid,command + + if (psCmd.Contains(uniqueSleepTimeStr)) + { // found sleep 93343 string, extract tty field + ConsTtyStr = wxT("/dev/") + psCmd.BeforeFirst(' '); + DebugLog(wxString::Format( _("TTY is[%s]"), ConsTtyStr.c_str()) ); + return ConsTtyStr; + }//if + }//for + + knt = psErrors.GetCount(); + for (int i=0; i<knt; ++i) + DebugLog(wxString::Format( _("PS Error:%s"), psErrors.Item(i).c_str()) ); + return wxEmptyString; +} Index: debuggergdb.h =================================================================== --- debuggergdb.h (revision 3659) +++ debuggergdb.h (working copy) @@ -205,6 +205,13 @@ int m_HookId; // project loader hook ID + // Linux console support + int RunNixConsole(); + wxString GetConsoleTty(int ConsolePid); + bool m_bIsConsole; + int m_nConsolePid; + wxString m_ConsoleTty; + DECLARE_EVENT_TABLE() };
pecan 2007-03-09 15:14
Uploaded corrections to patch, especially for SlackWare
mandrav 2007-04-12 11:21
Patch applied.
One thing to note though: the user can manually close the terminal and the debugger plugin does not know about it. This contains the risk of killing the wrong process when the debugger ends because the terminal's PID might be used by a different process by then...