CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-2412: collect dead processes on linux properly

Browse Source 
Issues were caused by use of `popen()` with no `pclose()` counterpart...
This commit is contained in:
Petr Mrázek 2018-10-31 22:44:23 +01:00
parent aef0ccb1a2
commit d5037d4f79
2 changed files with 61 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/FileSystem.cpp
View File

@ -294,7 +294,7 @@ QString NormalizePath(QString path)
} }
} }
QString badFilenameChars = "\"\\/?<>:*|!"; QString badFilenameChars = "\"\\/?<>:*|!+";
QString RemoveInvalidFilenameChars(QString string, QChar replaceWith) QString RemoveInvalidFilenameChars(QString string, QChar replaceWith)
{ {

69
api/logic/minecraft/launch/PrintInstanceInfo.cpp
View File

@ -19,30 +19,33 @@
#include "PrintInstanceInfo.h" #include "PrintInstanceInfo.h"
#include <launch/LaunchTask.h> #include <launch/LaunchTask.h>
void PrintInstanceInfo::executeTask()
{
auto instance = m_parent->instance();
auto lines = instance->verboseDescription(m_session);
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
namespace {
void probeProcCpuinfo(QStringList &log)
{
std::ifstream cpuin("/proc/cpuinfo"); std::ifstream cpuin("/proc/cpuinfo");
for (std::string line; std::getline(cpuin, line);) for (std::string line; std::getline(cpuin, line);)
{ {
if (strncmp(line.c_str(), "model name", 10) == 0) if (strncmp(line.c_str(), "model name", 10) == 0)
{ {
QStringList clines = (QStringList() << QString::fromStdString(line.substr(13, std::string::npos))); log << QString::fromStdString(line.substr(13, std::string::npos));
logLines(clines, MessageLevel::MultiMC);
break; break;
} }
} }
}
void runLspci(QStringList &log)
{
// FIXME: fixed size buffers...
char buff[512]; char buff[512];
int gpuline = -1; int gpuline = -1;
int cline = 0; int cline = 0;
FILE *fp = popen("lspci -k", "r"); FILE * lspci = popen("lspci -k", "r");
if (fp != NULL)
{ if (!lspci)
while (fgets(buff, 512, fp) != NULL) return;
while (fgets(buff, 512, lspci) != NULL)
{ {
std::string str(buff); std::string str(buff);
if (str.length() < 9) if (str.length() < 9)
@ -50,36 +53,54 @@ void PrintInstanceInfo::executeTask()
if (str.substr(8, 3) == "VGA") if (str.substr(8, 3) == "VGA")
{ {
gpuline = cline; gpuline = cline;
QStringList glines = (QStringList() << QString::fromStdString(str.substr(35, std::string::npos))); log << QString::fromStdString(str.substr(35, std::string::npos));
logLines(glines, MessageLevel::MultiMC);
} }
if (gpuline > -1 && gpuline != cline) if (gpuline > -1 && gpuline != cline)
{ {
if (cline - gpuline < 3) if (cline - gpuline < 3)
{ {
QStringList alines = (QStringList() << QString::fromStdString(str.substr(1, std::string::npos))); log << QString::fromStdString(str.substr(1, std::string::npos));
logLines(alines, MessageLevel::MultiMC);
} }
} }
cline++; cline++;
} }
} pclose(lspci);
}
FILE *fp2 = popen("glxinfo", "r"); void runGlxinfo(QStringList & log)
if (fp2 != NULL) {
{ // FIXME: fixed size buffers...
while (fgets(buff, 512, fp2) != NULL) char buff[512];
FILE *glxinfo = popen("glxinfo", "r");
if (!glxinfo)
return;
while (fgets(buff, 512, glxinfo) != NULL)
{ {
if (strncmp(buff, "OpenGL version string:", 22) == 0) if (strncmp(buff, "OpenGL version string:", 22) == 0)
{ {
QStringList drlines = (QStringList() << QString::fromUtf8(buff)); log << QString::fromUtf8(buff);
logLines(drlines, MessageLevel::MultiMC);
break; break;
} }
} }
} pclose(glxinfo);
}
}
#endif #endif
logLines(lines, MessageLevel::MultiMC); void PrintInstanceInfo::executeTask()
{
auto instance = m_parent->instance();
QStringList log;
#ifdef Q_OS_LINUX
::probeProcCpuinfo(log);
::runLspci(log);
::runGlxinfo(log);
#endif
logLines(log, MessageLevel::MultiMC);
logLines(instance->verboseDescription(m_session), MessageLevel::MultiMC);
emitSucceeded(); emitSucceeded();
} }