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

Memcheck: Merge part of local and remote code path

Browse Source 
Change-Id: I683cedbe5fbed6d10b24100c51f77a75f74504a1
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2013-07-10 17:32:52 +02:00
parent 37dec964c1
commit 34981a8a90
1 changed files with 28 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/valgrind/memcheck/memcheckrunner.cpp
View File

@@ -94,38 +94,22 @@ void MemcheckRunner::setParser(XmlProtocol::ThreadedParser *parser)
bool MemcheckRunner::start() bool MemcheckRunner::start()
{ {
if (startMode() == Analyzer::StartLocal) {
QTC_ASSERT(d->parser, return false); QTC_ASSERT(d->parser, return false);
bool check = d->xmlServer.listen(QHostAddress(QHostAddress::LocalHost)); QString ip;
QTC_ASSERT(check, return false); QHostAddress hostAddr;
d->xmlServer.setMaxPendingConnections(1);
const quint16 xmlPortNumber = d->xmlServer.serverPort();
connect(&d->xmlServer, SIGNAL(newConnection()), SLOT(xmlSocketConnected()));
check = d->logServer.listen(QHostAddress(QHostAddress::LocalHost)); if (startMode() == Analyzer::StartLocal) {
QTC_ASSERT(check, return false); ip = QLatin1String("127.0.0.1");
d->logServer.setMaxPendingConnections(1); hostAddr = QHostAddress(QHostAddress::LocalHost);
const quint16 logPortNumber = d->logServer.serverPort();
connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected()));
QStringList memcheckArguments;
memcheckArguments << QLatin1String("--xml=yes")
<< QString::fromLatin1("--xml-socket=127.0.0.1:%1").arg(xmlPortNumber)
<< QLatin1String("--child-silent-after-fork=yes")
<< QString::fromLatin1("--log-socket=127.0.0.1:%1").arg(logPortNumber)
<< valgrindArguments();
setValgrindArguments(memcheckArguments);
} }
if (startMode() == Analyzer::StartRemote) { if (startMode() == Analyzer::StartRemote) {
QTC_ASSERT(d->parser, return false); ip = connectionParameters().host;
QString ip = connectionParameters().host;
QTC_ASSERT(!ip.isEmpty(), return false); QTC_ASSERT(!ip.isEmpty(), return false);
hostAddr = QHostAddress(ip);
}
QHostAddress hostAddr(ip);
bool check = d->xmlServer.listen(hostAddr); bool check = d->xmlServer.listen(hostAddr);
QTC_ASSERT(check, return false); QTC_ASSERT(check, return false);
d->xmlServer.setMaxPendingConnections(1); d->xmlServer.setMaxPendingConnections(1);
@@ -144,7 +128,6 @@ bool MemcheckRunner::start()
<< QLatin1String("--child-silent-after-fork=yes") << QLatin1String("--child-silent-after-fork=yes")
<< QString::fromLatin1("--log-socket=%1:%2").arg(ip).arg(logPortNumber); << QString::fromLatin1("--log-socket=%1:%2").arg(ip).arg(logPortNumber);
setValgrindArguments(memcheckArguments); setValgrindArguments(memcheckArguments);
}
return ValgrindRunner::start(); return ValgrindRunner::start();
} }