Identifying builds with Git revisions, streamlining function names in

modules

Author: wberube

src/Makefile

@@ -1,14 +1,15 @@
 SRC = $(shell find ./ -name '*.c')
 OBJ = ../divinus
+GIT_REV := $(shell git rev-parse --short HEAD)$(shell git diff --quiet HEAD || echo "-mod")
 
 .PHONY: clean divinus
 divinus: $(OBJ)
 
 $(OBJ): $(SRC:%.c=%.o)
-	$(CC) $^ -rdynamic $(OPT) -o $@
+	$(CC) $^ -rdynamic $(OPT) -DGIT_REV=\"$(GIT_REV)\" -o $@
 
 %.o: %.c Makefile
-	$(CC) -c $< $(OPT) -o $@
+	$(CC) -c $< $(OPT) -DGIT_REV=\"$(GIT_REV)\" -o $@
 
 clean:
 	rm -rf $(SRC:%.c=%.o) $(OBJ)

src/app_config.c

@@ -4,7 +4,7 @@ const char *appconf_paths[] = {"./divinus.yaml", "/etc/divinus.yaml"};
 
 struct AppConfig app_config;
 
-static inline void open_app_config(FILE **file, const char *flags) {
+static inline void app_config_open(FILE **file, const char *flags) {
     const char **path = appconf_paths;
     char conf_path[PATH_MAX], exe_path[PATH_MAX];
     *file = NULL;
@@ -39,7 +39,7 @@ static inline void open_app_config(FILE **file, const char *flags) {
     }
 }
 
-void restore_app_config(void) {
+void app_config_restore(void) {
     char conf_path[PATH_MAX], exe_path[PATH_MAX];
 
     ssize_t exe_len = readlink("/proc/self/exe", exe_path, sizeof(exe_path) - 1);
@@ -67,10 +67,10 @@ void restore_app_config(void) {
     }
 }
 
-int save_app_config(void) {
+int app_config_save(void) {
     FILE *file;
 
-    open_app_config(&file, "w");
+    app_config_open(&file, "w");
     if (!file)
         HAL_ERROR("app_config", "Can't open config file for writing\n");
 
@@ -213,7 +213,7 @@ int save_app_config(void) {
     return EXIT_SUCCESS;
 }
 
-enum ConfigError parse_app_config(void) {
+enum ConfigError app_config_parse(void) {
     memset(&app_config, 0, sizeof(struct AppConfig));
 
     app_config.web_port = 8080;
@@ -284,7 +284,7 @@ enum ConfigError parse_app_config(void) {
     memset(&ini, 0, sizeof(struct IniConfig));
 
     FILE *file;
-    open_app_config(&file, "r");
+    app_config_open(&file, "r");
     if (!open_config(&ini, &file))  {
         printf("Can't find config divinus.yaml in:\n"
             "    ./divinus.yaml\n    /etc/divinus.yaml\n");

src/app_config.h

@@ -119,6 +119,6 @@ struct AppConfig {
 };
 
 extern struct AppConfig app_config;
-enum ConfigError parse_app_config(void);
-void restore_app_config(void);
-int save_app_config(void);
+enum ConfigError app_config_parse(void);
+void app_config_restore(void);
+int app_config_save(void);

src/hal/globals.h

@@ -2,6 +2,10 @@
 
 #include "types.h"
 
+#ifndef GIT_REV
+#define GIT_REV "unknown"
+#endif
+
 extern char graceful, keepRunning;
 extern char audioOn, recordOn;
 

src/hal/macros.h

@@ -27,28 +27,28 @@
 
 #define HAL_DANGER(mod, x, ...) \
     do { \
-        fprintf(stderr, "[%s] \033[31m", (mod)); \
+        fprintf(stderr, "\033[0m[%s] \033[31m", (mod)); \
         fprintf(stderr, (x), ##__VA_ARGS__); \
         fprintf(stderr, "\033[0m"); \
     } while (0)
 
 #define HAL_ERROR(mod, x, ...) \
     do { \
-        fprintf(stderr, "[%s] \033[31m", (mod)); \
+        fprintf(stderr, "\033[0m[%s] \033[31m", (mod)); \
         fprintf(stderr, (x), ##__VA_ARGS__); \
         fprintf(stderr, "\033[0m"); \
         return EXIT_FAILURE; \
     } while (0)
 
 #define HAL_INFO(mod, x, ...) \
     do { \
-        fprintf(stderr, "[%s] ", (mod)); \
+        fprintf(stderr, "\033[0m[%s] ", (mod)); \
         fprintf(stderr, (x), ##__VA_ARGS__); \
     } while (0)
 
 #define HAL_WARNING(mod, x, ...) \
     do { \
-        fprintf(stderr, "[%s] \033[33m", (mod)); \
+        fprintf(stderr, "\033[0m[%s] \033[33m", (mod)); \
         fprintf(stderr, (x), ##__VA_ARGS__); \
         fprintf(stderr, "\033[0m"); \
     } while (0)

src/http_post.c

@@ -104,7 +104,7 @@ void *http_post_thread(void) {
     return NULL;
 }
 
-void start_http_post_send() {
+void http_post_start() {
     pthread_attr_t thread_attr;
     pthread_attr_init(&thread_attr);
     size_t stacksize;
@@ -120,6 +120,6 @@ void start_http_post_send() {
     pthread_attr_destroy(&thread_attr);
 }
 
-void stop_http_post_send() {
+void http_post_stop() {
     pthread_join(httpPostPid, NULL);
 }

src/http_post.h

@@ -14,5 +14,5 @@
 #include "hal/macros.h"
 #include "jpeg.h"
 
-void start_http_post_send();
-void stop_http_post_send();
+void http_post_start();
+void http_post_stop();

src/main.c

@@ -58,24 +58,24 @@ int main(int argc, char *argv[]) {
     if (!*family)
         HAL_ERROR("hal", "Unsupported chip family! Quitting...\n");
 
-    fprintf(stderr, "\033[7m Divinus for %s \033[0m\n", family);
+    fprintf(stderr, "\033[0m\033[7m Divinus (rev %s) for %s \033[0m\n", GIT_REV, family);
     fprintf(stderr, "Chip ID: %s\n", chip);
 
-    if (parse_app_config() != CONFIG_OK)
+    if (app_config_parse() != CONFIG_OK)
         HAL_ERROR("hal", "Can't load app config 'divinus.yaml'\n");
 
     if (app_config.watchdog)
         watchdog_start(app_config.watchdog);
 
-    start_network();
+    network_start();
 
-    start_server();
+    server_start();
 
     if (app_config.rtsp_enable) {
         rtspHandle = rtsp_create(RTSP_MAXIMUM_CONNECTIONS, app_config.rtsp_port, 1);
         HAL_INFO("rtsp", "Started listening for clients...\n");
         if (app_config.rtsp_enable_auth) {
-            if (!app_config.rtsp_auth_user || !app_config.rtsp_auth_pass)
+            if (EMPTY(app_config.rtsp_auth_user) || EMPTY(app_config.rtsp_auth_pass))
                 HAL_ERROR("rtsp", "One or both credential fields have been left empty!\n");
             else {
                 rtsp_configure_auth(rtspHandle, app_config.rtsp_auth_user, app_config.rtsp_auth_pass);
@@ -85,19 +85,19 @@ int main(int argc, char *argv[]) {
     }
 
     if (app_config.stream_enable)
-        start_streaming();
+        media_start();
 
-    if (start_sdk())
+    if (sdk_start())
         HAL_ERROR("hal", "Failed to start SDK!\n");
 
     if (app_config.night_mode_enable)
-        enable_night();
+        night_enable();
 
     if (app_config.http_post_enable)
-        start_http_post_send();
+        http_post_start();
 
     if (app_config.osd_enable)
-        start_region_handler();
+        region_start();
 
     if (app_config.record_enable && app_config.record_continuous)
         record_start();
@@ -117,28 +117,28 @@ int main(int argc, char *argv[]) {
     }
 
     if (app_config.http_post_enable)
-        stop_http_post_send();
+        http_post_start();
 
     if (app_config.osd_enable)
-        stop_region_handler();
+        region_stop();
 
     if (app_config.night_mode_enable)
-        disable_night();
+        night_disable();
 
-    stop_sdk();
+    sdk_stop();
 
     if (app_config.stream_enable)
-        stop_streaming();
+        media_stop();
 
-    stop_server();
+    server_stop();
 
-    stop_network();
+    network_stop();
 
     if (app_config.watchdog)
         watchdog_stop();
 
     if (!graceful)
-        restore_app_config();
+        app_config_restore();
 
     if (graceful) {
         fprintf(stderr, "Restarting...\n");