feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: debugger: procinterrupt logic

Browse Source
This commit is contained in:
hjk
2009-02-11 14:52:29 +01:00
parent e033239d7b
commit dddd905bc7
1 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/plugins/debugger/procinterrupt.cpp
View File

@@ -33,7 +33,8 @@
#include "procinterrupt.h" #include "procinterrupt.h"
#ifdef Q_OS_WIN #if defined(Q_OS_WIN)
#include <windows.h> #include <windows.h>
#include <Tlhelp32.h> #include <Tlhelp32.h>
@@ -75,7 +76,37 @@ DWORD findProcessId(DWORD parentId)
CloseHandle(hProcList); CloseHandle(hProcList);
return procId; return procId;
} }
#else
bool Debugger::Internal::interruptProcess(int pID)
{
DWORD pid = pID;
if (!pid)
return false;
PtrCreateRemoteThread libFunc = resolveCreateRemoteThread();
if (libFunc) {
DWORD dwThreadId = 0;
HANDLE hproc = OpenProcess(PROCESS_ALL_ACCESS, false, pid);
HANDLE hthread = libFunc(hproc, NULL, 0, (LPTHREAD_START_ROUTINE)DebugBreak, 0, 0, &dwThreadId);
CloseHandle(hthread);
if (dwThreadId)
return true;
}
return false;
}
bool Debugger::Internal::interruptChildProcess(Q_PID parentPID)
{
DWORD pid = findProcessId(parentPID->dwProcessId);
return interruptProcess(pid);
}
#endif // defined(Q_OS_WIN)
#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
#include <QtCore/QLatin1String> #include <QtCore/QLatin1String>
#include <QtCore/QString> #include <QtCore/QString>
@@ -89,12 +120,14 @@ DWORD findProcessId(DWORD parentId)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#define OPProcessValueUnknown UINT_MAX
using namespace Debugger::Internal;
/* Mac OS X /* Mac OS X
int OPParentIDForProcessID(int pid) int OPParentIDForProcessID(int pid)
// Returns the parent process id for the given process id (pid) // Returns the parent process id for the given process id (pid)
{ {
const uint OPProcessValueUnknown = UINT_MAX;
struct kinfo_proc info; struct kinfo_proc info;
size_t length = sizeof(struct kinfo_proc); size_t length = sizeof(struct kinfo_proc);
int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid }; int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid };
@@ -140,44 +173,21 @@ int findChildProcess(int parentId)
return -1; return -1;
} }
#endif
bool Debugger::Internal::interruptProcess(int pID) bool Debugger::Internal::interruptProcess(int pID)
{ {
#ifdef Q_OS_WIN
DWORD pid = pID;
if (!pid)
return false;
PtrCreateRemoteThread libFunc = resolveCreateRemoteThread();
if (libFunc) {
DWORD dwThreadId = 0;
HANDLE hproc = OpenProcess(PROCESS_ALL_ACCESS, false, pid);
HANDLE hthread = libFunc(hproc, NULL, 0, (LPTHREAD_START_ROUTINE)DebugBreak, 0, 0, &dwThreadId);
CloseHandle(hthread);
if (dwThreadId)
return true;
}
#else
int procId = pID; int procId = pID;
if (procId != -1) { if (procId != -1) {
if (kill(procId, SIGINT) == 0) if (kill(procId, SIGINT) == 0)
return true; return true;
} }
#endif
return false; return false;
} }
bool Debugger::Internal::interruptChildProcess(Q_PID parentPID) bool Debugger::Internal::interruptChildProcess(Q_PID parentPID)
{ {
#ifdef WIN32
DWORD pid = findProcessId(parentPID->dwProcessId);
return interruptProcess(pid);
#else
int procId = findChildProcess(parentPID); int procId = findChildProcess(parentPID);
//qDebug() << "INTERRUPTING PROCESS" << procId; //qDebug() << "INTERRUPTING PROCESS" << procId;
return interruptProcess(procId); return interruptProcess(procId);
#endif
} }
#endif // defined(Q_OS_LINUX) || defined(Q_OS_MAC)