Fixing recommendations from coding review Udacity

Author: textanalyticsman

src/format.cpp

@@ -1,4 +1,5 @@
 #include <string>
+#include <iomanip>
 
 #include "format.h"
 
@@ -19,8 +20,13 @@ string Format::ElapsedTime(long seconds)
     seconds %= 60;
 
     long int tseconds{ seconds };
-    
-    string result { std::to_string(tdays) + ":" + std::to_string(thours) + ":" + std::to_string(tminutes) + ":" + std::to_string(tseconds)};
 
-    return result;
+    // I am using this answer https://knowledge.udacity.com/questions/155686
+    std::ostringstream stream;
+      stream << std::setw(2) << std::setfill('0') << tdays << ":"
+      <<std::setw(2) << std::setfill('0') << thours << ":" 
+      << std::setw(2) << std::setfill('0') << tminutes << ":"
+      << std::setw(2) << std::setfill('0') << tseconds;
+
+    return stream.str();
 }

src/linux_parser.cpp

@@ -372,34 +372,42 @@ string LinuxParser::User(int pid)
 }
 
 // Read and return the uptime of a process
+// This implementation only works with kernel > 2.6
+// Otherwise it will retur zero.
 long LinuxParser::UpTime(int pid) 
-{ 
+{
+  std::string kernel{ LinuxParser::Kernel() };
+  float kernel_version{ std::stof(kernel.substr(0,3)) };
   long int uptime{ 0 };
-  std::string line;
 
-  std::ifstream filestream(kProcDirectory + std::to_string(pid) +  kStatFilename);
-
-  if (filestream.is_open()) 
-    std::getline(filestream, line);
-  
-  // Sometimes there are process that dies and then the pseudo file disappears, which causes errors.
-  // Thus, if no data is detected, the analysis is by passed
-  if(line != "")
+  if (kernel_version > 2.6)
   {
-      std::istringstream linestream{ line };
-      std::string tmp;      
-      int index{0};
+    std::string line;
 
-      while (linestream >> tmp)
-      {
-        ++index;
-        if(index == 22)
-          break;        
-      }
+    std::ifstream filestream(kProcDirectory + std::to_string(pid) +  kStatFilename);
 
-      long int hertz{ sysconf(_SC_CLK_TCK) };          
+    if (filestream.is_open()) 
+      std::getline(filestream, line);
+    
+    // Sometimes there are process that dies and then the pseudo file disappears, which causes errors.
+    // Thus, if no data is detected, the analysis is by passed
+    if(line != "")
+    {
+        std::istringstream linestream{ line };
+        std::string tmp;      
+        int index{0};
 
-      uptime = std::stol(tmp) / hertz;
+        while (linestream >> tmp)
+        {
+          ++index;
+          if(index == 22)
+            break;        
+        }
+
+        long int hertz{ sysconf(_SC_CLK_TCK) };          
+
+        uptime = UpTime() - std::stol(tmp) / hertz;
+    }
   }
 
   return uptime;

src/ncurses_display.cpp

@@ -60,7 +60,7 @@ void NCursesDisplay::DisplayProcesses(std::vector<Process>& processes,
   int const cpu_column{19};
   int const ram_column{29};
   int const time_column{39};
-  int const command_column{49};
+  int const command_column{54};
   wattron(window, COLOR_PAIR(2));
   mvwprintw(window, ++row, pid_column, "PID");
   mvwprintw(window, row, user_column, "USER");