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

Valgrind: Use generic timed future for uncertain progress

Browse Source 
Change-Id: Idb7f1b1e5a0fcd0351d6c30f5a6dadcbec191898
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-05-05 14:23:37 +02:00
parent 9e457eefc8
commit 5ac261bff2
8 changed files with 74 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/valgrind/callgrindengine.cpp
View File

@@ -48,11 +48,8 @@ CallgrindRunControl::CallgrindRunControl(const AnalyzerStartParameters &sp,
, m_markAsPaused(false)
{
connect(&m_runner, SIGNAL(finished()), this, SLOT(slotFinished()));
connect(&m_runner, SIGNAL(started()), this, SLOT(slotStarted()));
connect(m_runner.parser(), SIGNAL(parserDataReady()), this, SLOT(slotFinished()));
connect(&m_runner, SIGNAL(statusMessage(QString)), SLOT(showStatusMessage(QString)));
m_progress->setProgressRange(0, 2);
}
void CallgrindRunControl::showStatusMessage(const QString &msg)
@@ -157,8 +154,3 @@ void CallgrindRunControl::slotFinished()
{
emit parserDataReady(this);
}
void CallgrindRunControl::slotStarted()
{
m_progress->setProgressValue(1);
}

1
src/plugins/valgrind/callgrindengine.h
View File

@@ -75,7 +75,6 @@ signals:
private slots:
void slotFinished();
void slotStarted();
void showStatusMessage(const QString &msg);
private:

9
src/plugins/valgrind/memcheckengine.cpp
View File

@@ -57,10 +57,6 @@ MemcheckRunControl::MemcheckRunControl(const AnalyzerStartParameters &sp,
SIGNAL(suppressionCount(QString,qint64)));
connect(&m_parser, SIGNAL(internalError(QString)),
SIGNAL(internalParserError(QString)));
connect(&m_parser, SIGNAL(status(Valgrind::XmlProtocol::Status)),
SLOT(status(Valgrind::XmlProtocol::Status)));
m_progress->setProgressRange(0, XmlProtocol::Status::Finished + 1);
}
QString MemcheckRunControl::progressTitle() const
@@ -132,10 +128,5 @@ QStringList MemcheckRunControl::suppressionFiles() const
return m_settings->suppressionFiles();
}
void MemcheckRunControl::status(const Status &status)
{
m_progress->setProgressValue(status.state() + 1);
}
} // namespace Internal
} // namespace Valgrind

3
src/plugins/valgrind/memcheckengine.h
View File

@@ -62,9 +62,6 @@ protected:
virtual QStringList toolArguments() const;
virtual ValgrindRunner *runner();
private slots:
void status(const Valgrind::XmlProtocol::Status &status);
private:
XmlProtocol::ThreadedParser m_parser;
Memcheck::MemcheckRunner m_runner;

13
src/plugins/valgrind/valgrindengine.cpp
View File

@@ -53,8 +53,6 @@ using namespace ProjectExplorer;
namespace Valgrind {
namespace Internal {
const int progressMaximum = 1000000;
ValgrindRunControl::ValgrindRunControl(const AnalyzerStartParameters &sp,
ProjectExplorer::RunConfiguration *runConfiguration)
: AnalyzerRunControl(sp, runConfiguration),
@@ -80,14 +78,11 @@ bool ValgrindRunControl::startEngine()
{
emit starting(this);
FutureProgress *fp = ProgressManager::addTask(m_progress->future(),
progressTitle(), "valgrind");
FutureProgress *fp = ProgressManager::addTimedTask(m_progress, progressTitle(), "valgrind", 100);
fp->setKeepOnFinish(FutureProgress::HideOnFinish);
connect(fp, SIGNAL(canceled()), this, SLOT(handleProgressCanceled()));
connect(fp, SIGNAL(finished()), this, SLOT(handleProgressFinished()));
m_progress->setProgressRange(0, progressMaximum);
m_progress->reportStarted();
m_progress->setProgressValue(progressMaximum / 10);
const AnalyzerStartParameters &sp = startParameters();
#if VALGRIND_DEBUG_OUTPUT
@@ -183,12 +178,6 @@ void ValgrindRunControl::runnerFinished()
void ValgrindRunControl::receiveProcessOutput(const QString &output, OutputFormat format)
{
int progress = m_progress->progressValue();
if (progress < 5 * progressMaximum / 10)
progress += progress / 100;
else if (progress < 9 * progressMaximum / 10)
progress += progress / 1000;
m_progress->setProgressValue(progress);
appendMessage(output, format);
}