Inline wrappers, tidy up, code format

Author: diffstorm

processWatchdog.pro

@@ -8,22 +8,7 @@ CONFIG -= app_bundle
 CONFIG -= qt
 
 SOURCES += \
-    src/filecmd.c \
-    src/ini.c \
-    src/apps.c \
-    src/log.c \
-    src/main.c \
-    src/server.c \
-    src/stats.c \
-    src/test.c \
-    src/utils.c
+    src/*.c
 
 HEADERS += \
-    src/ini.h \
-    src/filecmd.h \
-    src/apps.h \
-    src/log.h \
-    src/server.h \
-    src/stats.h \
-    src/test.h \
-    src/utils.h
+    src/*.h

src/apps.c

@@ -20,8 +20,6 @@
 
 #include "apps.h"
 #include "config.h"
-#include "process.h"
-#include "heartbeat.h"
 #include "log.h"
 #include "utils.h"
 
@@ -37,8 +35,6 @@
 #include <sys/wait.h>
 #include <errno.h>
 
-
-
 static Application_t apps[MAX_APPS]; /**< Array of Application_t structures representing applications defined in the ini file. */
 static AppState_t app_state = {0};
 
@@ -60,32 +56,6 @@ void print_app(int i)
 
 //------------------------------------------------------------------
 
-// Wrapper functions for backward compatibility - delegate to heartbeat module
-void update_heartbeat_time(int i)
-{
-    heartbeat_update_time(i);
-}
-
-time_t get_heartbeat_time(int i)
-{
-    return heartbeat_get_elapsed_time(i);
-}
-
-bool is_timeup(int i)
-{
-    return heartbeat_is_timeout(i);
-}
-
-void set_first_heartbeat(int i)
-{
-    heartbeat_set_first_received(i);
-}
-
-bool get_first_heartbeat(int i)
-{
-    return heartbeat_get_first_received(i);
-}
-
 int find_pid(int pid)
 {
     for(int i = 0; i < app_state.app_count; i++)
@@ -99,8 +69,6 @@ int find_pid(int pid)
     return -1;
 }
 
-//------------------------------------------------------------------
-
 int read_ini_file()
 {
     // Use default ini file if not already set
@@ -132,40 +100,6 @@ int set_ini_file(char *path)
     return 0;
 }
 
-//------------------------------------------------------------------
-
-// Wrapper functions for backward compatibility - delegate to process module
-// TODO : inline wrapper functions
-bool is_application_running(int i)
-{
-    return process_is_running(i);
-}
-
-bool is_application_started(int i)
-{
-    return process_is_started(i);
-}
-
-bool is_application_start_time(int i)
-{
-    return process_is_start_time(i);
-}
-
-void start_application(int i)
-{
-    process_start(i);
-}
-
-void kill_application(int i)
-{
-    process_kill(i);
-}
-
-void restart_application(int i)
-{
-    process_restart(i);
-}
-
 int get_app_count(void)
 {
     return app_state.app_count;
@@ -181,16 +115,12 @@ int get_udp_port(void)
     return app_state.udp_port;
 }
 
-//------------------------------------------------------------------
-// External access functions for other modules
-//------------------------------------------------------------------
-
-Application_t* apps_get_array(void)
+Application_t *apps_get_array(void)
 {
     return apps;
 }
 
-AppState_t* apps_get_state(void)
+AppState_t *apps_get_state(void)
 {
     return &app_state;
 }

src/apps.h

@@ -75,13 +75,6 @@ typedef struct
 */
 void print_app(int i);
 
-/**
-    @brief Updates the last heartbeat time for the specified application.
-
-    @param i Index of the application.
-*/
-void update_heartbeat_time(int i);
-
 /**
     @brief Finds the index of an application with the specified process ID.
 
@@ -91,35 +84,40 @@ void update_heartbeat_time(int i);
 int find_pid(int pid);
 
 /**
-    @brief Gets the elapsed time since the last heartbeat received from the specified application.
+    @brief Gets direct access to the applications array for other modules.
 
-    @param i Index of the application.
-    @return Elapsed time in seconds.
+    @return Pointer to the applications array.
 */
-time_t get_heartbeat_time(int i);
+Application_t *apps_get_array(void);
 
 /**
-    @brief Checks if it is time to expect a heartbeat from the specified application.
+    @brief Gets direct access to the application state for other modules.
 
-    @param i Index of the application.
-    @return true if it is time to expect a heartbeat, false otherwise.
+    @return Pointer to the application state structure.
 */
-bool is_timeup(int i);
+AppState_t *apps_get_state(void);
 
 /**
-    @brief Sets the flag indicating that the specified application has sent its first heartbeat.
+    @brief Gets the total number of applications found in the ini file.
 
-    @param i Index of the application.
+    @return Total number of applications.
 */
-void set_first_heartbeat(int i);
+int get_app_count();
 
 /**
-    @brief Gets the flag indicating whether the specified application has sent its first heartbeat.
+    @brief Gets the name of the application at the specified index.
 
     @param i Index of the application.
-    @return true if the application has sent its first heartbeat, false otherwise.
+    @return Name of the application.
 */
-bool get_first_heartbeat(int i);
+char *get_app_name(int i);
+
+/**
+    @brief Gets the UDP port number specified in the ini file.
+
+    @return UDP port number.
+*/
+int get_udp_port();
 
 /**
     @brief Sets the path to the ini file.
@@ -143,85 +141,4 @@ bool is_ini_updated();
 */
 int read_ini_file();
 
-/**
-    @brief Checks if the specified application is currently running.
-
-    @param i Index of the application.
-    @return true if the application is running, false otherwise.
-*/
-bool is_application_running(int i);
-
-/**
-    @brief Checks if the specified application has been started.
-
-    @param i Index of the application.
-    @return true if the application has been started, false otherwise.
-*/
-bool is_application_started(int i);
-
-/**
-    @brief Checks if it is time to start the specified application based on the start delay.
-
-    @param i Index of the application.
-    @return true if it is time to start the application, false otherwise.
-*/
-bool is_application_start_time(int i);
-
-/**
-    @brief Starts the specified application.
-
-    @param i Index of the application.
-*/
-void start_application(int i);
-
-/**
-    @brief Stops the specified application by killing its process.
-
-    @param i Index of the application.
-*/
-void kill_application(int i);
-
-/**
-    @brief Restarts the specified application.
-
-    @param i Index of the application.
-*/
-void restart_application(int i);
-
-/**
-    @brief Gets the total number of applications found in the ini file.
-
-    @return Total number of applications.
-*/
-int get_app_count();
-
-/**
-    @brief Gets the name of the application at the specified index.
-
-    @param i Index of the application.
-    @return Name of the application.
-*/
-char *get_app_name(int i);
-
-/**
-    @brief Gets the UDP port number specified in the ini file.
-
-    @return UDP port number.
-*/
-int get_udp_port();
-
-/**
-    @brief Gets direct access to the applications array for other modules.
-
-    @return Pointer to the applications array.
-*/
-Application_t* apps_get_array(void);
-
-/**
-    @brief Gets direct access to the application state for other modules.
-
-    @return Pointer to the application state structure.
-*/
-AppState_t* apps_get_state(void);
-
-#endif // APPS_H
+#endif // APPS_H

src/cmd.c

@@ -23,18 +23,15 @@
 #include <string.h>
 #include <limits.h>
 
-//------------------------------------------------------------------
-// Public interface functions
-//------------------------------------------------------------------
-
-net_command_t cmd_parse_network(const char* data, int length)
+net_command_t cmd_parse_network(const char *data, int length)
 {
     net_command_t cmd = {0};
     cmd.type = NET_CMD_UNKNOWN;
     cmd.pid = 0;
     cmd.app_name[0] = '\0';
 
-    if (!data || length <= 0) {
+    if(!data || length <= 0)
+    {
         return cmd;
     }
 
@@ -91,19 +88,23 @@ net_command_t cmd_parse_network(const char* data, int length)
             const int max_length = max_bytes * 3;
             char hexStr[max_length];
             memset(hexStr, 0, sizeof(hexStr));
-
             int safe_length = length;
-            if (safe_length > max_bytes) {
+
+            if(safe_length > max_bytes)
+            {
                 safe_length = max_bytes;
             }
 
-            for (int i = 0; i < safe_length; i++) {
+            for(int i = 0; i < safe_length; i++)
+            {
                 snprintf(&hexStr[i * 3], sizeof(hexStr) - (i * 3), "%02X ", data[i]);
             }
 
             char printableStr[max_bytes + 1];
             memset(printableStr, 0, sizeof(printableStr));
-            for (int i = 0; i < safe_length; i++) {
+
+            for(int i = 0; i < safe_length; i++)
+            {
                 printableStr[i] = (data[i] >= 32 && data[i] < 127) ? data[i] : '.';
             }
 
@@ -114,4 +115,4 @@ net_command_t cmd_parse_network(const char* data, int length)
     }
 
     return cmd;
-}
+}

src/cmd.h

@@ -16,16 +16,16 @@
 #ifndef CMD_H
 #define CMD_H
 
-#include <stdbool.h>
-
-// Include apps.h for MAX_APP_NAME_LENGTH constant
 #include "apps.h"
 
+#include <stdbool.h>
+
 /**
     @enum net_command_type_t
     @brief Enumeration of network command types.
 */
-typedef enum {
+typedef enum
+{
     NET_CMD_HEARTBEAT,    /**< Heartbeat command: p<pid> */
     NET_CMD_START,        /**< Start command: a<name> (future) */
     NET_CMD_STOP,         /**< Stop command: o<name> (future) */
@@ -37,7 +37,8 @@ typedef enum {
     @struct net_command_t
     @brief Structure representing a parsed network command.
 */
-typedef struct {
+typedef struct
+{
     net_command_type_t type;                    /**< Type of the command */
     int pid;                                    /**< Process ID for heartbeat commands */
     char app_name[MAX_APP_NAME_LENGTH];         /**< Application name for control commands */
@@ -53,6 +54,6 @@ typedef struct {
     @param length Length of the command data.
     @return Parsed network command structure.
 */
-net_command_t cmd_parse_network(const char* data, int length);
+net_command_t cmd_parse_network(const char *data, int length);
 
-#endif // CMD_H
+#endif // CMD_H