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

fixed memcheck using valgrind on remote device

Browse Source 
Change-Id: Ie2ded39c73dce99db574b16cb8e0e1ffb7ba2415
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Volker Vogelhuber
2013-09-05 10:29:31 +02:00
committed by hjk
parent f6e2cfc2af
commit 54a114e639
1 changed files with 60 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,18 +105,77 @@ bool MemcheckRunner::start()
} }
if (startMode() == Analyzer::StartRemote) { if (startMode() == Analyzer::StartRemote) {
ip = connectionParameters().host;
QList<QHostAddress> possibleHostAddresses;
//NOTE: ::allAddresses does not seem to work for usb interfaces...
foreach (const QNetworkInterface &iface, QNetworkInterface::allInterfaces()) {
foreach (const QNetworkAddressEntry &entry, iface.addressEntries()) {
const QHostAddress addr = entry.ip();
if (addr.toString() != QLatin1String("127.0.0.1")
&& addr.toString() != QLatin1String("0:0:0:0:0:0:0:1"))
{
possibleHostAddresses << addr;
break;
}
}
}
if (possibleHostAddresses.isEmpty()) {
emit processErrorReceived(tr("No network interface found for remote analysis."),
QProcess::FailedToStart);
return false;
} else if (possibleHostAddresses.size() > 1) {
QDialog dlg;
dlg.setWindowTitle(tr("Select Network Interface"));
QVBoxLayout *layout = new QVBoxLayout;
QLabel *description = new QLabel;
description->setWordWrap(true);
description->setText(tr("More than one network interface was found on your machine. Please select which one you want to use for remote analysis."));
layout->addWidget(description);
QListWidget *list = new QListWidget;
foreach (const QHostAddress &address, possibleHostAddresses)
list->addItem(address.toString());
list->setSelectionMode(QAbstractItemView::SingleSelection);
list->setCurrentRow(0);
layout->addWidget(list);
QDialogButtonBox *buttons = new QDialogButtonBox;
buttons->addButton(QDialogButtonBox::Ok);
buttons->addButton(QDialogButtonBox::Cancel);
connect(buttons, SIGNAL(accepted()),
&dlg, SLOT(accept()));
connect(buttons, SIGNAL(rejected()),
&dlg, SLOT(reject()));
layout->addWidget(buttons);
dlg.setLayout(layout);
if (dlg.exec() != QDialog::Accepted) {
emit processErrorReceived(tr("No Network Interface was chosen for remote analysis"), QProcess::FailedToStart);
return false;
}
QTC_ASSERT(list->currentRow() >= 0, return false);
QTC_ASSERT(list->currentRow() < possibleHostAddresses.size(), return false);
hostAddr = possibleHostAddresses.at(list->currentRow());
} else {
hostAddr = possibleHostAddresses.first();
}
ip = hostAddr.toString();
QTC_ASSERT(!ip.isEmpty(), return false); QTC_ASSERT(!ip.isEmpty(), return false);
hostAddr = QHostAddress(ip); hostAddr = QHostAddress(ip);
} }
bool check = d->xmlServer.listen(hostAddr); bool check = d->xmlServer.listen(hostAddr);
if (!check) emit processErrorReceived( tr("XmlServer on %1: ").arg(ip) + d->xmlServer.errorString(), QProcess::FailedToStart );
QTC_ASSERT(check, return false); QTC_ASSERT(check, return false);
d->xmlServer.setMaxPendingConnections(1); d->xmlServer.setMaxPendingConnections(1);
const quint16 xmlPortNumber = d->xmlServer.serverPort(); const quint16 xmlPortNumber = d->xmlServer.serverPort();
connect(&d->xmlServer, SIGNAL(newConnection()), SLOT(xmlSocketConnected())); connect(&d->xmlServer, SIGNAL(newConnection()), SLOT(xmlSocketConnected()));
check = d->logServer.listen(hostAddr); check = d->logServer.listen(hostAddr);
if (!check) emit processErrorReceived( tr("LogServer on %1: ").arg(ip) + d->logServer.errorString(), QProcess::FailedToStart );
QTC_ASSERT(check, return false); QTC_ASSERT(check, return false);
d->logServer.setMaxPendingConnections(1); d->logServer.setMaxPendingConnections(1);
const quint16 logPortNumber = d->logServer.serverPort(); const quint16 logPortNumber = d->logServer.serverPort();