From c3af74a7a2af671dd18155cfc0bd145a7cda5a0d Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Wed, 27 May 2015 15:14:39 +0200 Subject: [PATCH] [Power] Added logs in methods onEntered and onReturn Change-Id: I0ca737542c2ab8e541dfada2cdb12845ccebb8b2 Signed-off-by: Piotr Kosko --- src/power/power_instance.cc | 12 ++++++++ src/power/power_manager.cc | 17 ++++++++++++ src/power/power_platform_proxy.cc | 46 +++++++++++++++++-------------- 3 files changed, 55 insertions(+), 20 deletions(-) diff --git a/src/power/power_instance.cc b/src/power/power_instance.cc index fa8aea68..9d07be50 100755 --- a/src/power/power_instance.cc +++ b/src/power/power_instance.cc @@ -50,6 +50,7 @@ using namespace common; using namespace extension::power; PowerInstance::PowerInstance() { + LoggerD("Enter"); using std::placeholders::_1; using std::placeholders::_2; @@ -68,6 +69,7 @@ PowerInstance::PowerInstance() { } PowerInstance::~PowerInstance() { + LoggerD("Enter"); PowerManager::GetInstance()->RemoveListener(this); } @@ -86,6 +88,7 @@ enum PowerCallbacks { static void ReplyAsync(PowerInstance* instance, PowerCallbacks cbfunc, int callbackId, bool isSuccess, picojson::object& param) { + LoggerD("Enter"); param["callbackId"] = picojson::value(static_cast(callbackId)); param["status"] = picojson::value(isSuccess ? "success" : "error"); @@ -149,6 +152,7 @@ static void ReplyAsync(PowerInstance* instance, PowerCallbacks cbfunc, } void PowerInstance::PowerManagerRequest(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); const std::string& resource = args.get("resource").get(); const std::string& state = args.get("state").get(); @@ -162,6 +166,7 @@ void PowerInstance::PowerManagerRequest(const picojson::value& args, picojson::o } void PowerInstance::PowerManagerRelease(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); const std::string& resource = args.get("resource").get(); PlatformResult result = PowerManager::GetInstance()->Release(kPowerResourceMap.at(resource)); @@ -173,6 +178,7 @@ void PowerInstance::PowerManagerRelease(const picojson::value& args, picojson::o void PowerInstance::PowerManagerGetscreenbrightness(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); double brightness; PlatformResult result = PowerManager::GetInstance()->GetScreenBrightness(&brightness); @@ -184,6 +190,7 @@ void PowerInstance::PowerManagerGetscreenbrightness(const picojson::value& args, void PowerInstance::PowerManagerSetscreenbrightness(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); CHECK_EXIST(args, "brightness", out) double brightness = args.get("brightness").get(); @@ -196,10 +203,12 @@ void PowerInstance::PowerManagerSetscreenbrightness(const picojson::value& args, } void PowerInstance::PowerManagerIsscreenon(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); bool ret = PowerManager::GetInstance()->IsScreenOn(); ReportSuccess(picojson::value(ret), out); } void PowerInstance::PowerManagerRestorescreenbrightness(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); PlatformResult result = PowerManager::GetInstance()->RestoreScreenBrightness(); if (result.IsError()) @@ -209,6 +218,7 @@ void PowerInstance::PowerManagerRestorescreenbrightness(const picojson::value& a } void PowerInstance::PowerManagerTurnscreenon(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); PlatformResult result = PowerManager::GetInstance()->SetScreenState(true); if (result.IsError()) ReportError(result, &out); @@ -217,6 +227,7 @@ void PowerInstance::PowerManagerTurnscreenon(const picojson::value& args, picojs } void PowerInstance::PowerManagerTurnscreenoff(const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); PlatformResult result = PowerManager::GetInstance()->SetScreenState(false); if (result.IsError()) ReportError(result, &out); @@ -225,6 +236,7 @@ void PowerInstance::PowerManagerTurnscreenoff(const picojson::value& args, picoj } void PowerInstance::OnScreenStateChanged(PowerState prev_state, PowerState new_state) { + LoggerD("Enter"); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); obj["cmd"] = picojson::value("ScreenStateChanged"); diff --git a/src/power/power_manager.cc b/src/power/power_manager.cc index 262cc847..4e82ceaf 100755 --- a/src/power/power_manager.cc +++ b/src/power/power_manager.cc @@ -43,6 +43,8 @@ PowerManager::PowerManager() set_custom_brightness_(false), current_requested_state_(POWER_STATE_NONE) { + LoggerD("Enter"); + display_state_e platform_state = DISPLAY_STATE_NORMAL; int ret = device_display_get_state(&platform_state); if (DEVICE_ERROR_NONE != ret) @@ -71,6 +73,7 @@ PowerManager::PowerManager() } PowerManager::~PowerManager() { + LoggerD("Enter"); int ret = device_remove_callback(DEVICE_CALLBACK_DISPLAY_STATE, PowerManager::OnPlatformStateChangedCB); if (DEVICE_ERROR_NONE != ret) @@ -78,11 +81,13 @@ PowerManager::~PowerManager() { } PowerManager* PowerManager::GetInstance(){ + LoggerD("Enter"); static PowerManager instance; return &instance; } void PowerManager::OnPlatformStateChangedCB(device_callback_e type, void* value, void* user_data) { + LoggerD("Enter"); PowerManager* object = static_cast(user_data); if (object == NULL){ LoggerE("User data is NULL"); @@ -119,16 +124,19 @@ void PowerManager::OnPlatformStateChangedCB(device_callback_e type, void* value, } void PowerManager::AddListener(PowerManagerListener* listener) { + LoggerD("Enter"); auto it = std::find(listeners_.begin(), listeners_.end(), listener); if (it == listeners_.end()) listeners_.push_back(listener); } void PowerManager::RemoveListener(PowerManagerListener* listener) { + LoggerD("Enter"); listeners_.remove(listener); } PlatformResult PowerManager::Request(PowerResource resource, PowerState state) { + LoggerD("Enter"); if (resource == POWER_RESOURCE_SCREEN && state == POWER_STATE_CPU_AWAKE) return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "invalid PowerState"); if (resource == POWER_RESOURCE_CPU && state != POWER_STATE_CPU_AWAKE) @@ -228,6 +236,7 @@ PlatformResult PowerManager::Request(PowerResource resource, PowerState state) { } PlatformResult PowerManager::Release(PowerResource resource) { + LoggerD("Enter"); int ret; if (POWER_RESOURCE_SCREEN == resource) { ret = device_power_release_lock(POWER_LOCK_DISPLAY); @@ -271,6 +280,7 @@ PlatformResult PowerManager::Release(PowerResource resource) { } PlatformResult PowerManager::GetScreenBrightness(double* output) { + LoggerD("Enter"); int brightness = GetPlatformBrightness(); LoggerD("Brightness value: %d", brightness); @@ -286,6 +296,7 @@ PlatformResult PowerManager::GetScreenBrightness(double* output) { } PlatformResult PowerManager::SetScreenBrightness(double brightness) { + LoggerD("Enter"); if (brightness > 1 || brightness < 0) return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "brightness should be 0 <= brightness <= 1"); @@ -309,6 +320,7 @@ PlatformResult PowerManager::SetScreenBrightness(double brightness) { } bool PowerManager::IsScreenOn() { + LoggerD("Enter"); display_state_e platform_state = DISPLAY_STATE_NORMAL; int ret = device_display_get_state(&platform_state); if (DEVICE_ERROR_NONE != ret) @@ -317,6 +329,7 @@ bool PowerManager::IsScreenOn() { } PlatformResult PowerManager::SetScreenState(bool onoff) { + LoggerD("Enter"); int ret = device_display_change_state(onoff ? DISPLAY_STATE_NORMAL : DISPLAY_STATE_SCREEN_OFF); if (DEVICE_ERROR_NONE != ret) { LoggerE("Platform error while changing screen state %d", ret); @@ -335,6 +348,7 @@ PlatformResult PowerManager::SetScreenState(bool onoff) { } PlatformResult PowerManager::RestoreScreenBrightness() { + LoggerD("Enter"); int ret = PowerPlatformProxy::GetInstance().SetBrightnessFromSettings(); if (DEVICE_ERROR_NONE != ret) { LoggerE("Platform error while restoring brightness %d", ret); @@ -345,6 +359,7 @@ PlatformResult PowerManager::RestoreScreenBrightness() { } PlatformResult PowerManager::SetPlatformBrightness(int brightness) { + LoggerD("Enter"); if (current_state_ == POWER_STATE_SCREEN_DIM) { current_brightness_ = brightness; LoggerD("Current state is not normal state the value is saved in cache: %d", brightness); @@ -401,6 +416,7 @@ int PowerManager::GetPlatformBrightness(){ PlatformResult PowerManager::RestoreSettedBrightness() { + LoggerD("Enter"); PlatformResult result(ErrorCode::NO_ERROR); int is_custom_mode = 0; vconf_get_int(VCONFKEY_PM_CUSTOM_BRIGHTNESS_STATUS, &is_custom_mode); @@ -417,6 +433,7 @@ PlatformResult PowerManager::RestoreSettedBrightness() { } void PowerManager::BroadcastScreenState(PowerState current) { + LoggerD("Enter"); if (current_state_ == current) return; diff --git a/src/power/power_platform_proxy.cc b/src/power/power_platform_proxy.cc index cce5dd88..e8ab75db 100755 --- a/src/power/power_platform_proxy.cc +++ b/src/power/power_platform_proxy.cc @@ -25,55 +25,61 @@ using namespace common; namespace extension { namespace power { -PowerPlatformProxy::PowerPlatformProxy() - : dbus_op_("org.tizen.system.deviced", - "/Org/Tizen/System/DeviceD/Display", - "org.tizen.system.deviced.display") +PowerPlatformProxy::PowerPlatformProxy() : + dbus_op_("org.tizen.system.deviced", + "/Org/Tizen/System/DeviceD/Display", + "org.tizen.system.deviced.display") { + LoggerD("Entered"); } PowerPlatformProxy::~PowerPlatformProxy() { + LoggerD("Entered"); } PowerPlatformProxy& PowerPlatformProxy::GetInstance() { - static PowerPlatformProxy instance; - return instance; + LoggerD("Entered"); + static PowerPlatformProxy instance; + return instance; } int PowerPlatformProxy::LockState() { - DBusOperationArguments args; - args.AddArgumentString("lcddim"); - args.AddArgumentString("staycurstate"); - args.AddArgumentString("NULL"); - args.AddArgumentInt32(0); + LoggerD("Entered"); + DBusOperationArguments args; + args.AddArgumentString("lcddim"); + args.AddArgumentString("staycurstate"); + args.AddArgumentString("NULL"); + args.AddArgumentInt32(0); - return dbus_op_.InvokeSyncGetInt("lockstate", &args); + return dbus_op_.InvokeSyncGetInt("lockstate", &args); } int PowerPlatformProxy::UnlockState() { - DBusOperationArguments args; - args.AddArgumentString("lcddim"); - args.AddArgumentString("keeptimer"); + LoggerD("Entered"); + DBusOperationArguments args; + args.AddArgumentString("lcddim"); + args.AddArgumentString("keeptimer"); - return dbus_op_.InvokeSyncGetInt("unlockstate", &args); + return dbus_op_.InvokeSyncGetInt("unlockstate", &args); } int PowerPlatformProxy::SetBrightnessFromSettings() { - return dbus_op_.InvokeSyncGetInt("ReleaseBrightness", NULL); + LoggerD("Entered"); + return dbus_op_.InvokeSyncGetInt("ReleaseBrightness", NULL); } int PowerPlatformProxy::SetBrightness(int val) { LoggerD("Entered"); - DBusOperationArguments args; - args.AddArgumentInt32(val); + DBusOperationArguments args; + args.AddArgumentInt32(val); - return dbus_op_.InvokeSyncGetInt("HoldBrightness", &args); + return dbus_op_.InvokeSyncGetInt("HoldBrightness", &args); } int PowerPlatformProxy::GetBrightness() { -- 2.34.1