e_hwc: use ELOGF in log macro

Change-Id: I47e056992a6a3c35c1ddab0866ed54d840b1423a

diff --git a/src/bin/e_hwc.c b/src/bin/e_hwc.c
index 32223c5..5328056 100644 (file)
--- a/src/bin/e_hwc.c
+++ b/src/bin/e_hwc.c
@@ -3,20 +3,20 @@
 #include <Evas_GL.h>
 #include <gbm.h>
 
-#define EHERR(f, hwc, x...)                                           \
-   do                                                                 \
-     {                                                                \
-        ERR("EWL|%20.20s|              |             |%2d|"f,         \
-            "HWC", (e_hwc_output_index_get(hwc)), ##x);               \
-     }                                                                \
+#define EHERR(f, hwc, x...)                               \
+   do                                                     \
+     {                                                    \
+        ELOGFE("HWC","%2d|"f,                             \
+               NULL, (e_hwc_output_index_get(hwc)), ##x); \
+     }                                                    \
    while (0)
 
-#define EHINF(f, hwc, x...)                                           \
-   do                                                                 \
-     {                                                                \
-        INF("EWL|%20.20s|              |             |%2d|"f,         \
-            "HWC", (e_hwc_output_index_get(hwc)), ##x);               \
-     }                                                                \
+#define EHINF(f, hwc, x...)                               \
+   do                                                     \
+     {                                                    \
+        ELOGF("HWC", "%2d|"f,                             \
+              NULL, (e_hwc_output_index_get(hwc)), ##x);  \
+     }                                                    \
    while (0)
 
 E_API int E_EVENT_HWC_ACTIVE = -1;

diff --git a/src/bin/e_hwc_window.c b/src/bin/e_hwc_window.c
index cef2a5c..ac4f378 100644 (file)
--- a/src/bin/e_hwc_window.c
+++ b/src/bin/e_hwc_window.c
@@ -9,64 +9,43 @@
 #define CLEAR(x) memset(&(x), 0, sizeof (x))
 #endif
 
-#define EHWERR(f, ec, hwc, ehw, x...)                                      \
-   do                                                                      \
-     {                                                                     \
-        if ((!ec) && (!ehw))                                               \
-          ERR("EWL|%20.20s|            |             |%2d|"f,              \
-              "HWC-WIN", (e_hwc_output_index_get(hwc)), ##x);              \
-        else if (!ec)                                                      \
-          ERR("EWL|%20.20s|            |             |%2d|ehw :%8p|"f,     \
-              "HWC-WIN", (e_hwc_output_index_get(hwc)),(ehw), ##x);        \
-        else                                                               \
-          ERR("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehw: %8p|"f,               \
-              "HWC-WIN",                                                   \
-              (e_client_util_win_get(ec)),                                 \
-              (ec),                                                        \
-              (e_hwc_output_index_get(hwc)), (ehw),                        \
-              ##x);                                                        \
-     }                                                                     \
+#define EHWERR(f, ec, hwc, ehw, x...)                                  \
+   do                                                                  \
+     {                                                                 \
+        if (!ehw)                                                      \
+          ELOGFE("HWC-WIN", "%2d|"f,                                   \
+                 (ec), (e_hwc_output_index_get(hwc)), ##x);            \
+        else                                                           \
+          ELOGFE("HWC-WIN", "%2d|ehw:%8p|"f,                           \
+                 (ec), (e_hwc_output_index_get(hwc)), (ehw), ##x);     \
+     }                                                                 \
    while (0)
 
-#define EHWINF(f, ec, hwc, ehw, x...)                                      \
-   do                                                                      \
-     {                                                                     \
-        if ((!ec) && (!ehw))                                               \
-          INF("EWL|%20.20s|            |             |%2d|"f,              \
-              "HWC-WIN", (e_hwc_output_index_get(hwc)), ##x);              \
-        else if (!ec)                                                      \
-          INF("EWL|%20.20s|            |             |%2d|ehw :%8p|"f,     \
-              "HWC-WIN", (e_hwc_output_index_get(hwc)),(ehw), ##x);        \
-        else                                                               \
-          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehw :%8p|"f,               \
-              "HWC-WIN",                                                   \
-              (e_client_util_win_get(ec)),                                 \
-              (ec),                                                        \
-              (e_hwc_output_index_get(hwc)), (ehw),                        \
-              ##x);                                                        \
-     }                                                                     \
+#define EHWINF(f, ec, hwc, ehw, x...)                                  \
+   do                                                                  \
+     {                                                                 \
+        if (!ehw)                                                      \
+          ELOGF("HWC-WIN", "%2d|"f,                                    \
+                (ec), (e_hwc_output_index_get(hwc)), ##x);             \
+        else                                                           \
+          ELOGF("HWC-WIN", "%2d|ehw:%8p|"f,                            \
+                (ec), (e_hwc_output_index_get(hwc)), (ehw), ##x);      \
+     }                                                                 \
    while (0)
 
-#define EHWTRACE(f, ec, hwc, ehw, x... )                                   \
-   do                                                                      \
-     {                                                                     \
-        if (ehw_trace)                                                     \
-          {                                                                \
-             if ((!ec) && (!ehw))                                          \
-               INF("EWL|%20.20s|            |             |%2d|"f,         \
-                   "HWC-WIN", (e_hwc_output_index_get(hwc)), ##x);         \
-             else if (!ec)                                                 \
-               INF("EWL|%20.20s|            |             |%2d|ehw :%8p|"f,\
-                   "HWC-WIN", (e_hwc_output_index_get(hwc)),(ehw), ##x);   \
-             else                                                          \
-               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehw :%8p|"f,          \
-                   "HWC-WIN",                                              \
-                   (e_client_util_win_get(ec)),                            \
-                   (ec),                                                   \
-                   (e_hwc_output_index_get(hwc)), (ehw),                   \
-                   ##x);                                                   \
-          }                                                                \
-     }                                                                     \
+#define EHWTRACE(f, ec, hwc, ehw, x... )\
+   do                                                                  \
+     {                                                                 \
+        if (ehw_trace)                                                 \
+          {                                                            \
+             if (!ehw)                                                 \
+               ELOGF("HWC-WIN", "%2d|"f,                               \
+                     (ec), (e_hwc_output_index_get(hwc)), ##x);        \
+             else                                                      \
+               ELOGF("HWC-WIN", "%2d|ehw:%8p|"f,                       \
+                     (ec), (e_hwc_output_index_get(hwc)), (ehw), ##x); \
+          }                                                            \
+     }                                                                 \
    while (0)
 
 typedef enum _E_Hwc_Window_Restriction

diff --git a/src/bin/e_hwc_window_queue.c b/src/bin/e_hwc_window_queue.c
index a0c485f..b7d83fc 100644 (file)
--- a/src/bin/e_hwc_window_queue.c
+++ b/src/bin/e_hwc_window_queue.c
@@ -30,64 +30,43 @@
     } \
   while (0)
 
-#define EHWQERR(f, ec, hwc, ehwq, x...)                                    \
-   do                                                                      \
-     {                                                                     \
-        if ((!ec) && (!ehwq))                                              \
-          ERR("EWL|%20.20s|            |             |%2d|"f,              \
-              "HWC-WINQ", (e_hwc_output_index_get(hwc)), ##x);             \
-        else if(!ec)                                                       \
-          ERR("EWL|%20.20s|            |             |%2d|ehwq:%8p|"f,     \
-              "HWC-WINQ", (e_hwc_output_index_get(hwc)), ehwq, ##x);       \
-        else                                                               \
-          ERR("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehwq:%8p|"f,               \
-              "HWC-WINQ",                                                  \
-              (e_client_util_win_get(ec)),                                 \
-              (ec),                                                        \
-              (e_hwc_output_index_get(hwc)), (ehwq),                       \
-              ##x);                                                        \
-     }                                                                     \
+#define EHWQERR(f, ec, hwc, ehwq, x...)                                 \
+   do                                                                   \
+     {                                                                  \
+        if (!ehwq)                                                      \
+          ELOGFE("HWC-WINQ", "%2d|"f,                                   \
+                 (ec), (e_hwc_output_index_get(hwc)), ##x);             \
+        else                                                            \
+          ELOGFE("HWC-WINQ", "%2d|ehwq:%8p|"f,                          \
+                 (ec), (e_hwc_output_index_get(hwc)), (ehwq), ##x);     \
+     }                                                                  \
    while (0)
 
-#define EHWQINF(f, ec, hwc, ehwq, x...)                                    \
-   do                                                                      \
-     {                                                                     \
-        if ((!ec) && (!ehwq))                                              \
-          INF("EWL|%20.20s|            |             |%2d|"f,              \
-              "HWC-WINQ", (e_hwc_output_index_get(hwc)), ##x);             \
-        else if(!ec)                                                       \
-          INF("EWL|%20.20s|            |             |%2d|ehwq:%8p|"f,     \
-              "HWC-WINQ", (e_hwc_output_index_get(hwc)), ehwq, ##x);       \
-        else                                                               \
-          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehwq:%8p|"f,               \
-              "HWC-WINQ",                                                  \
-              (e_client_util_win_get(ec)),                                 \
-              (ec),                                                        \
-              (e_hwc_output_index_get(hwc)), (ehwq),                       \
-              ##x);                                                        \
-     }                                                                     \
+#define EHWQINF(f, ec, hwc, ehwq, x...)                                 \
+   do                                                                   \
+     {                                                                  \
+        if (!ehwq)                                                      \
+          ELOGF("HWC-WINQ", "%2d|"f,                                    \
+                (ec), (e_hwc_output_index_get(hwc)), ##x);              \
+        else                                                            \
+          ELOGF("HWC-WINQ", "%2d|ehwq:%8p|"f,                           \
+                (ec), (e_hwc_output_index_get(hwc)), (ehwq), ##x);      \
+     }                                                                  \
    while (0)
 
-#define EHWQTRACE(f, ec, hwc, ehwq, x...)                                  \
-   do                                                                      \
-     {                                                                     \
-        if (ehwq_trace)                                                    \
-          {                                                                \
-             if ((!ec) && (!ehwq))                                         \
-               INF("EWL|%20.20s|            |             |%2d|"f,         \
-                   "HWC-WINQ", (e_hwc_output_index_get(hwc)), ##x);        \
-             else if(!ec)                                                  \
-               INF("EWL|%20.20s|            |             |%2d|ehwq:%8p|"f,\
-                   "HWC-WINQ", (e_hwc_output_index_get(hwc)), ehwq, ##x);  \
-             else                                                          \
-               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|ehwq:%8p|"f,          \
-                   "HWC-WINQ",                                             \
-                   (e_client_util_win_get(ec)),                            \
-                   (ec),                                                   \
-                   (e_hwc_output_index_get(hwc)), (ehwq),                  \
-                   ##x);                                                   \
-          }                                                                \
-     }                                                                     \
+#define EHWQTRACE(f, ec, hwc, ehwq, x...)                               \
+   do                                                                   \
+     {                                                                  \
+        if (ehwq_trace)                                                 \
+          {                                                             \
+             if (!ehwq)                                                 \
+               ELOGF("HWC-WINQ", "%2d|"f,                               \
+                     (ec), (e_hwc_output_index_get(hwc)), ##x);         \
+             else                                                       \
+               ELOGF("HWC-WINQ", "%2d|ehwq:%8p|"f,                      \
+                     (ec), (e_hwc_output_index_get(hwc)), (ehwq), ##x); \
+          }                                                             \
+     }                                                                  \
    while (0)
 
 #define DBG_QUEUE_BUF_REF 0

diff --git a/src/bin/e_hwc_windows.c b/src/bin/e_hwc_windows.c
index e7e956c..bafce13 100644 (file)
--- a/src/bin/e_hwc_windows.c
+++ b/src/bin/e_hwc_windows.c
@@ -15,45 +15,31 @@
 #define CLEAR(x) memset(&(x), 0, sizeof (x))
 #endif
 
-#define EHWSERR(f, hwc, x...)                                      \
-   do                                                              \
-     {                                                             \
-        ERR("EWL|%20.20s|            |             |%2d|"f,        \
-            "HWC-WINS", (e_hwc_output_index_get(hwc)), ##x);       \
-     }                                                             \
+#define EHWSERR(f, hwc, x...)                                 \
+   do                                                         \
+     {                                                        \
+        ELOGFE("HWC-WINS", "%2d|"f,                           \
+               NULL, (e_hwc_output_index_get(hwc)), ##x);     \
+     }                                                        \
    while (0)
 
-#define EHWSINF(f, ec, hwc, x...)                                  \
-   do                                                              \
-     {                                                             \
-        if (!ec)                                                   \
-          INF("EWL|%20.20s|            |             |%2d|"f,      \
-              "HWC-WINS", (e_hwc_output_index_get(hwc)), ##x);     \
-        else                                                       \
-          INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|"f,                \
-              "HWC-WINS",                                          \
-              (e_client_util_win_get(ec)),                         \
-              (ec), (e_hwc_output_index_get(hwc)),                 \
-              ##x);                                                \
-     }                                                             \
+#define EHWSINF(f, ec, hwc, x...)                             \
+   do                                                         \
+     {                                                        \
+          ELOGF("HWC-WINS", "%2d|"f,                          \
+                (ec), (e_hwc_output_index_get(hwc)), ##x);    \
+     }                                                        \
    while (0)
 
-#define EHWSTRACE(f, ec, hwc, x...)                                \
-   do                                                              \
-     {                                                             \
-        if (ehws_trace)                                            \
-          {                                                        \
-             if (!ec)                                              \
-               INF("EWL|%20.20s|            |             |%2d|"f, \
-                   "HWC-WINS", (e_hwc_output_index_get(hwc)), ##x);\
-             else                                                  \
-               INF("EWL|%20.20s|w:0x%08zx|ec:%8p|%2d|"f,           \
-                   "HWC-WINS",                                     \
-                   (e_client_util_win_get(ec)),                    \
-                   (ec), (e_hwc_output_index_get(hwc)),            \
-                   ##x);                                           \
-          }                                                        \
-     }                                                             \
+#define EHWSTRACE(f, ec, hwc, x...)                           \
+   do                                                         \
+     {                                                        \
+        if (ehws_trace)                                       \
+          {                                                   \
+             ELOGF("HWC-WINS", "%2d|"f,                       \
+                   (ec), (e_hwc_output_index_get(hwc)), ##x); \
+          }                                                   \
+     }                                                        \
    while (0)
 
 #define ROUNDUP(s,c)        (((s) + (c-1)) & ~(c-1))