plugin: Replace shared/log.h with the libsyscommon/log.h

Change-Id: I382897148934deba330e23975b411d51103d3a61
Signed-off-by: Youngjae Cho <y0.cho@samsung.com>

diff --git a/plugins/iot-headed/display/CMakeLists.txt b/plugins/iot-headed/display/CMakeLists.txt
index 532810d..169618e 100644 (file)
--- a/plugins/iot-headed/display/CMakeLists.txt
+++ b/plugins/iot-headed/display/CMakeLists.txt
@@ -25,6 +25,8 @@ FOREACH(flag ${libpkgs_CFLAGS})
 ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LIB_CFLAGS}")
 
+ADD_DEFINITIONS("-DENABLE_DLOG")
+
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libpkgs_LDFLAGS} deviced-common-private)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")

diff --git a/plugins/iot-headed/display/core.c b/plugins/iot-headed/display/core.c
index b79a171..5ce8dff 100644 (file)
--- a/plugins/iot-headed/display/core.c
+++ b/plugins/iot-headed/display/core.c
@@ -43,7 +43,7 @@
 #include <device/display-internal.h>
 #include <hal/device/hal-device-power.h>
 
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include "core.h"
 #include "poll.h"
 #include "lock-detector.h"

diff --git a/plugins/iot-headed/display/device-interface.c b/plugins/iot-headed/display/device-interface.c
index 6493797..a0d73e1 100644 (file)
--- a/plugins/iot-headed/display/device-interface.c
+++ b/plugins/iot-headed/display/device-interface.c
@@ -33,7 +33,7 @@
 #include <hal/device/hal-display.h>
 
 #include "power/power-suspend.h"
-#include "core/log.h"
+#include <libsyscommon/log.h>
 #include "shared/devices.h"
 #include "shared/common.h"
 #include "device-interface.h"

diff --git a/plugins/iot-headed/display/key-filter.c b/plugins/iot-headed/display/key-filter.c
index 345e355..988fa28 100644 (file)
--- a/plugins/iot-headed/display/key-filter.c
+++ b/plugins/iot-headed/display/key-filter.c
@@ -46,7 +46,7 @@
 #include "shared/devices.h"
 #include "shared/common.h"
 #include "shared/apps.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include "power/power-off.h"
 #include "power/power-suspend.h"
 #include "led/touch-key.h"

diff --git a/plugins/iot-headless/input/CMakeLists.txt b/plugins/iot-headless/input/CMakeLists.txt
index 5de54d4..fe74606 100644 (file)
--- a/plugins/iot-headless/input/CMakeLists.txt
+++ b/plugins/iot-headless/input/CMakeLists.txt
@@ -11,6 +11,8 @@ PKG_CHECK_MODULES(REQUIRED_PKGS REQUIRED
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../power)
 
+ADD_DEFINITIONS("-DENABLE_DLOG")
+
 FILE(GLOB SRCS "*.c")
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")

diff --git a/plugins/mobile/battery/CMakeLists.txt b/plugins/mobile/battery/CMakeLists.txt
index b9c0f42..778ab93 100644 (file)
--- a/plugins/mobile/battery/CMakeLists.txt
+++ b/plugins/mobile/battery/CMakeLists.txt
@@ -19,6 +19,8 @@ FOREACH(flag ${libpkgs_CFLAGS})
 ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LIB_CFLAGS}")
 
+ADD_DEFINITIONS("-DENABLE_DLOG")
+
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libpkgs_LDFLAGS} deviced-common-private)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")

diff --git a/plugins/mobile/battery/battery-notification.c b/plugins/mobile/battery/battery-notification.c
index ddf2462..7698375 100644 (file)
--- a/plugins/mobile/battery/battery-notification.c
+++ b/plugins/mobile/battery/battery-notification.c
@@ -24,7 +24,7 @@
 #include <system/syscommon-plugin-deviced-common-interface.h>
 #include <system/syscommon-plugin-deviced-display-interface.h>
 
-#include "core/log.h"
+#include <libsyscommon/log.h>
 #include "battery.h"
 #include "battery-parser.h"
 #include "power-supply.h"

diff --git a/plugins/mobile/display/CMakeLists.txt b/plugins/mobile/display/CMakeLists.txt
index eed43f2..6b8a8e3 100644 (file)
--- a/plugins/mobile/display/CMakeLists.txt
+++ b/plugins/mobile/display/CMakeLists.txt
@@ -25,6 +25,8 @@ FOREACH(flag ${libpkgs_CFLAGS})
 ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LIB_CFLAGS}")
 
+ADD_DEFINITIONS("-DENABLE_DLOG")
+
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libpkgs_LDFLAGS} deviced-common-private)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")

diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c
index c9d797e..ba2f793 100644 (file)
--- a/plugins/mobile/display/core.c
+++ b/plugins/mobile/display/core.c
@@ -42,7 +42,7 @@
 #include <libsyscommon/list.h>
 #include <hal/device/hal-device-power.h>
 
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include "ambient-mode.h"
 #include "core.h"
 #include "poll.h"

diff --git a/plugins/mobile/display/device-interface.c b/plugins/mobile/display/device-interface.c
index 740b7f8..3b3cd7a 100644 (file)
--- a/plugins/mobile/display/device-interface.c
+++ b/plugins/mobile/display/device-interface.c
@@ -33,7 +33,7 @@
 #include <hal/device/hal-display.h>
 
 #include "ambient-mode.h"
-#include "core/log.h"
+#include <libsyscommon/log.h>
 #include "shared/devices.h"
 #include "shared/common.h"
 #include "shared/device-notifier.h"

diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c
index 0a4d1df..32edcdf 100644 (file)
--- a/plugins/mobile/display/key-filter.c
+++ b/plugins/mobile/display/key-filter.c
@@ -48,7 +48,7 @@
 #include "shared/common.h"
 #include "shared/plugin.h"
 #include "shared/apps.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include "power/power-off.h"
 #include "power/power-suspend.h"
 #include "led/touch-key.h"

diff --git a/plugins/tv/display/CMakeLists.txt b/plugins/tv/display/CMakeLists.txt
index 3267977..ae6e2d8 100644 (file)
--- a/plugins/tv/display/CMakeLists.txt
+++ b/plugins/tv/display/CMakeLists.txt
@@ -25,6 +25,8 @@ FOREACH(flag ${libpkgs_CFLAGS})
 ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LIB_CFLAGS}")
 
+ADD_DEFINITIONS("-DENABLE_DLOG")
+
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libpkgs_LDFLAGS} deviced-common-private)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")

diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c
index 082904f..f679f92 100644 (file)
--- a/plugins/tv/display/core.c
+++ b/plugins/tv/display/core.c
@@ -40,9 +40,9 @@
 #include <vconf-keys.h>
 #include <sys/time.h>
 #include <libsyscommon/list.h>
+#include <libsyscommon/log.h>
 #include <hal/device/hal-device-power.h>
 
-#include "shared/log.h"
 #include "ambient-mode.h"
 #include "core.h"
 #include "poll.h"

diff --git a/plugins/tv/display/device-interface.c b/plugins/tv/display/device-interface.c
index e6eedbb..25cb33b 100644 (file)
--- a/plugins/tv/display/device-interface.c
+++ b/plugins/tv/display/device-interface.c
@@ -33,7 +33,7 @@
 #include <hal/device/hal-display.h>
 
 #include "ambient-mode.h"
-#include "core/log.h"
+#include <libsyscommon/log.h>
 #include "shared/devices.h"
 #include "shared/common.h"
 #include "shared/device-notifier.h"

diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c
index becd49e..73b4252 100644 (file)
--- a/plugins/tv/display/key-filter.c
+++ b/plugins/tv/display/key-filter.c
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <libsyscommon/libgdbus.h>
 #include <libsyscommon/resource-manager.h>
+#include <libsyscommon/log.h>
 #include <system/syscommon-plugin-deviced-common-interface.h>
 #include <system/syscommon-plugin-deviced-display-interface.h>
 #include <linux/input.h>

diff --git a/plugins/wearable/battery/CMakeLists.txt b/plugins/wearable/battery/CMakeLists.txt
index 9573fea..f3bd341 100644 (file)
--- a/plugins/wearable/battery/CMakeLists.txt
+++ b/plugins/wearable/battery/CMakeLists.txt
@@ -21,6 +21,8 @@ FOREACH(flag ${libpkgs_CFLAGS})
 ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LIB_CFLAGS}")
 
+ADD_DEFINITIONS("-DENABLE_DLOG")
+
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libpkgs_LDFLAGS} deviced-common-private)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")

diff --git a/plugins/wearable/battery/battery-notification.c b/plugins/wearable/battery/battery-notification.c
index 4cc6ae8..336a305 100644 (file)
--- a/plugins/wearable/battery/battery-notification.c
+++ b/plugins/wearable/battery/battery-notification.c
@@ -21,7 +21,7 @@
 #include <system/syscommon-plugin-deviced-common-interface.h>
 
 #include "core.h"
-#include "core/log.h"
+#include <libsyscommon/log.h>
 #include "shared/device-notifier.h"
 #include "power-supply.h"
 #include "battery-ops.h"

diff --git a/plugins/wearable/display/CMakeLists.txt b/plugins/wearable/display/CMakeLists.txt
index 00e456b..97b5bc9 100644 (file)
--- a/plugins/wearable/display/CMakeLists.txt
+++ b/plugins/wearable/display/CMakeLists.txt
@@ -25,6 +25,8 @@ FOREACH(flag ${libpkgs_CFLAGS})
 ENDFOREACH(flag)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_LIB_CFLAGS}")
 
+ADD_DEFINITIONS("-DENABLE_DLOG")
+
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libpkgs_LDFLAGS} deviced-common-private batterymonitor)
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "")

diff --git a/plugins/wearable/display/auto-brightness-sensorhub.c b/plugins/wearable/display/auto-brightness-sensorhub.c
index 2e867c2..6fc0d22 100644 (file)
--- a/plugins/wearable/display/auto-brightness-sensorhub.c
+++ b/plugins/wearable/display/auto-brightness-sensorhub.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <vconf.h>
+#include <libsyscommon/log.h>
 
 #include "hbm.h"
 #include "lbm.h"
@@ -34,7 +35,7 @@
 #include "display-backlight.h"
 #include "display-config.h"
 #include "shared/device-notifier.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include "battery/power-supply.h"
 #include "shared/plugin.h"
 

diff --git a/plugins/wearable/display/auto-brightness.c b/plugins/wearable/display/auto-brightness.c
index 855212b..b94529e 100644 (file)
--- a/plugins/wearable/display/auto-brightness.c
+++ b/plugins/wearable/display/auto-brightness.c
@@ -37,7 +37,7 @@
 #include "display-config.h"
 #include "setting.h"
 #include "shared/device-notifier.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include <libsyscommon/ini-parser.h>
 
 #define MAX_SAMPLING_COUNT     3

diff --git a/plugins/wearable/display/bezel.c b/plugins/wearable/display/bezel.c
index b1a6ac4..3f4abdb 100644 (file)
--- a/plugins/wearable/display/bezel.c
+++ b/plugins/wearable/display/bezel.c
@@ -28,7 +28,7 @@
 #include "display-lock.h"
 #include "display-ops.h"
 #include "display-state-transition.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include "shared/plugin.h"
 
 #ifndef VCONFKEY_SETAPPL_WAKEUP_BY_BEZEL_ENABLE

diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c
index 30d2d57..c02f1f7 100644 (file)
--- a/plugins/wearable/display/core.c
+++ b/plugins/wearable/display/core.c
@@ -43,7 +43,7 @@
 #include <libsyscommon/common.h>
 #include <hal/device/hal-device-power.h>
 
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include "auto-brightness-sensorhub.h"
 #include "ambient-mode.h"
 #include "core.h"

diff --git a/plugins/wearable/display/device-interface.c b/plugins/wearable/display/device-interface.c
index f7e5cf9..06709d0 100644 (file)
--- a/plugins/wearable/display/device-interface.c
+++ b/plugins/wearable/display/device-interface.c
@@ -36,7 +36,7 @@
 #include <system/syscommon-plugin-deviced-common-interface.h>
 
 #include "ambient-mode.h"
-#include "core/log.h"
+#include <libsyscommon/log.h>
 #include "shared/devices.h"
 #include "shared/common.h"
 #include "shared/device-notifier.h"

diff --git a/plugins/wearable/display/display-handler.c b/plugins/wearable/display/display-handler.c
index 4a5ddc5..c929cd6 100644 (file)
--- a/plugins/wearable/display/display-handler.c
+++ b/plugins/wearable/display/display-handler.c
@@ -29,7 +29,7 @@
 #include "poll.h"
 #include "shared/common.h"
 #include "shared/devices.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 #include "display-actor.h"
 #include "display-info.h"
 #include "display-panel.h"

diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c
index 598c5a6..bcbc55b 100644 (file)
--- a/plugins/wearable/display/enhance.c
+++ b/plugins/wearable/display/enhance.c
@@ -28,7 +28,7 @@
 #include "display-ops.h"
 #include "display-panel.h"
 #include "shared/devices.h"
-#include "core/log.h"
+#include <libsyscommon/log.h>
 #include "shared/common.h"
 #include "shared/device-notifier.h"
 

diff --git a/plugins/wearable/display/hbm.c b/plugins/wearable/display/hbm.c
index d62d74d..c10ce1f 100644 (file)
--- a/plugins/wearable/display/hbm.c
+++ b/plugins/wearable/display/hbm.c
@@ -28,7 +28,7 @@
 #include "display-panel.h"
 #include "shared/common.h"
 #include "shared/device-notifier.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 
 #define BOARD_CONF_FILE "/etc/deviced/display.conf"
 

diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c
index d9dc9e8..f3f1d29 100644 (file)
--- a/plugins/wearable/display/key-filter.c
+++ b/plugins/wearable/display/key-filter.c
@@ -25,6 +25,7 @@
 #include <vconf.h>
 #include <sys/types.h>
 #include <libsyscommon/libgdbus.h>
+#include <libsyscommon/log.h>
 #include <system/syscommon-plugin-deviced-common-interface.h>
 #include <linux/input.h>
 

diff --git a/plugins/wearable/display/lbm.c b/plugins/wearable/display/lbm.c
index 8f2f4d9..329aa0a 100644 (file)
--- a/plugins/wearable/display/lbm.c
+++ b/plugins/wearable/display/lbm.c
@@ -30,7 +30,7 @@
 #include "display-ops.h"
 #include "shared/common.h"
 #include "shared/device-notifier.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 
 #define SIGNAL_LBM_ON  "LBMOn"
 #define SIGNAL_LBM_OFF "LBMOff"

diff --git a/plugins/wearable/display/powersaver.c b/plugins/wearable/display/powersaver.c
index 95cdcb1..07450ab 100644 (file)
--- a/plugins/wearable/display/powersaver.c
+++ b/plugins/wearable/display/powersaver.c
@@ -22,7 +22,7 @@
 #include "shared/common.h"
 #include "shared/devices.h"
 #include "shared/device-notifier.h"
-#include "core/log.h"
+#include <libsyscommon/log.h>
 #include "core.h"
 #include "device-interface.h"
 #include "display-backlight.h"

diff --git a/plugins/wearable/display/swim.c b/plugins/wearable/display/swim.c
index 9f1962e..06897e2 100644 (file)
--- a/plugins/wearable/display/swim.c
+++ b/plugins/wearable/display/swim.c
@@ -26,7 +26,7 @@
 #include "display-panel.h"
 #include "display-state-transition.h"
 #include "shared/plugin.h"
-#include "shared/log.h"
+#include <libsyscommon/log.h>
 
 #include <libsyscommon/libgdbus.h>
 #include <system/syscommon-plugin-deviced-common-interface.h>

diff --git a/src/core/log.h b/src/core/log.h
index 395ab0e..8d5ffbb 100644 (file)
--- a/src/core/log.h
+++ b/src/core/log.h
@@ -21,8 +21,10 @@
 #define __LOG_H__
 
 #ifdef ENABLE_DEVICED_DLOG
+#ifndef ENABLE_DLOG
 #define ENABLE_DLOG
 #endif
+#endif
 
 #ifdef LOG_TAG
 #undef LOG_TAG

diff --git a/src/power/power.h b/src/power/power.h
index 1c11d8b..b174d5a 100644 (file)
--- a/src/power/power.h
+++ b/src/power/power.h
@@ -26,7 +26,6 @@
 #include <libsyscommon/ini-parser.h>
 #include <system/syscommon-plugin-deviced-power-interface.h>
 
-#include "shared/log-macro.h"
 #include "shared/device-notifier.h"
 
 struct trans_info {
@@ -55,8 +54,6 @@ static inline uint64_t convert_action_string_to_power_state(const char *str)
        else if (MATCH(str, "current"))
                return DEVICED_POWER_STATE_ALL;
 
-       _W("Invalid power state=%s", str);
-
        return DEVICED_POWER_STATE_UNDEFINED;
 }
 

diff --git a/src/shared/log.h b/src/shared/log.h
index 5a16f28..48b31e3 100644 (file)
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -21,8 +21,10 @@
 #define __LOG_H__
 
 #ifdef ENABLE_LIBDEVICED_DLOG
+#ifndef ENABLE_DLOG
 #define ENABLE_DLOG
 #endif
+#endif
 
 #if defined(ENABLE_TEST) && defined(ENABLE_DLOG)
 #undef ENABLE_DLOG

diff --git a/tests/auto-test/result.c b/tests/auto-test/result.c
index 18b82df..0e7f248 100644 (file)
--- a/tests/auto-test/result.c
+++ b/tests/auto-test/result.c
@@ -23,8 +23,10 @@
 #include "shared/common.h"
 
 #ifdef ENABLE_TEST_DLOG
+#ifndef ENABLE_DLOG
 #define ENABLE_DLOG
 #endif
+#endif
 
 #define LOG_TAG "ATR" /* AUTO_TESTE_RESULT */
 #include "shared/log-macro.h"

diff --git a/tests/auto-test/test.h b/tests/auto-test/test.h
index ef10f18..2a05e02 100644 (file)
--- a/tests/auto-test/test.h
+++ b/tests/auto-test/test.h
@@ -32,8 +32,10 @@
 #include "core/udev.h"
 
 #ifdef ENABLE_TEST_DLOG
+#ifndef ENABLE_DLOG
 #define ENABLE_DLOG
 #endif
+#endif
 
 #define LOG_TAG "AUTO_TEST"
 #include "shared/log-macro.h"

diff --git a/tools/devicectl/devicectl.c b/tools/devicectl/devicectl.c
index be8f063..30cccde 100644 (file)
--- a/tools/devicectl/devicectl.c
+++ b/tools/devicectl/devicectl.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <libsyscommon/libgdbus.h>
+#include <libsyscommon/log.h>
 #include <shared/common.h>
 #include "usb.h"
 #include "power/power.h"