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

Valgrind: Remove CallgrindController's use of ValgrindProcess

Browse Source 
It's simply one-shot command execution, using (only some part of) the
ValgrindProcess machinery that just happens to also to wrap a process
is conceptually different from ValgrindProcess that "is" the
valgrind-with-debuggee entity (and an unneeded dependency)

Change-Id: I57a2c3d1cab6b15e59cb41b8e131948c170297b6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-06-28 18:45:57 +02:00
parent ef7c633de2
commit 3418070a4f
9 changed files with 158 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,17 +30,21 @@
#include <valgrind/callgrind/callgrindcontroller.h>
#include <valgrind/callgrind/callgrindparser.h>
#include <valgrind/valgrindrunner.h>
#include <valgrind/valgrindprocess.h>
#include <debugger/analyzer/analyzermanager.h>
#include <utils/qtcassert.h>
using namespace Debugger;
using namespace Valgrind;
using namespace Valgrind::Internal;
using namespace ProjectExplorer;
using namespace Valgrind::Callgrind;
CallgrindToolRunner::CallgrindToolRunner(ProjectExplorer::RunControl *runControl)
namespace Valgrind {
namespace Internal {
CallgrindToolRunner::CallgrindToolRunner(RunControl *runControl)
: ValgrindToolRunner(runControl)
{
setDisplayName("CallgrindToolRunner");
@@ -58,14 +62,14 @@ CallgrindToolRunner::CallgrindToolRunner(ProjectExplorer::RunControl *runControl
connect(&m_controller, &CallgrindController::statusMessage,
this, &CallgrindToolRunner::showStatusMessage);
connect(&m_runner, &ValgrindRunner::extraStart, this, [this] {
m_controller.setValgrindProcess(m_runner.valgrindProcess());
});
connect(m_runner.valgrindProcess(), &ValgrindProcess::valgrindStarted,
&m_controller, &CallgrindController::setValgrindPid);
connect(&m_runner, &ValgrindRunner::extraProcessFinished, this, [this] {
triggerParse();
m_controller.setValgrindProcess(nullptr);
});
m_controller.setValgrindRunnable(runnable());
}
QStringList CallgrindToolRunner::toolArguments() const
@@ -120,12 +124,10 @@ void CallgrindToolRunner::setPaused(bool paused)
m_markAsPaused = paused;
// call controller only if it is attached to a valgrind process
if (m_controller.valgrindProcess()) {
if (paused)
pause();
else
unpause();
}
if (paused)
pause();
else
unpause();
}
void CallgrindToolRunner::setToggleCollectFunction(const QString &toggleCollectFunction)
@@ -202,3 +204,6 @@ void CallgrindToolRunner::controllerFinished(CallgrindController::Option option)
break; // do nothing
}
}
} // Internal
} // Valgrind