Merge pull request #119 from andrealmeid/log_to_mem

Write log in a memory buffer and periodically write it in disk

src/logging.h

@@ -10,16 +10,16 @@ using namespace std;
 
 string os, cpu, gpu, ram, kernel, driver;
 bool sysInfoFetched = false;
-int gpuLoadLog = 0, cpuLoadLog = 0, log_period = 0;
+int gpuLoadLog = 0, cpuLoadLog = 0, log_period = 0, elapsedLog;
 
 struct logData{
   double fps;
-  double cpu;
+  int cpu;
-  double gpu;
+  int gpu;
-  double previous;
+  int previous;
 };
 
-double fps, elapsedLog;
+double fps;
 std::vector<logData> logArray;
 ofstream out;
 const char* log_period_env = std::getenv("LOG_PERIOD");
@@ -27,37 +27,43 @@ int num;
 bool loggingOn;
 uint64_t log_start;
 
-// void writeFile(string date){
+void writeFile(string filename){
-// 	out.open(mangohud_output_env + date, ios::out | ios::app);
+  out.open(filename, ios::out | ios::app);
 
-// 	for (size_t i = 0; i < logArray.size(); i++) {
+  for (size_t i = 0; i < logArray.size(); i++)
-//      out << logArray[i].fps << "," << logArray[i].cpu  << "," << logArray[i].gpu << endl;
+    out << logArray[i].fps << "," << logArray[i].cpu  << "," << logArray[i].gpu << "," << logArray[i].previous << endl;
-//   }
+
-// 	out.close();
+  out.close();
-// 	logArray.clear();
+  logArray.clear();
-// }
+}
 
 void *logging(void *params_void){
   overlay_params *params = reinterpret_cast<overlay_params *>(params_void);
   time_t now_log = time(0);
   tm *log_time = localtime(&now_log);
-	string date = to_string(log_time->tm_year + 1900) + "-" + to_string(1 + log_time->tm_mon) + "-" + to_string(log_time->tm_mday) + "_" + to_string(1 + log_time->tm_hour) + "-" + to_string(1 + log_time->tm_min) + "-" + to_string(1 + log_time->tm_sec);
+  string date = to_string(log_time->tm_year + 1900) + "-" +
+                to_string(1 + log_time->tm_mon) + "-" +
+                to_string(log_time->tm_mday) + "_" +
+                to_string(1 + log_time->tm_hour) + "-" +
+                to_string(1 + log_time->tm_min) + "-" +
+                to_string(1 + log_time->tm_sec);
   log_start = os_time_get();
   out.open(params->output_file + date, ios::out | ios::app);
   out << "os," << "cpu," << "gpu," << "ram," << "kernel," << "driver" << endl;
   out << os << "," << cpu << "," << gpu << "," << ram << "," << kernel << "," << driver << endl;
-	while (loggingOn){
+  out.close();
+
+  while (loggingOn){
     uint64_t now = os_time_get();
-    elapsedLog = (double)(now - log_start);
+    elapsedLog = now - log_start;
-    out << fps << "," << cpuLoadLog << "," << gpuLoadLog << "," <<  now - log_start << endl;
+    logArray.push_back({fps, cpuLoadLog, gpuLoadLog, elapsedLog});
-		// logArray.push_back({fps, cpuLoadLog, gpuLoadLog, 0.0f});
 
-    if ((elapsedLog) >= params->log_duration * 1000000 && params->log_duration)
+    if (params->log_duration && (elapsedLog) >= params->log_duration * 1000000)
       loggingOn = false;
-    
+    else
-    this_thread::sleep_for(chrono::milliseconds(log_period));
+      this_thread::sleep_for(chrono::milliseconds(log_period));
   }
-  // writeFile(date);
+
-  out.close();
+  writeFile(params->output_file + date);
   return NULL; 
-}
+}