12f0d51c0c
- convert qt connect calls to use function pointers instead of the signal/slot macros wherever practical (UI classes were mostly left alone, target was tasks and processes) - give signals an explicit receivers to use the static method over the instance method wherever practical - ensure networks tasks are using the `errorOccured` signal added in Qt5.15 over the deprecated `error` signal - ensure all networks tasks have an sslErrors signal connected - add seemingly missing `MinecraftAccount::authSucceeded` connection for `MSAInteractive` login flow Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
105 lines
2.6 KiB
C++
105 lines
2.6 KiB
C++
#include "JVisualVM.h"
|
|
|
|
#include <QDir>
|
|
#include <QStandardPaths>
|
|
|
|
#include "settings/SettingsObject.h"
|
|
#include "launch/LaunchTask.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(shared_qobject_ptr<LaunchTask> process);
|
|
};
|
|
|
|
|
|
JVisualVM::JVisualVM(SettingsObjectPtr settings, InstancePtr instance, QObject *parent)
|
|
: BaseProfiler(settings, instance, parent)
|
|
{
|
|
}
|
|
|
|
void JVisualVM::profilerStarted()
|
|
{
|
|
emit readyToLaunch(tr("JVisualVM started"));
|
|
}
|
|
|
|
void JVisualVM::profilerFinished(int exit, QProcess::ExitStatus status)
|
|
{
|
|
if (status == QProcess::CrashExit)
|
|
{
|
|
emit abortLaunch(tr("Profiler aborted"));
|
|
}
|
|
if (m_profilerProcess)
|
|
{
|
|
m_profilerProcess->deleteLater();
|
|
m_profilerProcess = 0;
|
|
}
|
|
}
|
|
|
|
void JVisualVM::beginProfilingImpl(shared_qobject_ptr<LaunchTask> process)
|
|
{
|
|
QProcess *profiler = new QProcess(this);
|
|
QStringList profilerArgs =
|
|
{
|
|
"--openpid", QString::number(process->pid())
|
|
};
|
|
auto programPath = globalSettings->get("JVisualVMPath").toString();
|
|
|
|
profiler->setArguments(profilerArgs);
|
|
profiler->setProgram(programPath);
|
|
|
|
connect(profiler, &QProcess::started, this, &JVisualVM::profilerStarted);
|
|
connect(profiler, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &JVisualVM::profilerFinished);
|
|
|
|
profiler->start();
|
|
m_profilerProcess = profiler;
|
|
}
|
|
|
|
void JVisualVMFactory::registerSettings(SettingsObjectPtr settings)
|
|
{
|
|
QString defaultValue = QStandardPaths::findExecutable("jvisualvm");
|
|
if (defaultValue.isNull())
|
|
{
|
|
defaultValue = QStandardPaths::findExecutable("visualvm");
|
|
}
|
|
settings->registerSetting("JVisualVMPath", defaultValue);
|
|
globalSettings = settings;
|
|
}
|
|
|
|
BaseExternalTool *JVisualVMFactory::createTool(InstancePtr instance, QObject *parent)
|
|
{
|
|
return new JVisualVM(globalSettings, instance, parent);
|
|
}
|
|
|
|
bool JVisualVMFactory::check(QString *error)
|
|
{
|
|
return check(globalSettings->get("JVisualVMPath").toString(), error);
|
|
}
|
|
|
|
bool JVisualVMFactory::check(const QString &path, QString *error)
|
|
{
|
|
if (path.isEmpty())
|
|
{
|
|
*error = QObject::tr("Empty path");
|
|
return false;
|
|
}
|
|
QFileInfo finfo(path);
|
|
if (!finfo.isExecutable() || !finfo.fileName().contains("visualvm"))
|
|
{
|
|
*error = QObject::tr("Invalid path to JVisualVM");
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
#include "JVisualVM.moc"
|