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

Cppcheck: Kill current check process only when needed

Browse Source 
Kill only if it processes specified files

Change-Id: I5dee99ec8aeaf3bf4d9dbf6aad195f54176170a2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Sergey Morozov
2018-09-22 14:22:03 +03:00
parent 546956a302
commit f01ee04f4f
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppcheck/cppcheckrunner.cpp
View File

@@ -87,17 +87,19 @@ void CppcheckRunner::addToQueue(const Utils::FileNameList &files,
} }
if (m_isRunning) { if (m_isRunning) {
if (existing == m_currentFiles) stop(existing);
m_process->kill(); // Further processing in handleFinished
return; return;
} }
m_queueTimer.start(); m_queueTimer.start();
} }
void CppcheckRunner::stop() void CppcheckRunner::stop(const Utils::FileNameList &files)
{ {
if (m_isRunning) if (!m_isRunning)
return;
if (files.isEmpty() || m_currentFiles == files)
m_process->kill(); m_process->kill();
} }

2
src/plugins/cppcheck/cppcheckrunner.h
View File

@@ -51,7 +51,7 @@ public:
void addToQueue(const Utils::FileNameList &files, void addToQueue(const Utils::FileNameList &files,
const QString &additionalArguments = {}); const QString &additionalArguments = {});
void removeFromQueue(const Utils::FileNameList &files); void removeFromQueue(const Utils::FileNameList &files);
void stop(); void stop(const Utils::FileNameList &files = {});
const Utils::FileNameList &currentFiles() const; const Utils::FileNameList &currentFiles() const;
QString currentCommand() const; QString currentCommand() const;

2
src/plugins/cppcheck/cppchecktool.cpp
View File

@@ -229,7 +229,7 @@ void CppcheckTool::addToQueue(const Utils::FileNameList &files, CppTools::Projec
void CppcheckTool::stop(const Utils::FileNameList &files) void CppcheckTool::stop(const Utils::FileNameList &files)
{ {
m_runner->removeFromQueue(files); m_runner->removeFromQueue(files);
m_runner->stop(); m_runner->stop(files);
} }
void CppcheckTool::startParsing() void CppcheckTool::startParsing()