Add CPU/Memory usage statistics

Author: diffstorm

README.md

@@ -352,8 +352,8 @@ Use the provided `run.sh` script to start the Process Watchdog application. This
 Or just `./run.sh &` which is recommended.
 
 ## TODO
-- Redesign the apps.c with DAO pattern
-- Add CPU & RAM usage to the statistics
+- [DONE]Redesign the apps.c with DAO pattern
+- [DONE]Add CPU & RAM usage to the statistics
 - Create easy-to-use heartbeat libraries
 - Enable commands over UDP
 - Enable remote syslog server reporting

src/apps.c

@@ -110,6 +110,11 @@ char *get_app_name(int i)
     return apps[i].name;
 }
 
+int get_app_pid(int i)
+{
+    return apps[i].pid;
+}
+
 int get_udp_port(void)
 {
     return app_state.udp_port;

src/apps.h

@@ -114,6 +114,14 @@ int get_app_count();
 */
 char *get_app_name(int i);
 
+/**
+    @brief Gets the process ID of the application at the specified index.
+
+    @param i Index of the application.
+    @return Process ID of the application.
+*/
+int get_app_pid(int i);
+
 /**
     @brief Gets the UDP port number specified in the ini file.
 

src/main.c

@@ -136,7 +136,7 @@ extern char *optarg;
 extern int opterr, optind;
 
 #define APPNAME     basename(argv[0])
-#define VERSION     "1.1.0"
+#define VERSION     "1.2.0"
 #define OPTSTR      "i:v:t:h"
 #define USAGE_FMT   "%s -i <file.ini> [-v] [-h] [-t testname]\n"
 
@@ -301,7 +301,7 @@ int main(int argc, char *argv[])
     // Read statistics
     for(int i = 0; i < get_app_count(); i++)
     {
-        stats_read_from_file(i);
+        stats_read_from_file(i, get_app_name(i));
     }
 
     // data buffer
@@ -346,11 +346,17 @@ int main(int argc, char *argv[])
         {
             if(process_is_started(i))
             {
+                // Update resource usage stats (1 min)
+                if((get_uptime() % 60) == 0 && process_is_running(i))
+                {
+                    stats_update_resource_usage(i, get_app_pid(i));
+                }
+
                 // Update stats files periodically (15 mins)
                 if((get_uptime() % (15 * 60)) == 0)
                 {
-                    stats_write_to_file(i);
-                    stats_print_to_file(i);
+                    stats_write_to_file(i, get_app_name(i));
+                    stats_print_to_file(i, get_app_name(i));
                 }
 
                 if(!process_is_running(i))
@@ -435,8 +441,8 @@ int main(int argc, char *argv[])
     for(int i = 0; i < get_app_count(); i++)
     {
         // Update stats files
-        stats_write_to_file(i);
-        stats_print_to_file(i);
+        stats_write_to_file(i, get_app_name(i));
+        stats_print_to_file(i, get_app_name(i));
         // Kill running applications
         process_kill(i);
 

src/process.c

@@ -32,26 +32,26 @@
 
 bool process_is_running(int app_index)
 {
-    Application_t *apps = apps_get_array();
+    int pid = get_app_pid(app_index);
 
-    if(apps[app_index].pid <= 0)
+    if(pid <= 0)
     {
         return false;
     }
 
     // Check if the application is running
-    if(kill(apps[app_index].pid, 0) == 0)
+    if(kill(pid, 0) == 0)
     {
         return true;  // Process is running
     }
     else if(errno == EPERM)
     {
-        LOGE("No permission to check if process %s is running : %s", apps[app_index].name, strerror(errno));
+        LOGE("No permission to check if process %s is running : %s", get_app_name(app_index), strerror(errno));
         return true;
     }
     else
     {
-        LOGD("Process %s is not running : %s", apps[app_index].name, strerror(errno));
+        LOGD("Process %s is not running : %s", get_app_name(app_index), strerror(errno));
     }
 
     return false;