0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE fix profilers

Browse Source
This commit is contained in:
Petr Mrázek 2015-04-06 20:52:59 +02:00
parent 3d3725f088
commit 58840ac10c
5 changed files with 143 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
application/MainWindow.cpp
View File

@ -1832,29 +1832,24 @@ void MainWindow::launchInstance(InstancePtr instance, AuthSessionPtr session,
proc->setHeader("MultiMC version: " + BuildConfig.printableVersionString() + "\n\n");
proc->arm();
if (profiler)
if (!profiler)
{
proc->launch();
return;
}
QString error;
if (!profiler->check(&error))
{
QMessageBox::critical(this, tr("Error"),
tr("Couldn't start profiler: %1").arg(error));
proc->abort();
QMessageBox::critical(this, tr("Error"), tr("Couldn't start profiler: %1").arg(error));
return;
}
BaseProfiler *profilerInstance = profiler->createProfiler(instance, this);
QProgressDialog dialog;
dialog.setMinimum(0);
dialog.setMaximum(0);
dialog.setValue(0);
dialog.setLabelText(tr("Waiting for profiler..."));
connect(&dialog, &QProgressDialog::canceled, profilerInstance,
&BaseProfiler::abortProfiling);
dialog.show();
connect(profilerInstance, &BaseProfiler::readyToLaunch,
[&dialog, this, proc](const QString & message)
[this, proc](const QString & message)
{
dialog.accept();
QMessageBox msg;
msg.setText(tr("The game launch is delayed until you press the "
"button. This is the right time to setup the profiler, as the "
@ -1862,28 +1857,23 @@ void MainWindow::launchInstance(InstancePtr instance, AuthSessionPtr session,
msg.setWindowTitle(tr("Waiting"));
msg.setIcon(QMessageBox::Information);
msg.addButton(tr("Launch"), QMessageBox::AcceptRole);
msg.setModal(true);
msg.exec();
proc->launch();
});
connect(profilerInstance, &BaseProfiler::abortLaunch,
[&dialog, this, proc](const QString & message)
[this, proc](const QString & message)
{
dialog.accept();
QMessageBox msg;
msg.setText(tr("Couldn't start the profiler: %1").arg(message));
msg.setWindowTitle(tr("Error"));
msg.setIcon(QMessageBox::Critical);
msg.addButton(QMessageBox::Ok);
msg.setModal(true);
msg.exec();
proc->abort();
});
profilerInstance->beginProfiling(proc);
dialog.exec();
}
else
{
proc->launch();
}
}
void MainWindow::onGameUpdateError(QString error)

69
logic/tools/JProfiler.cpp
View File

@ -7,29 +7,35 @@
#include "BaseProcess.h"
#include "BaseInstance.h"
class JProfiler : public BaseProfiler
{
Q_OBJECT
public:
JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
private slots:
void profilerStarted();
void profilerFinished(int exit, QProcess::ExitStatus status);
protected:
void beginProfilingImpl(BaseProcess *process);
private:
int listeningPort = 0;
};
JProfiler::JProfiler(SettingsObjectPtr settings, InstancePtr instance,
QObject *parent)
: BaseProfiler(settings, instance, parent)
{
}
void JProfiler::beginProfilingImpl(BaseProcess *process)
void JProfiler::profilerStarted()
{
int port = globalSettings->get("JProfilerPort").toInt();
QProcess *profiler = new QProcess(this);
profiler->setArguments(QStringList() << "-d" << QString::number(pid(process)) << "--gui"
<< "-p" << QString::number(port));
profiler->setProgram(QDir(globalSettings->get("JProfilerPath").toString())
#ifdef Q_OS_WIN
.absoluteFilePath("bin/jpenable.exe"));
#else
.absoluteFilePath("bin/jpenable"));
#endif
connect(profiler, &QProcess::started, [this, port]()
{ emit readyToLaunch(tr("Listening on port: %1").arg(port)); });
connect(profiler,
static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
[this](int exit, QProcess::ExitStatus status)
emit readyToLaunch(tr("Listening on port: %1").arg(listeningPort));
}
void JProfiler::profilerFinished(int exit, QProcess::ExitStatus status)
{
if (status == QProcess::CrashExit)
{
@ -40,9 +46,34 @@ void JProfiler::beginProfilingImpl(BaseProcess *process)
m_profilerProcess->deleteLater();
m_profilerProcess = 0;
}
});
profiler->start();
}
void JProfiler::beginProfilingImpl(BaseProcess *process)
{
listeningPort = globalSettings->get("JProfilerPort").toInt();
QProcess *profiler = new QProcess(this);
QStringList profilerArgs =
{
"-d", QString::number(pid(process)),
"--gui",
"-p", QString::number(listeningPort)
};
auto basePath = globalSettings->get("JProfilerPath").toString();
#ifdef Q_OS_WIN
QString profilerProgram = QDir(basePath).absoluteFilePath("bin/jpenable.exe");
#else
QString profilerProgram = QDir(basePath).absoluteFilePath("bin/jpenable");
#endif
profiler->setArguments(profilerArgs);
profiler->setProgram(profilerProgram);
connect(profiler, SIGNAL(started()), SLOT(profilerStarted()));
connect(profiler, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(profilerFinished(int,QProcess::ExitStatus)));
m_profilerProcess = profiler;
profiler->start();
}
void JProfilerFactory::registerSettings(SettingsObjectPtr settings)
@ -82,3 +113,5 @@ bool JProfilerFactory::check(const QString &path, QString *error)
}
return true;
}
#include "JProfiler.moc"

10
logic/tools/JProfiler.h
View File

@ -2,16 +2,6 @@
#include "BaseProfiler.h"
class JProfiler : public BaseProfiler
{
Q_OBJECT
public:
JProfiler(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
protected:
void beginProfilingImpl(BaseProcess *process);
};
class JProfilerFactory : public BaseProfilerFactory
{
public:

51
logic/tools/JVisualVM.cpp
View File

@ -7,23 +7,34 @@
#include "BaseProcess.h"
#include "BaseInstance.h"
class JVisualVM : public BaseProfiler
{
Q_OBJECT
public:
JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
private slots:
void profilerStarted();
void profilerFinished(int exit, QProcess::ExitStatus status);
protected:
void beginProfilingImpl(BaseProcess *process);
};
JVisualVM::JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
: BaseProfiler(settings, instance, parent)
{
}
void JVisualVM::beginProfilingImpl(BaseProcess *process)
void JVisualVM::profilerStarted()
{
QProcess *profiler = new QProcess(this);
profiler->setArguments(QStringList() << "--openpid" << QString::number(pid(process)));
profiler->setProgram(globalSettings->get("JVisualVMPath").toString());
connect(profiler, &QProcess::started, [this]()
{ emit readyToLaunch(tr("JVisualVM started")); });
connect(profiler,
static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
[this](int exit, QProcess::ExitStatus status)
emit readyToLaunch(tr("JVisualVM started"));
}
void JVisualVM::profilerFinished(int exit, QProcess::ExitStatus status)
{
if (exit != 0 || status == QProcess::CrashExit)
if (status == QProcess::CrashExit)
{
emit abortLaunch(tr("Profiler aborted"));
}
@ -32,7 +43,23 @@ void JVisualVM::beginProfilingImpl(BaseProcess *process)
m_profilerProcess->deleteLater();
m_profilerProcess = 0;
}
});
}
void JVisualVM::beginProfilingImpl(BaseProcess *process)
{
QProcess *profiler = new QProcess(this);
QStringList profilerArgs =
{
"--openpid", QString::number(pid(process))
};
auto programPath = globalSettings->get("JVisualVMPath").toString();
profiler->setArguments(profilerArgs);
profiler->setProgram(programPath);
connect(profiler, SIGNAL(started()), SLOT(profilerStarted()));
connect(profiler, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(profilerFinished(int,QProcess::ExitStatus)));
profiler->start();
m_profilerProcess = profiler;
}
@ -72,3 +99,5 @@ bool JVisualVMFactory::check(const QString &path, QString *error)
}
return true;
}
#include "JVisualVM.moc"

10
logic/tools/JVisualVM.h
View File

@ -2,16 +2,6 @@
#include "BaseProfiler.h"
class JVisualVM : public BaseProfiler
{
Q_OBJECT
public:
JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent = 0);
protected:
void beginProfilingImpl(BaseProcess *process);
};
class JVisualVMFactory : public BaseProfilerFactory
{
public: