Differential D5584 Diff 14675 outputview/outputexecutejob.cpp

Changeset View

Standalone View

View Options

outputview/outputexecutejob.cpp

Show All 15 Lines
16the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 16​the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
17Boston, MA 02110-1301, USA. 17​Boston, MA 02110-1301, USA.
18*/ 18​*/
19 19​
20#include "outputexecutejob.h" 20​#include "outputexecutejob.h"
21#include "outputmodel.h" 21​#include "outputmodel.h"
22#include "outputdelegate.h" 22​#include "outputdelegate.h"
23#include "debug.h" 23​#include "debug.h"
24​#include <interfaces/icore.h>
25​#include <interfaces/iruntime.h>
26​#include <interfaces/iruntimecontroller.h>
24#include <util/environmentprofilelist.h> 27​#include <util/environmentprofilelist.h>
25#include <util/processlinemaker.h> 28​#include <util/processlinemaker.h>
26#include <KProcess> 29​#include <KProcess>
27#include <KLocalizedString> 30​#include <KLocalizedString>
28#include <KShell> 31​#include <KShell>
29#include <QFileInfo> 32​#include <QFileInfo>
30#include <QDir> 33​#include <QDir>
31 34​
Show All 28 Lines40public:
60 QScopedPointer<IFilterStrategy> m_filteringStrategyPtr; 63​ QScopedPointer<IFilterStrategy> m_filteringStrategyPtr;
61 QStringList m_arguments; 64​ QStringList m_arguments;
62 QStringList m_privilegedExecutionCommand; 65​ QStringList m_privilegedExecutionCommand;
63 QUrl m_workingDirectory; 66​ QUrl m_workingDirectory;
64 QString m_environmentProfile; 67​ QString m_environmentProfile;
65 QHash<QString, QString> m_environmentOverrides; 68​ QHash<QString, QString> m_environmentOverrides;
66 QString m_jobName; 69​ QString m_jobName;
67 bool m_outputStarted; 70​ bool m_outputStarted;
71​ bool m_executeOnHost = false;
68}; 72​};
69 73​
70OutputExecuteJobPrivate::OutputExecuteJobPrivate( OutputExecuteJob* owner ) : 74​OutputExecuteJobPrivate::OutputExecuteJobPrivate( OutputExecuteJob* owner ) :
71 m_owner( owner ), 75​ m_owner( owner ),
72 m_process( new KProcess( m_owner ) ), 76​ m_process( new KProcess( m_owner ) ),
73 m_lineMaker( new ProcessLineMaker( m_owner ) ), // do not assign process to the line maker as we'll feed it data ourselves 77​ m_lineMaker( new ProcessLineMaker( m_owner ) ), // do not assign process to the line maker as we'll feed it data ourselves
74 m_status( OutputExecuteJob::JobNotStarted ), 78​ m_status( OutputExecuteJob::JobNotStarted ),
75 m_properties( OutputExecuteJob::DisplayStdout ), 79​ m_properties( OutputExecuteJob::DisplayStdout ),
Show All 21 Lines
97OutputExecuteJob::~OutputExecuteJob() 101​OutputExecuteJob::~OutputExecuteJob()
98{ 102​{
99 // indicates if process is running and survives kill, then we cannot do anything 103​ // indicates if process is running and survives kill, then we cannot do anything
100 bool killSuccessful = d->m_process->state() == QProcess::NotRunning; 104​ bool killSuccessful = d->m_process->state() == QProcess::NotRunning;
101 if( !killSuccessful ) { 105​ if( !killSuccessful ) {
102 killSuccessful = doKill(); 106​ killSuccessful = doKill();
103 } 107​ }
104 108​
105 Q_ASSERT( d->m_process->state() == QProcess::NotRunning || !killSuccessful ); 109​ Q_ASSERT( d->m_process->state() == QProcess::NotRunning || !killSuccessful );
mwolffUnsubmitted
Done

out of interest: why is this required? what state is the process in?

mwolff: out of interest: why is this required? what state is the process in?
apolAuthorUnsubmitted
Not Done

I'll revert it and debug again, I don't remember why I added it anymore.

apol: I'll revert it and debug again, I don't remember why I added it anymore.
106 delete d; 110​ delete d;
107} 111​}
108 112​
109OutputExecuteJob::JobStatus OutputExecuteJob::status() const 113​OutputExecuteJob::JobStatus OutputExecuteJob::status() const
110{ 114​{
111 return d->m_status; 115​ return d->m_status;
112} 116​}
113 117​
▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Line(s)256 connect( d->m_lineMaker, &ProcessLineMaker::receivedStderrLines, model(),
253 &OutputModel::appendLines ); 257​ &OutputModel::appendLines );
254 } 258​ }
255 259​
256 if( !d->m_properties.testFlag( NoSilentOutput ) || verbosity() != Silent ) { 260​ if( !d->m_properties.testFlag( NoSilentOutput ) || verbosity() != Silent ) {
257 d->m_outputStarted = true; 261​ d->m_outputStarted = true;
258 startOutput(); 262​ startOutput();
259 } 263​ }
260 264​
261 const QString joinedCommandLine = d->joinCommandLine(); ​
262 QString headerLine; ​
263 if( !effectiveWorkingDirectory.isEmpty() ) { ​
264 headerLine = effectiveWorkingDirectory.toString( QUrl::PreferLocalFile | QUrl::StripTrailingSlash ) + "> " + joinedCommandLine; ​
265 } else { ​
266 headerLine = joinedCommandLine; ​
267 } ​
268 model()->appendLine( headerLine ); ​
269 ​
270 if( !effectiveWorkingDirectory.isEmpty() ) { 265​ if( !effectiveWorkingDirectory.isEmpty() ) {
271 d->m_process->setWorkingDirectory( effectiveWorkingDirectory.toLocalFile() ); 266​ d->m_process->setWorkingDirectory( effectiveWorkingDirectory.toLocalFile() );
272 } 267​ }
273 268​
274 d->m_process->setProcessEnvironment( d->effectiveEnvironment(effectiveWorkingDirectory) ); 269​ d->m_process->setProcessEnvironment( d->effectiveEnvironment(effectiveWorkingDirectory) );
275 270​
276 if (!d->effectiveCommandLine().isEmpty()) { 271​ if (!d->effectiveCommandLine().isEmpty()) {
277 d->m_process->setProgram( d->effectiveCommandLine() ); 272​ d->m_process->setProgram( d->effectiveCommandLine() );
278 // there is no way to input data in the output view so redirect stdin to the null device 273​ // there is no way to input data in the output view so redirect stdin to the null device
279 d->m_process->setStandardInputFile(QProcess::nullDevice()); 274​ d->m_process->setStandardInputFile(QProcess::nullDevice());
280 qCDebug(OUTPUTVIEW) << "Starting:" << d->m_process->program().join(QStringLiteral(" ")) << "in" << d->m_process->workingDirectory(); 275​ qCDebug(OUTPUTVIEW) << "Starting:" << d->effectiveCommandLine() << d->m_process->program() << "in" << d->m_process->workingDirectory();
276​ if (d->m_executeOnHost) {
281 d->m_process->start(); 277​ d->m_process->start();
282 } else { 278​ } else {
283 QString errorMessage = i18n("Failed to specify program to start"); 279​ KDevelop::ICore::self()->runtimeController()->currentRuntime()->startProcess(d->m_process);
280​ }
281​ model()->appendLine(d->m_process->workingDirectory() + QStringLiteral("> ") + KShell::joinArgs(d->m_process->program()));
282​ } else {
283​ QString errorMessage = i18n("Failed to specify program to start: %1", d->joinCommandLine());
284 model()->appendLine( i18n( "*** %1 ***", errorMessage) ); 284​ model()->appendLine( i18n( "*** %1 ***", errorMessage) );
285 setErrorText(errorMessage); 285​ setErrorText(errorMessage);
286 setError( FailedShownError ); 286​ setError( FailedShownError );
287 emitResult(); 287​ emitResult();
288 return; ​
289 } 288​ }
290} 289​}
291 290​
292bool OutputExecuteJob::doKill() 291​bool OutputExecuteJob::doKill()
293{ 292​{
294 const int terminateKillTimeout = 1000; // msecs 293​ const int terminateKillTimeout = 1000; // msecs
295 294​
296 if( d->m_status != JobRunning ) { 295​ if( d->m_status != JobRunning ) {
297 return true; 296​ return true;
298 } 297​ }
299 d->m_status = JobCanceled; 298​ d->m_status = JobCanceled;
mwolffUnsubmitted
Done

unrelated

mwolff: unrelated
300 299​
301 d->m_process->terminate(); 300​ d->m_process->terminate();
302 bool terminated = d->m_process->waitForFinished( terminateKillTimeout ); 301​ bool terminated = d->m_process->waitForFinished( terminateKillTimeout );
303 if( !terminated ) { 302​ if( !terminated ) {
304 d->m_process->kill(); 303​ d->m_process->kill();
305 terminated = d->m_process->waitForFinished( terminateKillTimeout ); 304​ terminated = d->m_process->waitForFinished( terminateKillTimeout );
306 } 305​ }
307 d->m_lineMaker->flushBuffers(); 306​ d->m_lineMaker->flushBuffers();
▲ Show 20 Lines • Show All 160 Lines • ▼ Show 20 Line(s)466{
468 d->m_environmentOverrides[name] = value; 467​ d->m_environmentOverrides[name] = value;
469} 468​}
470 469​
471void OutputExecuteJob::removeEnvironmentOverride( const QString& name ) 470​void OutputExecuteJob::removeEnvironmentOverride( const QString& name )
472{ 471​{
473 d->m_environmentOverrides.remove( name ); 472​ d->m_environmentOverrides.remove( name );
474} 473​}
475 474​
475​
476​void OutputExecuteJob::setExecuteOnHost(bool executeHost)
477​{
478​ d->m_executeOnHost = executeHost;
479​}
480​
481​bool OutputExecuteJob::executeOnHost() const
482​{
483​ return d->m_executeOnHost;
484​}
485​
476template< typename T > 486​template< typename T >
477void OutputExecuteJobPrivate::mergeEnvironment( QProcessEnvironment& dest, const T& src ) 487​void OutputExecuteJobPrivate::mergeEnvironment( QProcessEnvironment& dest, const T& src )
478{ 488​{
479 for( typename T::const_iterator it = src.begin(); it != src.end(); ++it ) { 489​ for( typename T::const_iterator it = src.begin(); it != src.end(); ++it ) {
480 dest.insert( it.key(), it.value() ); 490​ dest.insert( it.key(), it.value() );
481 } 491​ }
482} 492​}
483 493​
▲ Show 20 Lines • Show All 58 Lines • Show Last 20 Lines