fix gpu and gputemp

This commit is contained in:
arcan1s 2014-06-09 15:17:31 +04:00
parent c659f16d7e
commit b7d1802ca8
2 changed files with 28 additions and 28 deletions

View File

@ -157,10 +157,12 @@ void ExtendedSysMon::setProcesses()
} }
// gpu // gpu
processes[QString("gpu")].append(new QProcess); processes[QString("gpu")].append(new QProcess);
connect(processes[QString("gpu")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(setGpu())); connect(processes[QString("gpu")][0], SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(setGpu(int, QProcess::ExitStatus)));
// gputemp // gputemp
processes[QString("gputemp")].append(new QProcess); processes[QString("gputemp")].append(new QProcess);
connect(processes[QString("gputemp")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(setGpuTemp())); connect(processes[QString("gputemp")][0], SIGNAL(finished(int, QProcess::ExitStatus)),
this, SLOT(setGpuTemp(int, QProcess::ExitStatus)));
// hddtemp // hddtemp
for (int i=0; i<configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts).count(); i++) { for (int i=0; i<configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts).count(); i++) {
processes[QString("hddtemp")].append(new QProcess); processes[QString("hddtemp")].append(new QProcess);
@ -288,23 +290,22 @@ void ExtendedSysMon::getGpu(const QString device)
if (debug) qDebug() << "[DE]" << "[getGpu]" << ":" << "Run function with device" << device; if (debug) qDebug() << "[DE]" << "[getGpu]" << ":" << "Run function with device" << device;
if ((device != QString("nvidia")) && (device != QString("ati"))) if ((device != QString("nvidia")) && (device != QString("ati")))
return; return;
QString cmd = QString("");
if (device == QString("nvidia")) { if (device == QString("nvidia"))
QString cmd = QString("nvidia-smi -q -d UTILIZATION"); cmd = QString("nvidia-smi -q -d UTILIZATION");
if (debug) qDebug() << "[DE]" << "[getGpu]" << ":" << "Run cmd" << cmd; else if (device == QString("ati"))
processes[QString("gpu")][0]->start(cmd); cmd = QString("aticonfig --od-getclocks");
} if (debug) qDebug() << "[DE]" << "[getGpu]" << ":" << "Run cmd" << cmd;
else if (device == QString("ati")) { processes[QString("gpu")][0]->start(cmd);
QString cmd = QString("aticonfig --od-getclocks");
if (debug) qDebug() << "[DE]" << "[getGpu]" << ":" << "Run cmd" << cmd;
processes[QString("gpu")][0]->start(cmd);
}
} }
void ExtendedSysMon::setGpu() void ExtendedSysMon::setGpu(int exitCode, QProcess::ExitStatus exitStatus)
{ {
Q_UNUSED(exitStatus)
if (debug) qDebug() << "[DE]" << "[setGpu]"; if (debug) qDebug() << "[DE]" << "[setGpu]";
if (debug) qDebug() << "[DE]" << "[setGpu]" << ":" << "Cmd returns" << exitCode;
float value = 0.0; float value = 0.0;
QString qoutput; QString qoutput;
if (configuration[QString("GPUDEV")] == QString("nvidia")) { if (configuration[QString("GPUDEV")] == QString("nvidia")) {
@ -342,23 +343,22 @@ void ExtendedSysMon::getGpuTemp(const QString device)
if (debug) qDebug() << "[DE]" << "[getGpuTemp]" << ":" << "Run function with device" << device; if (debug) qDebug() << "[DE]" << "[getGpuTemp]" << ":" << "Run function with device" << device;
if ((device != QString("nvidia")) && (device != QString("ati"))) if ((device != QString("nvidia")) && (device != QString("ati")))
return; return;
QString cmd = QString("");
if (device == QString("nvidia")) { if (device == QString("nvidia"))
QString cmd = QString("nvidia-smi -q -d TEMPERATURE"); cmd = QString("nvidia-smi -q -d TEMPERATURE");
if (debug) qDebug() << "[DE]" << "[getGpuTemp]" << ":" << "Run cmd" << cmd; else if (device == QString("ati"))
processes[QString("gputemp")][0]->start(cmd); cmd = QString("aticonfig --od-gettemperature");
} if (debug) qDebug() << "[DE]" << "[getGpuTemp]" << ":" << "Run cmd" << cmd;
else if (device == QString("ati")) { processes[QString("gputemp")][0]->start(cmd);
QString cmd = QString("aticonfig --od-gettemperature");
if (debug) qDebug() << "[DE]" << "[getGpuTemp]" << ":" << "Run cmd" << cmd;
processes[QString("gputemp")][0]->start(cmd);
}
} }
void ExtendedSysMon::setGpuTemp() void ExtendedSysMon::setGpuTemp(int exitCode, QProcess::ExitStatus exitStatus)
{ {
Q_UNUSED(exitStatus)
if (debug) qDebug() << "[DE]" << "[setGpuTemp]"; if (debug) qDebug() << "[DE]" << "[setGpuTemp]";
if (debug) qDebug() << "[DE]" << "[setGpuTemp]" << ":" << "Cmd returns" << exitCode;
float value = 0.0; float value = 0.0;
QString qoutput; QString qoutput;
if (configuration[QString("GPUDEV")] == QString("nvidia")) { if (configuration[QString("GPUDEV")] == QString("nvidia")) {

View File

@ -48,8 +48,8 @@ protected:
private slots: private slots:
void setCustomCmd(int exitCode, QProcess::ExitStatus exitStatus); void setCustomCmd(int exitCode, QProcess::ExitStatus exitStatus);
void setGpu(); void setGpu(int exitCode, QProcess::ExitStatus exitStatus);
void setGpuTemp(); void setGpuTemp(int exitCode, QProcess::ExitStatus exitStatus);
void setHddTemp(); void setHddTemp();
void setUpgradeInfo(int exitCode, QProcess::ExitStatus exitStatus); void setUpgradeInfo(int exitCode, QProcess::ExitStatus exitStatus);
void setPlayer(); void setPlayer();