Divide memory sizes by 1024 byte chunks

pull/58/head
jackun 5 years ago committed by FlightlessMango
parent 857dcf7fb8
commit 1a8b98e09d

@ -67,7 +67,7 @@ void *getNvidiaGpuInfo(void *){
getNvidiaInfo(); getNvidiaInfo();
gpuLoad = nvidiaUtilization.gpu; gpuLoad = nvidiaUtilization.gpu;
gpuTemp = nvidiaTemp; gpuTemp = nvidiaTemp;
gpuMemUsed = float(nvidiaMemory.used / (1024 * 1024)) / 1000; gpuMemUsed = nvidiaMemory.used / (1024.f * 1024.f * 1024.f);
gpuCoreClock = nvidiaCoreClock; gpuCoreClock = nvidiaCoreClock;
gpuMemClock = nvidiaMemClock * 2; gpuMemClock = nvidiaMemClock * 2;
} }
@ -77,6 +77,8 @@ void *getNvidiaGpuInfo(void *){
} }
void *getAmdGpuUsage(void *){ void *getAmdGpuUsage(void *){
int64_t value = 0;
if (amdGpuFile) { if (amdGpuFile) {
rewind(amdGpuFile); rewind(amdGpuFile);
fflush(amdGpuFile); fflush(amdGpuFile);
@ -97,38 +99,38 @@ void *getAmdGpuUsage(void *){
if (amdGpuVramTotalFile) { if (amdGpuVramTotalFile) {
rewind(amdGpuVramTotalFile); rewind(amdGpuVramTotalFile);
fflush(amdGpuVramTotalFile); fflush(amdGpuVramTotalFile);
if (fscanf(amdGpuVramTotalFile, "%" PRId64, &amdgpu.memoryTotal) != 1) if (fscanf(amdGpuVramTotalFile, "%" PRId64, &value) != 1)
amdgpu.memoryTotal = 0; value = 0;
amdgpu.memoryTotal /= (1024 * 1024); amdgpu.memoryTotal = value / (1024 * 1024);
gpuMemTotal = amdgpu.memoryTotal; gpuMemTotal = amdgpu.memoryTotal;
} }
if (amdGpuVramUsedFile) { if (amdGpuVramUsedFile) {
rewind(amdGpuVramUsedFile); rewind(amdGpuVramUsedFile);
fflush(amdGpuVramUsedFile); fflush(amdGpuVramUsedFile);
if (fscanf(amdGpuVramUsedFile, "%" PRId64, &amdgpu.memoryUsed) != 1) if (fscanf(amdGpuVramUsedFile, "%" PRId64, &value) != 1)
amdgpu.memoryUsed = 0; value = 0;
amdgpu.memoryUsed /= (1024 * 1024); amdgpu.memoryUsed = value / (1024 * 1024);
gpuMemUsed = float(amdgpu.memoryUsed) / 1000; gpuMemUsed = amdgpu.memoryUsed / 1024.f;
} }
if (amdGpuCoreClockFile) { if (amdGpuCoreClockFile) {
rewind(amdGpuCoreClockFile); rewind(amdGpuCoreClockFile);
fflush(amdGpuCoreClockFile); fflush(amdGpuCoreClockFile);
if (fscanf(amdGpuCoreClockFile, "%" PRId64, &amdgpu.CoreClock) != 1) if (fscanf(amdGpuCoreClockFile, "%" PRId64, &value) != 1)
amdgpu.CoreClock = 0; value = 0;
amdgpu.CoreClock /= 1000000; amdgpu.CoreClock = value / 1000000;
gpuCoreClock = amdgpu.CoreClock; gpuCoreClock = amdgpu.CoreClock;
} }
if (amdGpuMemoryClockFile) { if (amdGpuMemoryClockFile) {
rewind(amdGpuMemoryClockFile); rewind(amdGpuMemoryClockFile);
fflush(amdGpuMemoryClockFile); fflush(amdGpuMemoryClockFile);
if (fscanf(amdGpuMemoryClockFile, "%" PRId64, &amdgpu.MemClock) != 1) if (fscanf(amdGpuMemoryClockFile, "%" PRId64, &value) != 1)
amdgpu.MemClock = 0; value = 0;
amdgpu.MemClock /= 1000000; amdgpu.MemClock = value / 1000000;
gpuMemClock = amdgpu.MemClock; gpuMemClock = amdgpu.MemClock;
} }

Loading…
Cancel
Save