@ -2,32 +2,27 @@
|
||||
|
||||
#include <QDir>
|
||||
|
||||
#include "settings/SettingsObject.h"
|
||||
#include "launch/LaunchTask.h"
|
||||
#include "BaseInstance.h"
|
||||
#include "launch/LaunchTask.h"
|
||||
#include "settings/SettingsObject.h"
|
||||
|
||||
class JProfiler : public BaseProfiler
|
||||
{
|
||||
class JProfiler : public BaseProfiler {
|
||||
Q_OBJECT
|
||||
public:
|
||||
JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
|
||||
public:
|
||||
JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent = 0);
|
||||
|
||||
private slots:
|
||||
private slots:
|
||||
void profilerStarted();
|
||||
void profilerFinished(int exit, QProcess::ExitStatus status);
|
||||
|
||||
protected:
|
||||
protected:
|
||||
void beginProfilingImpl(shared_qobject_ptr<LaunchTask> process);
|
||||
|
||||
private:
|
||||
private:
|
||||
int listeningPort = 0;
|
||||
};
|
||||
|
||||
JProfiler::JProfiler(SettingsObjectPtr settings, InstancePtr instance,
|
||||
QObject *parent)
|
||||
: BaseProfiler(settings, instance, parent)
|
||||
{
|
||||
}
|
||||
JProfiler::JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject* parent) : BaseProfiler(settings, instance, parent) {}
|
||||
|
||||
void JProfiler::profilerStarted()
|
||||
{
|
||||
@ -36,12 +31,10 @@ void JProfiler::profilerStarted()
|
||||
|
||||
void JProfiler::profilerFinished([[maybe_unused]] int exit, QProcess::ExitStatus status)
|
||||
{
|
||||
if (status == QProcess::CrashExit)
|
||||
{
|
||||
if (status == QProcess::CrashExit) {
|
||||
emit abortLaunch(tr("Profiler aborted"));
|
||||
}
|
||||
if (m_profilerProcess)
|
||||
{
|
||||
if (m_profilerProcess) {
|
||||
m_profilerProcess->deleteLater();
|
||||
m_profilerProcess = 0;
|
||||
}
|
||||
@ -50,13 +43,8 @@ void JProfiler::profilerFinished([[maybe_unused]] int exit, QProcess::ExitStatus
|
||||
void JProfiler::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
|
||||
{
|
||||
listeningPort = globalSettings->get("JProfilerPort").toInt();
|
||||
QProcess *profiler = new QProcess(this);
|
||||
QStringList profilerArgs =
|
||||
{
|
||||
"-d", QString::number(process->pid()),
|
||||
"--gui",
|
||||
"-p", QString::number(listeningPort)
|
||||
};
|
||||
QProcess* profiler = new QProcess(this);
|
||||
QStringList profilerArgs = { "-d", QString::number(process->pid()), "--gui", "-p", QString::number(listeningPort) };
|
||||
auto basePath = globalSettings->get("JProfilerPath").toString();
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
@ -82,31 +70,28 @@ void JProfilerFactory::registerSettings(SettingsObjectPtr settings)
|
||||
globalSettings = settings;
|
||||
}
|
||||
|
||||
BaseExternalTool *JProfilerFactory::createTool(InstancePtr instance, QObject *parent)
|
||||
BaseExternalTool* JProfilerFactory::createTool(InstancePtr instance, QObject* parent)
|
||||
{
|
||||
return new JProfiler(globalSettings, instance, parent);
|
||||
}
|
||||
|
||||
bool JProfilerFactory::check(QString *error)
|
||||
bool JProfilerFactory::check(QString* error)
|
||||
{
|
||||
return check(globalSettings->get("JProfilerPath").toString(), error);
|
||||
}
|
||||
|
||||
bool JProfilerFactory::check(const QString &path, QString *error)
|
||||
bool JProfilerFactory::check(const QString& path, QString* error)
|
||||
{
|
||||
if (path.isEmpty())
|
||||
{
|
||||
if (path.isEmpty()) {
|
||||
*error = QObject::tr("Empty path");
|
||||
return false;
|
||||
}
|
||||
QDir dir(path);
|
||||
if (!dir.exists())
|
||||
{
|
||||
if (!dir.exists()) {
|
||||
*error = QObject::tr("Path does not exist");
|
||||
return false;
|
||||
}
|
||||
if (!dir.exists("bin") || !(dir.exists("bin/jprofiler") || dir.exists("bin/jprofiler.exe")) || !dir.exists("bin/agent.jar"))
|
||||
{
|
||||
if (!dir.exists("bin") || !(dir.exists("bin/jprofiler") || dir.exists("bin/jprofiler.exe")) || !dir.exists("bin/agent.jar")) {
|
||||
*error = QObject::tr("Invalid JProfiler install");
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user