Yu/mac verison

CMakeLists.txt

@@ -1,9 +1,14 @@
-cmake_minimum_required(VERSION 2.6)
+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/linux_parser.h

@@ -41,6 +41,7 @@ enum CPUStates {
   kGuestNice_
 };
 std::vector<std::string> CpuUtilization();
+float cpuProcessUtilization(int pid);
 long Jiffies();
 long ActiveJiffies();
 long ActiveJiffies(int pid);

include/process.h

@@ -8,6 +8,7 @@ It contains relevant attributes as shown below
 */
 class Process {
  public:
+  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
@@ -18,6 +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_;
 };
 
 #endif

include/processor.h

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

src/format.cpp

@@ -1,11 +1,19 @@
-#include <string>
-
 #include "format.h"
 
+#include <string>
+
 using std::string;
 
-// TODO: Complete this helper function
+// DONE: Complete this helper function
 // INPUT: Long int measuring seconds
 // OUTPUT: HH:MM:SS
-// REMOVE: [[maybe_unused]] once you define the function
-string Format::ElapsedTime(long seconds[[maybe_unused]]) { return string(); }
+string Format::ElapsedTime(long seconds) {
+  string timeFormat;
+  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);
+
+  return timeFormat;
+}