[REFACTOR] Move most of logging logic to `do_log`.

Reduce code duplication (LOGI, LOGW, LOGE) differs only in
prefix. Add uptime logging for debugging with dmesg.
Move all mess with debugging macroses to Makefile.

Change-Id: Iab6e342c113f0fe571609d29a7b19615c9ff6d05
Signed-off-by: Dmitry Bogatov <d.bogatov@samsung.com>

diff --git a/daemon/Makefile b/daemon/Makefile
index 0476b92..737badb 100644 (file)
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -1,9 +1,16 @@
 CC :=gcc
+DEBUG_CPPFLAGS =                       \
+               -DDEBUG                 \
+#              -DDEB_PRINTBUF          \#
+#              -DPARSE_DEBUG_ON        \#
+#              -DTHREAD_SAMPLING_DEBUG \#
+#              -THREAD_REPLAY_DEBUG     #
+
 CPPFLAGS :=    -I/usr/include          \
                -I/usr/include/system   \
                -I/usr/include/telephony\
                -I/usr/include/vconf    \
-               -DDEBUG=1
+               $(DEBUG_CPPFLAGS)
 ifeq (arm, $(findstring arm, $(shell uname -sm)))
        CPPFLAGS += -DDEVICE_ONLY
 endif
@@ -38,16 +45,16 @@ DASCRIPT = da_command
 
 all: debug
 debug release: $(TARGET_LIBS)
-release: CPPFLAGS+=-DNOLOGI=1
+release: CPPFLAGS += -DNOLOGI=1
 debug release: $(DAEMON_OBJS)
        $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $(TARGET)
 
-install: BINDIR=$(DESTDIR)/usr/bin
-install: target
+install: BINDIR = $(DESTDIR)/usr/bin
+install: $(TARGET)
        mkdir -p $(BINDIR)
        install $(TARGET) $(DASCRIPT) -t $(BINDIR)
 
 clean:
        rm -f $(TARGET) $(DAEMON_OBJS)
 
-.PHONY: all target clean install target-nolog
+.PHONY: all debug release clean install

diff --git a/daemon/debug.h b/daemon/debug.h
index cf1a81f..ee827c8 100644 (file)
--- a/daemon/debug.h
+++ b/daemon/debug.h
@@ -31,75 +31,68 @@
 
 #include <stdint.h>            // for uint64_t, int64_t
 #include <pthread.h>   // for pthread_mutex_t
+#include <stdarg.h>
 
 #include "da_protocol.h"
+#include "utils.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
- * DEBUG DEFINES
- */
-//#define DEB_PRINTBUF
-//#define PARSE_DEBUG_ON
-//threads debug
-//#define THREAD_SAMPLING_DEBUG
-//#define THREAD_REPLAY_DEBUG
+#define printBuf(buf, len) print_buf(buf, len, __func__)
+void print_buf(char *buf, int len, const char *info);
 
-
-//DEBUG ON PARSING
 #ifdef PARSE_DEBUG_ON
-#define parse_deb LOGI
+       #define parse_deb LOGI
 #else
-#define parse_deb(...) do{}while(0)
-#endif /*parse_on*/
-
-//PRINT BUFFER DEBUG
-#define printBuf(buf, len) print_buf(buf, len, __FUNCTION__)
-void print_buf (char * buf, int len, const char *info);
+       #define parse_deb(...)
+#endif
 
-//THREAD SAMPLING DEBUG
 #ifdef THREAD_SAMPLING_DEBUG
        #define LOGI_th_samp LOGI
 #else
-       #define LOGI_th_samp(...)       do{} while(0)
+       #define LOGI_th_samp(...)
 #endif
 
-//THREAD REPLAY DEBUG
 #ifdef THREAD_REPLAY_DEBUG
        #define LOGI_th_rep LOGI
 #else
-       #define LOGI_th_rep(...)        do{} while(0)
+       #define LOGI_th_rep(...)
 #endif
 
-
-/*
- * END DEBUG DEFINES
- */
 #ifdef DEBUG
+#define LOGE(...) do_log("ERR", __func__, __VA_ARGS__)
+#define LOGW(...) do_log("WRN", __func__, __VA_ARGS__)
+
+static inline void do_log(const char *prefix, const char *funcname, ...)
+{
+       va_list ap;
+       const char *fmt;
+       fprintf(stderr, "[%s][%f] (%s):", prefix, get_uptime(), funcname);
+
+       va_start(ap, funcname);
+       fmt = va_arg(ap, const char *);
+       vfprintf(stderr, fmt, ap);
+       va_end(ap);
+}
 
-#ifdef NOLOGI
-       #define LOGI(...)       do{} while(0)
-       #define LOGI_(...)      do{} while(0)
-#else
-//     #define LOGI(...)       do{ fprintf(stderr, "[INF] (%s):", __FUNCTION__); fflush(stderr); fprintf(stderr, __VA_ARGS__ ); fflush(stderr); usleep(100000);} while(0)
-       #define LOGI(...)       do{ fprintf(stderr, "[INF] (%s):", __FUNCTION__); fflush(stderr); fprintf(stderr, __VA_ARGS__ ); fflush(stderr); } while(0)
-//     #define LOGI(...)       do{} while(0)
-       #define LOGI_(...)      do{ fprintf(stderr, __VA_ARGS__ ); fflush(stderr); } while(0)
-       //#define LOGI_(...)    do{} while(0)
-#endif
-
-//     #define LOGE(...)       do{ fprintf(stderr, "[ERR] (%s):", __FUNCTION__); fflush(stderr); fprintf(stderr, __VA_ARGS__ ); fflush(stderr); usleep(1000000);} while(0)
-       #define LOGE(...)       do{ fprintf(stderr, "[ERR] (%s):", __FUNCTION__); fflush(stderr); fprintf(stderr, __VA_ARGS__ ); fflush(stderr); } while(0)
-       #define LOGW(...)       do{ fprintf(stderr, "[WRN] (%s):", __FUNCTION__); fflush(stderr); fprintf(stderr, __VA_ARGS__ ); fflush(stderr); } while(0)
-
-
+       #ifdef NOLOGI
+               #define LOGI(...)
+               #define LOGI_(...)
+       #else
+               #define LOGI(...) do_log("INF", __func__, __VA_ARGS__)
+               #define LOGI_(...)      do {            \
+                       fprintf(stderr, __VA_ARGS__);   \
+                       fflush(stderr);                 \
+               } while (0)
+
+       #endif
 #else
-       #define LOGI(...)       do{} while(0)
-       #define LOGI_(...)      do{} while(0)
-       #define LOGE(...)       do{} while(0)
-       #define LOGW(...)       do{} while(0)
+       #define LOGI(...)
+       #define LOGI_(...)
+       #define LOGE(...)
+       #define LOGW(...)
 #endif
 
 

diff --git a/daemon/utils.c b/daemon/utils.c
index c09c4c5..e1cde4c 100644 (file)
--- a/daemon/utils.c
+++ b/daemon/utils.c
@@ -774,3 +774,18 @@ void fd_setup_smack_attributes(int fd)
        fsetxattr(fd, "security.SMACK64IPIN", "*", 1, 0);
        fsetxattr(fd, "security.SMACK64IPOUT", "*", 1, 0);
 }
+
+float get_uptime(void)
+{
+       const char *LINUX_UPTIME_FILE = "/proc/uptime";
+       FILE *fp = fopen(LINUX_UPTIME_FILE, "r");
+       float uptime;
+       if (!fp)
+               return 0.0;
+
+       if (fscanf(fp, "%f", &uptime) != 1)
+               uptime = 0.0;
+
+       fclose(fp);
+       return uptime;
+}

diff --git a/daemon/utils.h b/daemon/utils.h
index fec50d7..7b9500f 100644 (file)
--- a/daemon/utils.h
+++ b/daemon/utils.h
@@ -76,6 +76,7 @@ int exec_app_tizen(const char *app_id, const char *exec_path);
 int exec_app_common(const char* exec_path);
 char *dereference_tizen_exe_path(const char *path, char *resolved);
 void fd_setup_smack_attributes(int fd);
+float get_uptime(void);
 #ifdef __cplusplus
 }
 #endif