add CPUInfo::Time struct

Author: jcdkiki

worker/src/main.cpp

@@ -1,9 +1,10 @@
+#include "metrics-collector.hpp"
+#include "file.hpp"
+
 #include <iostream>
 #include <cstring>
 #include <thread>
 #include <signal.h>
-#include "file.hpp"
-#include "metrics-collector.hpp"
 
 void print_usage(const std::string& program_name) {
     std::cerr << "Usage: " << program_name << " hash" 

worker/src/metrics-collector.cpp

@@ -47,8 +47,8 @@ MetricsCollector::MetricsCollector(const char *gateway_address, const char *gate
     while (true) {
         CPUInfo cpu;
 
-        file >> cpu_name >> cpu.last_total_user >> cpu.last_total_user_low
-             >> cpu.last_total_sys >> cpu.last_total_idle
+        file >> cpu_name >> cpu.time.user >> cpu.time.user_low
+             >> cpu.time.sys >> cpu.time.idle
              >> ign >> ign >> ign >> ign >> ign >> ign;
 
         if (cpu_name.find("cpu") != 0)
@@ -100,40 +100,35 @@ MetricsCollector::~MetricsCollector()
 void MetricsCollector::GetCPUUsage()
 {
     std::ifstream file("/proc/stat");
-    uint64_t total_user, total_user_low, total_sys, total_idle, total;
+    CPUInfo::Time cur_time;
     double percent;
 
     std::string cpu_name;
     int ign;
 
     while (true) {
-        file >> cpu_name >> total_user >> total_user_low >> total_sys >> total_idle
+        file >> cpu_name >> cur_time.user >> cur_time.user_low >> cur_time.sys >> cur_time.idle
              >> ign >> ign >> ign >> ign >> ign >> ign;
 
         if (cpu_name.find("cpu") != 0)
             break;
 
         CPUInfo &cpu = cpu_usage[cpu_name];
-        if (total_user < cpu.last_total_user || total_user_low < cpu.last_total_user_low ||
-            total_sys < cpu.last_total_sys || total_idle < cpu.last_total_idle) {
+        if (cur_time.user < cpu.time.user || cur_time.user_low < cpu.time.user_low ||
+            cur_time.sys < cpu.time.sys || cur_time.idle < cpu.time.idle) {
             // overflow detection
             percent = -1.0;
         }
         else {
-            total = (total_user - cpu.last_total_user) + (total_user_low - cpu.last_total_user_low) +
-                (total_sys - cpu.last_total_sys);
+            uint64_t total = (cur_time.user - cpu.time.user) + (cur_time.user_low - cpu.time.user_low) +
+                (cur_time.sys - cpu.time.sys);
 
             percent = total;
-            total += (total_idle - cpu.last_total_idle);
-            percent /= total;
-            percent *= 100;
+            total += (cur_time.idle - cpu.time.idle);
+            percent = (total == 0) ? -1.0 : (percent / total) * 100.0;
         }
 
-        cpu.last_total_user = total_user;
-        cpu.last_total_user_low = total_user_low;
-        cpu.last_total_sys = total_sys;
-        cpu.last_total_idle = total_idle;
-
+        cpu.time = cur_time;
         cpu.gauge->Set(percent);
     }
 

worker/src/metrics-collector.hpp

@@ -9,10 +9,15 @@ class MetricsCollector {
 
     struct CPUInfo {
         prometheus::Gauge *gauge;
-        uint64_t last_total_user;
-        uint64_t last_total_user_low;
-        uint64_t last_total_sys;
-        uint64_t last_total_idle;
+        
+        struct Time {
+            uint64_t user;
+            uint64_t user_low;
+            uint64_t sys;
+            uint64_t idle;
+        };
+
+        Time time;
     };
 
     std::unordered_map<std::string, CPUInfo> cpu_usage;