review fixes

GPUMeter.c

@@ -73,18 +73,18 @@ static int humanTimeUnit(char* buffer, size_t size, unsigned long long int value
 }
 
 static void GPUMeter_updateValues(Meter* this) {
-   const Machine* machine = this->host;
+   const Machine* host = this->host;
    char* buffer = this->txtBuffer;
    size_t size = sizeof(this->txtBuffer);
 
-   if (!isNonnegative(machine->totalGPUUsage)) {
+   if (!isNonnegative(host->totalGPUUsage)) {
       this->values[0] = 0;
       int written = xSnprintf(buffer, size, "N/A");
       METER_BUFFER_CHECK(buffer, size, written);
       return;
    }
 
-   int written = xSnprintf(buffer, size, "%.1f", machine->totalGPUUsage);
+   int written = xSnprintf(buffer, size, "%.1f", host->totalGPUUsage);
    METER_BUFFER_CHECK(buffer, size, written);
    METER_BUFFER_APPEND_CHR(buffer, size, '%');
 }

darwin/DarwinMachine.c

@@ -77,6 +77,11 @@ static void DarwinMachine_getVMStats(DarwinMachine* this) {
 #endif
 }
 
+static void DarwinMachine_setDeafultGPUValues(Machine* super) {
+   super->totalGPUUsage = (double)-1;
+   super->totalGPUTimeDiff = (unsigned long long int)-1;
+}
+
 void Machine_scan(Machine* super) {
    DarwinMachine* host = (DarwinMachine*) super;
 
@@ -138,31 +143,38 @@ bool Machine_isCPUonline(const Machine* host, unsigned int id) {
 
 void Machine_scanGPUUsage(Machine* super) {
    DarwinMachine* dhost = (DarwinMachine *)super;
-   CFMutableDictionaryRef properties = NULL;
-   CFDictionaryRef perfStats;
-   CFNumberRef deviceUtil;
-   int device = 0, ret;
-
+
+   DarwinMachine_setDeafultGPUValues(super);
+
    if (!dhost->GPUService) {
       return;
    }
-
-   ret = IORegistryEntryCreateCFProperties(dhost->GPUService, &properties, kCFAllocatorDefault, kNilOptions);
+
+   CFMutableDictionaryRef properties = NULL;
+   kern_return_t ret = IORegistryEntryCreateCFProperties(dhost->GPUService, &properties, kCFAllocatorDefault, kNilOptions);
    if (ret != KERN_SUCCESS) {
       return;
    }
-
-   perfStats = CFDictionaryGetValue(properties, CFSTR("PerformanceStatistics"));
-
-   assert(perfStats && CFGetTypeID(perfStats) == CFDictionaryGetTypeID());
 
-   deviceUtil = CFDictionaryGetValue(perfStats, CFSTR("Device Utilization %"));
+   CFDictionaryRef perfStats = CFDictionaryGetValue(properties, CFSTR("PerformanceStatistics"));
+
+   if (!perfStats) {
+      CFRelease(properties);
+      return;
+   }
+
+   assert(CFGetTypeID(perfStats) == CFDictionaryGetTypeID());
+
+   CFNumberRef deviceUtil = CFDictionaryGetValue(perfStats, CFSTR("Device Utilization %"));
    if (!deviceUtil) {
+      CFRelease(properties);
       return;
    }
-
+
+   int device = -1;
    CFNumberGetValue(deviceUtil, kCFNumberIntType, &device);
    CFRelease(properties);
 
    super->totalGPUUsage = (double)device;
+   super->totalGPUTimeDiff = (unsigned long long int)-1;
 }