Skip to content

Fix error msg #719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lievenhey wants to merge 1 commit into from
+37 −42
Closed

Fix error msg #719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/recordhost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ void RecordHost::setCurrentWorkingDirectory(const QString& cwd)
} else if (!folder.isWritable()) {
emit errorOccurred(tr("Working directory folder is not writable: %1").arg(cwd));
} else {
emit errorOccurred({});
m_cwd = cwd;
emit currentWorkingDirectoryChanged(cwd);
}
Expand All @@ -287,7 +286,6 @@ void RecordHost::setClientApplication(const QString& clientApplication)
} else if (!application.isExecutable()) {
emit errorOccurred(tr("Application file is not executable: %1").arg(clientApplication));
} else {
emit errorOccurred({});
m_clientApplication = clientApplication;
emit clientApplicationChanged(m_clientApplication);
}
Expand Down Expand Up @@ -318,7 +316,6 @@ void RecordHost::setOutputFileName(const QString& filePath)
} else if (!file.absoluteFilePath().endsWith(perfDataExtension)) {
emit errorOccurred(tr("Output file must end with %1").arg(perfDataExtension));
} else {
emit errorOccurred({});
m_outputFileName = filePath;
emit outputFileNameChanged(m_outputFileName);
}
Expand All @@ -333,7 +330,6 @@ void RecordHost::setRecordType(RecordType type)
{
if (m_recordType != type) {
m_recordType = type;
emit errorOccurred({});
emit recordTypeChanged(m_recordType);

m_pids.clear();
Expand Down
75 changes: 37 additions & 38 deletions src/recordpage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "resultsutil.h"
#include "util.h"

#include <QDebug>
#include <QKeyEvent>
#include <QListView>
#include <QRegularExpression>
Expand Down Expand Up @@ -158,18 +157,22 @@ RecordPage::RecordPage(QWidget* parent)
connect(m_recordHost, &RecordHost::isReadyChanged, this,
[this](bool isReady) { ui->startRecordingButton->setEnabled(isReady); });

connect(m_recordHost, &RecordHost::isPerfInstalledChanged, this, [this](bool isInstalled) {
auto isPerfInstalledWarning = [this](bool isInstalled) {
if (!isInstalled) {
ui->startRecordingButton->setEnabled(false);
ui->applicationRecordErrorMessage->setText(QObject::tr("Please install perf before trying to record."));
ui->applicationRecordErrorMessage->setVisible(true);
setError(tr("Please install perf before trying to record."));
}
});
};

connect(m_recordHost, &RecordHost::isPerfInstalledChanged, this, isPerfInstalledWarning);
isPerfInstalledWarning(m_recordHost->isPerfInstalled());

connect(m_recordHost, &RecordHost::clientApplicationChanged, this, [this](const QString& filePath) {
const auto config = applicationConfig(filePath);
ui->workingDirectory->setText(config.readEntry("workingDir", QString()));
ui->applicationParametersBox->setText(config.readEntry("params", QString()));
if (config.isValid()) {
ui->workingDirectory->setText(config.readEntry("workingDir", QString()));
ui->applicationParametersBox->setText(config.readEntry("params", QString()));
}

m_multiConfig->setConfig(applicationConfig(ui->applicationName->text()));
});
Expand All @@ -187,40 +190,39 @@ RecordPage::RecordPage(QWidget* parent)
if (index != -1)
ui->compressionComboBox->setCurrentIndex(index);

connect(m_recordHost, &RecordHost::perfCapabilitiesChanged, this,
[this](RecordHost::PerfCapabilities capabilities) {
ui->sampleCpuCheckBox->setVisible(capabilities.canSampleCpu);
ui->sampleCpuLabel->setVisible(capabilities.canSampleCpu);
auto perfCapabilities = [this](RecordHost::PerfCapabilities capabilities) {
ui->sampleCpuCheckBox->setVisible(capabilities.canSampleCpu);
ui->sampleCpuLabel->setVisible(capabilities.canSampleCpu);

ui->offCpuCheckBox->setVisible(capabilities.canSwitchEvents);
ui->offCpuLabel->setVisible(capabilities.canSwitchEvents);
ui->offCpuCheckBox->setVisible(capabilities.canSwitchEvents);
ui->offCpuLabel->setVisible(capabilities.canSwitchEvents);

ui->useAioCheckBox->setVisible(capabilities.canUseAio);
ui->useAioLabel->setVisible(capabilities.canUseAio);
ui->useAioCheckBox->setVisible(capabilities.canUseAio);
ui->useAioLabel->setVisible(capabilities.canUseAio);

ui->compressionComboBox->setVisible(capabilities.canCompress);
ui->compressionLabel->setVisible(capabilities.canCompress);
ui->compressionComboBox->setVisible(capabilities.canCompress);
ui->compressionLabel->setVisible(capabilities.canCompress);

ui->offCpuCheckBox->setCheckable(capabilities.libtraceeventSupport);

if (!capabilities.libtraceeventSupport) {
ui->offCpuCheckBox->setChecked(false);
ui->offCpuCheckBox->setText(
tr("perf doesn't support libtraceevent, you may need to build perf manually to support this"));
}
ui->offCpuCheckBox->setCheckable(capabilities.libtraceeventSupport);

if (!capabilities.canElevatePrivileges) {
ui->elevatePrivilegesCheckBox->setChecked(false);
ui->elevatePrivilegesCheckBox->setEnabled(false);
ui->elevatePrivilegesCheckBox->setText(
tr("(Note: Install pkexec, kdesudo, kdesu or KAuth to temporarily elevate perf privileges.)"));
} else {
ui->elevatePrivilegesCheckBox->setEnabled(true);
ui->elevatePrivilegesCheckBox->setText({});
}
});
if (!capabilities.libtraceeventSupport) {
ui->offCpuCheckBox->setChecked(false);
ui->offCpuCheckBox->setText(
tr("perf doesn't support libtraceevent, you may need to build perf manually to support this"));
}

m_recordHost->setHost(QStringLiteral("localhost"));
if (!capabilities.canElevatePrivileges) {
ui->elevatePrivilegesCheckBox->setChecked(false);
ui->elevatePrivilegesCheckBox->setEnabled(false);
ui->elevatePrivilegesCheckBox->setText(
tr("(Note: Install pkexec, kdesudo, kdesu or KAuth to temporarily elevate perf privileges.)"));
} else {
ui->elevatePrivilegesCheckBox->setEnabled(true);
ui->elevatePrivilegesCheckBox->setText({});
}
};
connect(m_recordHost, &RecordHost::perfCapabilitiesChanged, this, perfCapabilities);
perfCapabilities(m_recordHost->perfCapabilities());

ui->applicationName->comboBox()->setEditable(true);
ui->applicationName->setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly);
Expand Down Expand Up @@ -499,7 +501,6 @@ RecordPage::~RecordPage() = default;
void RecordPage::showRecordPage()
{
m_resultsFile.clear();
setError({});
updateRecordType();
ui->viewPerfRecordResultsButton->setEnabled(false);
}
Expand Down Expand Up @@ -706,8 +707,6 @@ void RecordPage::setError(const QString& message)

void RecordPage::updateRecordType()
{
setError({});

const auto recordType = selectedRecordType(ui);
ui->launchAppBox->setVisible(recordType == RecordType::LaunchApplication);
ui->attachAppBox->setVisible(recordType == RecordType::AttachToProcess);
Expand Down
Loading