Support logging dlog

if WL_TBM_DLOG=1(environment variable) is set, wayland-tbm log message with dlog system

Change-Id: I34d9950dbcd0997c34695e56930c4ebc2ac47706

diff --git a/configure.ac b/configure.ac
index 1f50782..e34de7a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ if test x$wayland_scanner = x; then
       AC_MSG_ERROR([wayland-scanner is needed to compile wayland-tbm])
 fi
 
-PKG_CHECK_MODULES([WL_TBM_COMMON], [libtbm capi-base-common])
+PKG_CHECK_MODULES([WL_TBM_COMMON], [libtbm capi-base-common dlog])
 PKG_CHECK_MODULES([WL_TBM_CLIENT], [wayland-client])
 PKG_CHECK_MODULES([WL_TBM_SERVER], [wayland-server])
 PKG_CHECK_MODULES( WAYLAND_SCANNER, wayland-scanner)

diff --git a/packaging/libwayland-tbm.spec b/packaging/libwayland-tbm.spec
index 1e10e5d..fc48057 100644 (file)
--- a/packaging/libwayland-tbm.spec
+++ b/packaging/libwayland-tbm.spec
@@ -14,6 +14,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(libtbm)
+BuildRequires:  pkgconfig(dlog)
 
 %description
 Wayland TBM Protocol for TIZEN

diff --git a/src/wayland-tbm-client.c b/src/wayland-tbm-client.c
index 019450d..930e2af 100644 (file)
--- a/src/wayland-tbm-client.c
+++ b/src/wayland-tbm-client.c
@@ -160,6 +160,8 @@ wayland_tbm_client_init(struct wl_display *display)
        struct wayland_tbm_client *tbm_client = NULL;
        struct wl_registry *wl_registry;
 
+       _wayland_tbm_check_dlog_enable();
+
        tbm_client = calloc(1, sizeof(struct wayland_tbm_client));
        WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, NULL);
 

diff --git a/src/wayland-tbm-int.h b/src/wayland-tbm-int.h
index 44284c3..cce87f3 100644 (file)
--- a/src/wayland-tbm-int.h
+++ b/src/wayland-tbm-int.h
@@ -36,27 +36,66 @@ extern "C" {
 
 #include "wayland-tbm-client.h"
 
-#define WL_TBM_DEBUG(fmt, ...)   fprintf (stderr, "[WL_TBM:DEBUG(%d)] " fmt, getpid(), ##__VA_ARGS__)
+#define HAVE_DLOG
+#ifdef HAVE_DLOG
+#include <dlog.h>
+
+extern int bDlog;
+
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif
+
+#define LOG_TAG "WL_TBM"
+
+#define WL_TBM_C_LOG(fmt, ...) {\
+    if (bDlog) {\
+        LOGE ("[WL_TBM_C] " fmt, ##__VA_ARGS__);\
+    }\
+    else {\
+        fprintf (stderr, "[WL_TBM_C(%d):%s] " fmt, getpid(), __func__, ##__VA_ARGS__);\
+    }\
+}
+#define WL_TBM_S_LOG(fmt, ...) {\
+    if (bDlog) {\
+        LOGE ("[WL_TBM_S] " fmt, ##__VA_ARGS__);\
+    }\
+    else{\
+        fprintf (stderr, "[WL_TBM_S(%d):%s] " fmt, getpid(), __func__, ##__VA_ARGS__);\
+    }\
+}
+#define WL_TBM_LOG(fmt, ...) {\
+    if (bDlog) {\
+        LOGE ("[WL_TBM] " fmt, ##__VA_ARGS__);\
+    }\
+    else {\
+        fprintf (stderr, "[WL_TBM(%d)] " fmt, getpid(), ##__VA_ARGS__);\
+    }\
+}
+#else
 #define WL_TBM_C_LOG(fmt, ...)   fprintf (stderr, "[WL_TBM_C(%d):%s] " fmt, getpid(), __func__, ##__VA_ARGS__)
 #define WL_TBM_S_LOG(fmt, ...)   fprintf (stderr, "[WL_TBM_S(%d):%s] " fmt, getpid(), __func__, ##__VA_ARGS__)
 #define WL_TBM_LOG(fmt, ...)     fprintf (stderr, "[WL_TBM(%d)] " fmt, getpid(), ##__VA_ARGS__)
+#endif /* ENABLE_DLOG */
+
+#define WL_TBM_DEBUG(fmt, ...)   fprintf (stderr, "[WL_TBM:DEBUG(%d)] " fmt, getpid(), ##__VA_ARGS__)
 
 /* check condition */
 #define WL_TBM_RETURN_IF_FAIL(cond) {\
     if (!(cond)) {\
-        WL_TBM_LOG ("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\
+        WL_TBM_LOG ("'%s' failed.\n", #cond);\
         return;\
     }\
 }
 #define WL_TBM_RETURN_VAL_IF_FAIL(cond, val) {\
     if (!(cond)) {\
-        WL_TBM_LOG ("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\
+        WL_TBM_LOG ("'%s' failed.\n", #cond);\
         return val;\
     }\
 }
 #define WL_TBM_GOTO_IF_FAIL(cond, dst) {\
     if (!(cond)) {\
-        WL_TBM_LOG ("[%s] : '%s' failed.\n", __FUNCTION__, #cond);\
+        WL_TBM_LOG ("'%s' failed.\n", #cond);\
         goto dst;\
     }\
 }
@@ -93,6 +132,9 @@ _wayland_tbm_util_get_appname_brief(char *brief);
 void
 _wayland_tbm_util_get_appname_from_pid(long pid, char *str);
 
+void
+_wayland_tbm_check_dlog_enable(void);
+
 #ifdef  __cplusplus
 }
 #endif

diff --git a/src/wayland-tbm-server.c b/src/wayland-tbm-server.c
index ae04964..4bf9b95 100644 (file)
--- a/src/wayland-tbm-server.c
+++ b/src/wayland-tbm-server.c
@@ -646,6 +646,8 @@ wayland_tbm_server_init(struct wl_display *display, const char *device_name,
 {\r
        struct wayland_tbm_server *tbm_srv;\r
 \r
+       _wayland_tbm_check_dlog_enable();\r
+\r
        tbm_srv = calloc(1, sizeof(struct wayland_tbm_server));\r
        WL_TBM_RETURN_VAL_IF_FAIL(tbm_srv != NULL, NULL);\r
 \r

diff --git a/src/wayland-tbm-util.c b/src/wayland-tbm-util.c
index ec67cbc..fccb5ae 100644 (file)
--- a/src/wayland-tbm-util.c
+++ b/src/wayland-tbm-util.c
@@ -30,8 +30,14 @@ DEALINGS IN THE SOFTWARE.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
 #include "wayland-tbm-int.h"
 
+#ifdef HAVE_DLOG
+int bDlog;
+#endif
+
 void
 _wayland_tbm_util_get_appname_brief(char *brief)
 {
@@ -84,3 +90,20 @@ _wayland_tbm_util_get_appname_from_pid(long pid, char *str)
        snprintf(str, sizeof(cmdline), "%s", cmdline);
 }
 
+void
+_wayland_tbm_check_dlog_enable(void)
+{
+#ifdef HAVE_DLOG
+       char *env;
+
+       env = getenv("WL_TBM_DLOG");
+       if (env) {
+               bDlog = atoi(env);
+               WL_TBM_LOG("WL_TBM_DLOG=%s\n", env);
+       } else {
+               bDlog = 0;
+       }
+#endif
+    return;
+}
+