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

ProcessProgress: Add setExpectedDuration() method

Browse Source 
This is not the same as process timeout, so make these two
settings orthogonal.

Change-Id: I3fc774c183282fe770feb49258d77d0ce3637b38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2024-01-21 10:19:46 +01:00
parent 04d7858250
commit 04b80f092a
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -147,7 +147,6 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
ProcessProgress *progress = new ProcessProgress(m_process.get());
progress->setDisplayName(::CMakeProjectManager::Tr::tr("Configuring \"%1\"")
.arg(parameters.projectName));
m_process->setTimeoutS(10); // for process progress timeout estimation
m_process->setCommand(commandLine);
m_elapsed.start();
m_process->start();

10
src/plugins/coreplugin/progressmanager/processprogress.cpp
View File

@@ -14,6 +14,8 @@
using namespace Utils;
using namespace std::chrono_literals;
namespace Core {
class ProcessProgressPrivate : public QObject
@@ -32,6 +34,7 @@ public:
QPointer<FutureProgress> m_futureProgress;
QString m_displayName;
FutureProgress::KeepOnFinishType m_keep = FutureProgress::HideOnFinish;
std::chrono::seconds m_expectedDuration = 2s;
};
ProcessProgressPrivate::ProcessProgressPrivate(ProcessProgress *progress, Process *process)
@@ -98,7 +101,7 @@ ProcessProgress::ProcessProgress(Process *process)
d->m_futureProgress = ProgressManager::addTask(d->m_futureInterface.future(), name, id);
} else {
d->m_futureProgress = ProgressManager::addTimedTask(d->m_futureInterface, name, id,
qMax(2, d->m_process->timeoutS() / 5));
d->m_expectedDuration.count());
}
d->m_futureProgress->setKeepOnFinish(d->m_keep);
});
@@ -145,4 +148,9 @@ void ProcessProgress::setProgressParser(const ProgressParser &parser)
d.get(), &ProcessProgressPrivate::parseProgress);
}
void ProcessProgress::setExpectedDuration(std::chrono::seconds duration)
{
d->m_expectedDuration = qMin(1s, duration);
}
} // namespace Core

1
src/plugins/coreplugin/progressmanager/processprogress.h
View File

@@ -26,6 +26,7 @@ public:
void setDisplayName(const QString &name);
void setKeepOnFinish(FutureProgress::KeepOnFinishType keepType);
void setProgressParser(const ProgressParser &parser);
void setExpectedDuration(std::chrono::seconds duration); // 2s by default
private:
std::unique_ptr<ProcessProgressPrivate> d;

1
src/plugins/mesonprojectmanager/mesonprojectparser.cpp
View File

@@ -377,7 +377,6 @@ void MesonProjectParser::setupProcess(const Command &command, const Environment
MessageManager::writeFlashing(Tr::tr("Running %1 in %2.")
.arg(command.toUserOutput(), command.workDir().toUserOutput()));
m_process->setCommand(command.cmdLine());
m_process->setTimeoutS(10);
ProcessProgress *progress = new ProcessProgress(m_process.get());
progress->setDisplayName(Tr::tr("Configuring \"%1\".").arg(projectName));
}

3
src/plugins/vcsbase/vcscommand.cpp
View File

@@ -104,7 +104,6 @@ void VcsCommandPrivate::cleanup()
void VcsCommandPrivate::setupProcess(Process *process, const Job &job)
{
process->setTimeoutS(job.timeoutS);
if (!job.workingDirectory.isEmpty())
process->setWorkingDirectory(job.workingDirectory);
if (!(m_flags & RunFlags::SuppressCommandLogging))
@@ -125,6 +124,7 @@ void VcsCommandPrivate::setupProcess(Process *process, const Job &job)
ProcessProgress *progress = new ProcessProgress(process);
progress->setDisplayName(m_displayName);
progress->setExpectedDuration(std::chrono::seconds(qMin(1, job.timeoutS / 5)));
if (m_progressParser)
progress->setProgressParser(m_progressParser);
}
@@ -314,6 +314,7 @@ CommandResult VcsCommand::runBlockingHelper(const CommandLine &command, int time
return {};
d->setupProcess(&process, {command, timeoutS, d->m_defaultWorkingDirectory, {}});
process.setTimeoutS(timeoutS);
const EventLoopMode eventLoopMode = d->eventLoopMode();
process.setTimeOutMessageBoxEnabled(eventLoopMode == EventLoopMode::On);