updates from Mac

CMakeLists.txt

@@ -1,9 +1,14 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(monitor)
 
-set(CURSES_NEED_NCURSES TRUE)
-find_package(Curses REQUIRED)
-include_directories(${CURSES_INCLUDE_DIRS})
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wextra -Wall -Werror -ansi -pedantic -pthread --std=c++11")
+include_directories(includes libs/c++ /opt/homebrew/opt/ncurses/include)
+link_directories(/opt/homebrew/opt/ncurses/lib)
+link_libraries(ncurses)
+
+# set(CURSES_NEED_NCURSES TRUE)
+# find_package(ncurses REQUIRED)
+# include_directories(${CURSES_INCLUDE_DIRS})
 
 include_directories(include)
 file(GLOB SOURCES "src/*.cpp")

Makefile

@@ -1,5 +1,11 @@
+CXXFLAGS    +=  -W -Wextra -Wall -Werror -ansi -pedantic
+CXXFLAGS    +=  -pthread --std=c++11 -Iincludes -Ilibs/c++ -I/usr/local/opt/ncurses/include
+LDFLAGS     +=  -lncurses -L/usr/local/opt/ncurses/lib
+
+# existing Makefile targets go here
+
 .PHONY: all
-all: format test build
+all: format build
 
 .PHONY: format
 format:
@@ -22,3 +28,4 @@ debug:
 .PHONY: clean
 clean:
 	rm -rf build
+

include/process.h

@@ -8,7 +8,7 @@ It contains relevant attributes as shown below
 */
 class Process {
  public:
-  Process(int pid): pid_(pid) {};
+  Process(int pid) : pid_(pid){};
   int Pid();                               // TODO: See src/process.cpp
   std::string User();                      // TODO: See src/process.cpp
   std::string Command();                   // TODO: See src/process.cpp
@@ -19,12 +19,12 @@ class Process {
 
   // TODO: Declare any necessary private members
  private:
-    int pid_;
-    std::string user_;
-    std::string command_;
-    float cpuUtilization_;
-    std::string ram_;
-    long int upTime_;
+  int pid_;
+  std::string user_;
+  std::string command_;
+  float cpuUtilization_;
+  std::string ram_;
+  long int upTime_;
 };
 
 #endif

include/processor.h

@@ -3,7 +3,7 @@
 
 class Processor {
  public:
-  Processor() : prevTotal_(0), prevIdle_(0) {};
+  Processor() : prevTotal_(0), prevIdle_(0){};
   float Utilization();  // TODO: See src/processor.cpp
 
   // TODO: Declare any necessary private members

src/format.cpp

@@ -12,7 +12,8 @@ string Format::ElapsedTime(long seconds) {
   int hours = seconds / 3600;
   int minutes = (seconds % 3600) / 60;
   int sec = seconds % 60;
-  timeFormat = std::to_string(hours) + ":" + std::to_string(minutes) + ":" + std::to_string(sec);
-
+  timeFormat = std::to_string(hours) + ":" + std::to_string(minutes) + ":" +
+               std::to_string(sec);
+
   return timeFormat;
 }

src/linux_parser.cpp

@@ -5,9 +5,9 @@
 
 #include <cmath>
 #include <iostream>
+#include <sstream>
 #include <string>
 #include <vector>
-
 using std::stof;
 using std::string;
 using std::to_string;
@@ -60,13 +60,12 @@ vector<int> LinuxParser::Pids() {
       // Is every character of the name a digit?
       string filename(file->d_name);
       if (std::all_of(filename.begin(), filename.end(), isdigit)) {
-        //int pid = stoi(filename);
+        long long int pid0;
         try {
-          long long int pid = stoi(filename);
+          pid0 = stoi(filename);
         } catch (std::out_of_range& e) {
           std::cerr << "Number is out of range: " << e.what() << '\n';
         }
-        long long int pid0 = stoi(filename);
         pids.push_back(pid0);
       }
     }
@@ -120,11 +119,12 @@ float LinuxParser::MemoryUtilization() {
 long LinuxParser::UpTime() {
   std::ifstream filestream(kProcDirectory + kUptimeFilename);
   std::string line;
+  long uptime = 0;
   if (!filestream.is_open()) {
     std::cerr << "Failed to open file UpTime: "
               << kProcDirectory + kUptimeFilename << std::endl;
-  }
-  long uptime;
+  } else {
+
   while (getline(filestream, line)) {
     std::istringstream iss(line);
     // read info
@@ -138,6 +138,7 @@ long LinuxParser::UpTime() {
     }
     break;
   }
+  filestream.close();}
   return uptime;
 }
 
@@ -218,7 +219,7 @@ int LinuxParser::TotalProcesses() {
   }
   std::string currentKey;
   std::string currentValue;
-  long long int totalProcesses;
+  long long int totalProcesses = 0;
   while (getline(filestream, line)) {
     std::istringstream iss(line);
     // read info
@@ -232,7 +233,6 @@ int LinuxParser::TotalProcesses() {
       }
       break;
     }
-
   }
 
   return totalProcesses;

src/ncurses_display.cpp

@@ -1,11 +1,13 @@
+#include "ncurses_display.h"
+
 #include <curses.h>
+#include <ncurses.h>
 #include <chrono>
 #include <string>
 #include <thread>
 #include <vector>
 
 #include "format.h"
-#include "ncurses_display.h"
 #include "system.h"
 
 using std::string;

src/process.cpp

@@ -1,10 +1,12 @@
+#include "process.h"
+
 #include <unistd.h>
+
 #include <cctype>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include "process.h"
 #include "linux_parser.h"
 
 using std::string;
@@ -15,7 +17,9 @@ using std::vector;
 int Process::Pid() { return pid_; }
 
 // TODO: Return this process's CPU utilization
-float Process::CpuUtilization() { return cpuUtilization_ = LinuxParser::cpuProcessUtilization(pid_); }
+float Process::CpuUtilization() {
+  return cpuUtilization_ = LinuxParser::cpuProcessUtilization(pid_);
+}
 
 // TODO: Return the command that generated this process
 string Process::Command() { return command_ = LinuxParser::Command(pid_); }
@@ -31,4 +35,6 @@ long int Process::UpTime() { return upTime_ = LinuxParser::UpTime(pid_); }
 
 // TODO: Overload the "less than" comparison operator for Process objects
 // REMOVE: [[maybe_unused]] once you define the function
-bool Process::operator<(Process const& a[[maybe_unused]]) const { return true; }
+bool Process::operator<(Process const& a [[maybe_unused]]) const {
+  return true;
+}

src/processor.cpp

@@ -11,7 +11,7 @@ float Processor::Utilization() {
   float nice = std::stoi(currentUtilization[1]);
   float system = std::stoi(currentUtilization[2]);
   float idle = std::stoi(currentUtilization[3]);
-  float iowait = 0.0; //std::stoi(currentUtilization[4]);
+  float iowait = 0.0;  // std::stoi(currentUtilization[4]);
   float irq = std::stoi(currentUtilization[5]);
   float softirq = std::stoi(currentUtilization[6]);
   float steal = std::stoi(currentUtilization[7]);

src/system.cpp

@@ -1,5 +1,7 @@
 #include "system.h"
+
 #include <unistd.h>
+
 #include <cstddef>
 #include <set>
 #include <string>