Completing tasks

Author: textanalyticsman

include/format.h

@@ -4,7 +4,7 @@
 #include <string>
 
 namespace Format {
-std::string ElapsedTime(long times);  // TODO: See src/format.cpp
+std::string ElapsedTime(long times);  // See src/format.cpp
 };                                    // namespace Format
 
 #endif

include/process.h

@@ -9,12 +9,12 @@ It contains relevant attributes as shown below
 class Process {
  public:
   Process(int pid, std::string puser = "", std::string pcommand = "", float pcpu = 0, std::string pram = "", long puptime = 0);
-  int Pid();                               // TODO: See src/process.cpp
-  std::string User();                      // TODO: See src/process.cpp
-  std::string Command();                   // TODO: See src/process.cpp
-  float CpuUtilization();                  // TODO: See src/process.cpp
-  std::string Ram();                       // TODO: See src/process.cpp
-  long int UpTime();                       // TODO: See src/process.cpp
+  int Pid();                               
+  std::string User();                      
+  std::string Command();                   
+  float CpuUtilization();                  
+  std::string Ram();                       
+  long int UpTime();                       
   bool operator<(Process const& a) const;  // TODO: See src/process.cpp
   // To set values
   void SetPid(int pid);

include/system.h

@@ -9,16 +9,15 @@
 
 class System {
  public:
-  Processor& Cpu();                   // TODO: See src/system.cpp
-  std::vector<Process>& Processes();  // TODO: See src/system.cpp
-  float MemoryUtilization();          // TODO: See src/system.cpp
-  long UpTime();                      // TODO: See src/system.cpp
-  int TotalProcesses();               // TODO: See src/system.cpp
-  int RunningProcesses();             // TODO: See src/system.cpp
-  std::string Kernel();               // TODO: See src/system.cpp
-  std::string OperatingSystem();      // TODO: See src/system.cpp
+  Processor& Cpu();                  
+  std::vector<Process>& Processes();  
+  float MemoryUtilization();          
+  long UpTime();                      
+  int TotalProcesses();               
+  int RunningProcesses();             
+  std::string Kernel();               
+  std::string OperatingSystem();      
 
-  // TODO: Define any necessary private members
  private:
   Processor cpu_ = {};
   std::vector<Process> processes_ = {};

src/linux_parser.cpp

@@ -123,7 +123,7 @@ float LinuxParser::MemoryUtilization()
   return value;
 }
 
-// TODO: Read and return the system uptime
+// Read and return the system uptime
 long LinuxParser::UpTime() 
 { 
   long int uptime{0};
@@ -213,20 +213,14 @@ float LinuxParser::CpuUtilization(int pid)
         // Positions 14, 15, 16, 17 and 22 are used to calculate CPU consumption per process
         // https://stackoverflow.com/questions/16726779/how-do-i-get-the-total-cpu-usage-of-an-application-from-proc-pid-stat/16736599#16736599
         if(index == 14 || index == 15 || index == 16 || index == 17)
-        {
           cpu_tokens.push_back(stof(tmp));
-          //std::cout << "PID: "<< pid << " Index: " << index << " Token: " << tmp << " ";
-        }
         else if(index == 22)
         {
           cpu_tokens.push_back(stof(tmp));
-          //std::cout << "PID: "<< pid << " Index: " << index << " Token: " << tmp << " ";
           break;
         }
       }
 
-      //std::cout << "Vector's size: " << cpu_tokens.size() << std::endl;;
-
       float total_time{0.0};
       long int hertz{sysconf(_SC_CLK_TCK)};
       float seconds{0.0};
@@ -243,11 +237,47 @@ float LinuxParser::CpuUtilization(int pid)
   return cpu_consumption;
 }
 
-// TODO: Read and return the total number of processes
-int LinuxParser::TotalProcesses() { return 0; }
+// Read and return the total number of processes
+int LinuxParser::TotalProcesses()
+{ 
+  std::string line;
+  // Pattern to look for total number of processes
+  std::string pattern{ R"(processes\s{1}(\d+))" };
+
+  std::ifstream filestream(kProcDirectory + kStatFilename);
+  std::string regular_expression_result;
+  if (filestream.is_open()) 
+  {
+    while (std::getline(filestream, line)) 
+    {
+      regular_expression_result = RegularExpression(pattern, line, 1);
+      if(regular_expression_result != "")
+        break;
+    }
+  }  
+  return std::stoi(regular_expression_result);
+}
+
+// Read and return the number of running processes
+int LinuxParser::RunningProcesses()
+{ 
+  std::string line;
+  // Pattern to look for total number of processes
+  std::string pattern{ R"(procs_running\s{1}(\d+))" };
 
-// TODO: Read and return the number of running processes
-int LinuxParser::RunningProcesses() { return 0; }
+  std::ifstream filestream(kProcDirectory + kStatFilename);
+  std::string regular_expression_result;
+  if (filestream.is_open()) 
+  {
+    while (std::getline(filestream, line)) 
+    {
+      regular_expression_result = RegularExpression(pattern, line, 1);
+      if(regular_expression_result != "")
+        break;
+    }
+  }  
+  return std::stoi(regular_expression_result);
+}
 
 // Read and return the command associated with a process
 string LinuxParser::Command(int pid) 
@@ -263,9 +293,35 @@ string LinuxParser::Command(int pid)
   return command_line;
 }
 
-// TODO: Read and return the memory used by a process
-// REMOVE: [[maybe_unused]] once you define the function
-string LinuxParser::Ram(int pid[[maybe_unused]]) { return string(); }
+// Read and return the memory used by a process
+string LinuxParser::Ram(int pid) 
+{
+  std::string line;
+  std::string pattern{ R"(VmSize:\s{1}(\d+)\s{1}kB)" };
+
+  std::ifstream filestream(kProcDirectory + std::to_string(pid) + kStatusFilename);
+  std::string ram;
+
+  if (filestream.is_open()) 
+  {
+    while (std::getline(filestream, line)) 
+    {
+      ram = RegularExpression(pattern, line, 1);
+
+      if(ram != "")
+        break;
+    }
+  }
+  
+  long int result{0};
+  if(ram!="") // to control cases when the process died in the middle of the process
+  {
+    result = std::stol(ram);
+    result = result / 1024;
+  }
+
+  return std::to_string(result);
+}
 
 // Read and return the user ID associated with a process
 string LinuxParser::Uid(int pid) 
@@ -315,6 +371,36 @@ string LinuxParser::User(int pid)
   return user_name;
 }
 
-// TODO: Read and return the uptime of a process
-// REMOVE: [[maybe_unused]] once you define the function
-long LinuxParser::UpTime(int pid[[maybe_unused]]) { return 0; }
+// Read and return the uptime of a process
+long LinuxParser::UpTime(int pid) 
+{ 
+  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 != "")
+  {
+      std::istringstream linestream{ line };
+      std::string tmp;      
+      int index{0};
+
+      while (linestream >> tmp)
+      {
+        ++index;
+        if(index == 22)
+          break;        
+      }
+
+      long int hertz{ sysconf(_SC_CLK_TCK) };          
+
+      uptime = std::stol(tmp) / hertz;
+  }
+
+  return uptime;
+}

src/system.cpp

@@ -17,34 +17,35 @@ using std::vector;
 // TODO: Return the system's CPU
 Processor& System::Cpu() { return cpu_; }
 
-// TODO: Return a container composed of the system's processes
+// Return a container composed of the system's processes
 vector<Process>& System::Processes() 
 { 
     vector<int> list_pids = LinuxParser::Pids();
 
     for(int pid : list_pids)
     {
-        Process process(pid, LinuxParser::User(pid), LinuxParser::Command(pid), LinuxParser::CpuUtilization(pid));
+        Process process(pid, LinuxParser::User(pid), LinuxParser::Command(pid), 
+          LinuxParser::CpuUtilization(pid), LinuxParser::Ram(pid), LinuxParser::UpTime(pid));
         processes_.push_back(process);
     }
 
     return processes_;
 }
 
-// TODO: Return the system's kernel identifier (string)
-std::string System::Kernel() { return string(); }
+// Return the system's kernel identifier (string)
+std::string System::Kernel() { return LinuxParser::Kernel(); }
 
-// TODO: Return the system's memory utilization
+// Return the system's memory utilization
 float System::MemoryUtilization() { return LinuxParser::MemoryUtilization(); }
 
-// TODO: Return the operating system name
-std::string System::OperatingSystem() { return string(); }
+// Return the operating system name
+std::string System::OperatingSystem() { return LinuxParser::OperatingSystem(); }
 
-// TODO: Return the number of processes actively running on the system
-int System::RunningProcesses() { return 0; }
+// Return the number of processes actively running on the system
+int System::RunningProcesses() { return LinuxParser::RunningProcesses(); }
 
-// TODO: Return the total number of processes on the system
-int System::TotalProcesses() { return 0; }
+// Return the total number of processes on the system
+int System::TotalProcesses() { return LinuxParser::TotalProcesses(); }
 
-// TODO: Return the number of seconds since the system started running
+// Return the number of seconds since the system started running
 long int System::UpTime() { return LinuxParser::UpTime(); }