From feb4fd71c2ea8e8a7440f7e5942c097748e524e4 Mon Sep 17 00:00:00 2001 From: Szymon Jastrzebski Date: Mon, 18 Sep 2017 11:30:34 +0200 Subject: [PATCH] [PROJECT] Refactoring entering logs into ScopeLogger Removing logs in trivial function and adding when they are missed will be part of another commit PS2 Rebase PS3 Change some left Loggers PS4 After using clang PS5 Utilizing changes in ScopeLogger PS6 Cleaning up PS8 Adding missing logs - not formatted PS9 Clang PS10 Rebase [Verification] Code compiles 10 random packages has 100% passrate: alarm, systemsetting, systeminfo, security, content, filesystem, iotcon, push, capability, privillege Change-Id: I7972fee44dd13277d9ef7693433aad7b0321dd68 Signed-off-by: Szymon Jastrzebski Signed-off-by: Michal Bistyga --- src/account/account_instance.cc | 40 +++-- src/account/account_manager.cc | 36 ++-- src/alarm/alarm_instance.cc | 4 +- src/alarm/alarm_manager.cc | 20 ++- src/alarm/alarm_utils.cc | 4 +- src/application/application.cc | 2 +- src/application/application_extension.cc | 8 +- src/application/application_instance.cc | 48 ++--- src/application/application_manager.cc | 94 +++++----- src/application/application_utils.cc | 20 ++- .../requested_application_control.cc | 14 +- src/archive/archive_callback_data.cc | 116 ++++-------- src/archive/archive_extension.cc | 8 +- src/archive/archive_file.cc | 58 +++--- src/archive/archive_file_entry.cc | 5 +- src/archive/archive_instance.cc | 34 ++-- src/archive/archive_manager.cc | 16 +- src/archive/archive_utils.cc | 22 +-- src/archive/filesystem_file.cc | 4 +- src/archive/filesystem_node.cc | 44 ++--- src/archive/filesystem_path.cc | 7 +- src/archive/un_zip.cc | 24 +-- src/archive/un_zip_extract_request.cc | 24 +-- src/archive/zip.cc | 14 +- src/archive/zip_add_request.cc | 20 +-- src/badge/badge_instance.cc | 12 +- src/badge/badge_manager.cc | 14 +- src/bluetooth/bluetooth_adapter.cc | 78 ++++---- src/bluetooth/bluetooth_class.cc | 6 +- src/bluetooth/bluetooth_device.cc | 13 +- src/bluetooth/bluetooth_gatt_service.cc | 46 +++-- src/bluetooth/bluetooth_health_application.cc | 4 +- src/bluetooth/bluetooth_health_channel.cc | 8 +- .../bluetooth_health_profile_handler.cc | 22 +-- src/bluetooth/bluetooth_instance.cc | 17 +- src/bluetooth/bluetooth_le_adapter.cc | 50 +++--- src/bluetooth/bluetooth_le_device.cc | 26 ++- src/bluetooth/bluetooth_service_handler.cc | 2 +- src/bluetooth/bluetooth_socket.cc | 9 +- src/bookmark/bookmark_instance.cc | 20 +-- src/calendar/calendar.cc | 22 ++- src/calendar/calendar_instance.cc | 60 ++++--- src/calendar/calendar_item.cc | 83 ++++----- src/calendar/calendar_manager.cc | 14 +- src/calendar/calendar_plugin.cc | 3 + src/calendar/calendar_record.cc | 48 ++--- src/callhistory/callhistory.cc | 29 +-- src/callhistory/callhistory_instance.cc | 19 +- src/callhistory/callhistory_utils.cc | 29 +-- src/common/GDBus/connection.cpp | 4 +- src/common/XW_Extension.cc | 6 +- src/common/converter.cc | 2 +- src/common/current_application.cc | 18 +- src/common/extension.cc | 66 +++---- src/common/filesystem/filesystem_provider.cc | 22 +-- .../filesystem/filesystem_provider_deviced.cc | 28 +-- .../filesystem/filesystem_provider_storage.cc | 26 +-- src/common/filesystem/filesystem_storage.cc | 16 +- src/common/filter-utils.cc | 20 +-- src/common/platform_result.cc | 4 +- src/common/tools.cc | 24 +-- src/contact/addressbook.cc | 32 ++-- src/contact/contact_instance.cc | 59 ++++++- src/contact/contact_manager.cc | 32 ++-- src/contact/contact_search_engine.cc | 42 ++--- src/contact/contact_util.cc | 75 ++++---- src/contact/person.cc | 10 +- src/content/content_filter.cc | 14 +- src/content/content_instance.cc | 77 ++++---- src/content/content_manager.cc | 94 +++++----- src/datacontrol/datacontrol_instance.cc | 50 +++--- src/download/download_instance.cc | 40 ++--- src/exif/exif_gps_location.cc | 48 ++--- src/exif/exif_information.cc | 79 ++------- src/exif/exif_instance.cc | 16 +- src/exif/exif_tag_saver.cc | 22 +-- src/exif/exif_util.cc | 24 ++- src/exif/get_exif_info.cc | 15 +- src/exif/jpeg_file.cc | 22 +-- src/exif/rational.cc | 9 +- src/feedback/feedback_instance.cc | 10 +- src/feedback/feedback_manager.cc | 19 +- src/filesystem/filesystem_file.cc | 9 +- src/filesystem/filesystem_instance.cc | 113 ++++++------ src/filesystem/filesystem_manager.cc | 50 +++--- src/filesystem/filesystem_stat.cc | 7 +- src/filesystem/filesystem_utils.cc | 4 +- .../humanactivitymonitor_instance.cc | 26 +-- .../humanactivitymonitor_manager.cc | 17 +- src/inputdevice/inputdevice_instance.cc | 4 +- src/iotcon/iotcon_instance.cc | 22 ++- src/iotcon/iotcon_manager.cc | 2 + src/iotcon/iotcon_server_manager.cc | 10 +- src/iotcon/iotcon_utils.cc | 146 ++++++++------- src/keymanager/keymanager_instance.cc | 21 ++- src/mediacontroller/mediacontroller_client.cc | 36 ++-- .../mediacontroller_instance.cc | 50 +++--- src/mediacontroller/mediacontroller_server.cc | 30 ++-- src/mediacontroller/mediacontroller_types.cc | 12 +- src/mediakey/mediakey_instance.cc | 14 +- src/mediakey/mediakey_manager.cc | 10 +- src/messageport/messageport_instance.cc | 18 +- src/messaging/DBus/EmailSignalProxy.cpp | 2 + src/messaging/DBus/LoadAttachmentProxy.cpp | 9 + src/messaging/DBus/LoadBodyProxy.cpp | 5 + src/messaging/DBus/MessageProxy.cpp | 16 +- src/messaging/DBus/SendProxy.cpp | 5 +- src/messaging/DBus/SyncProxy.cpp | 8 + src/messaging/MsgCommon/AbstractFilter.cpp | 5 + src/messaging/MsgCommon/Any.cpp | 2 + src/messaging/MsgCommon/AttributeFilter.cpp | 3 + .../MsgCommon/AttributeRangeFilter.cpp | 2 + src/messaging/MsgCommon/CompositeFilter.cpp | 2 + src/messaging/MsgCommon/FilterIterator.cpp | 6 + src/messaging/MsgCommon/SortMode.cpp | 5 +- src/messaging/callback_user_data.cc | 20 +-- src/messaging/change_listener_container.cc | 56 +++--- src/messaging/conversation_callback_data.cc | 4 +- .../conversations_change_callback.cc | 12 +- src/messaging/email_manager.cc | 77 ++++---- src/messaging/find_msg_callback_user_data.cc | 4 +- src/messaging/folders_callback_data.cc | 3 +- src/messaging/folders_change_callback.cc | 12 +- src/messaging/message.cc | 77 ++++---- src/messaging/message_attachment.cc | 18 +- src/messaging/message_body.cc | 6 +- src/messaging/message_callback_user_data.cc | 4 +- src/messaging/message_conversation.cc | 14 +- src/messaging/message_email.cc | 18 +- src/messaging/message_folder.cc | 10 +- src/messaging/message_mms.cc | 12 +- src/messaging/message_service.cc | 28 +-- src/messaging/message_service_email.cc | 28 +-- src/messaging/message_service_short_msg.cc | 14 +- src/messaging/message_sms.cc | 4 +- src/messaging/message_storage.cc | 16 +- src/messaging/message_storage_email.cc | 32 ++-- src/messaging/message_storage_short_msg.cc | 32 ++-- src/messaging/messages_callback_user_data.cc | 6 +- src/messaging/messages_change_callback.cc | 16 +- src/messaging/messaging_database_manager.cc | 40 ++--- src/messaging/messaging_extension.cc | 6 +- src/messaging/messaging_instance.cc | 42 ++--- src/messaging/messaging_manager.cc | 13 +- src/messaging/messaging_util.cc | 80 ++++----- src/messaging/short_message_manager.cc | 47 +++-- .../networkbearerselection_instance.cc | 18 +- .../networkbearerselection_manager.cc | 41 ++--- src/nfc/aid_data.cc | 4 +- src/nfc/nfc_adapter.cc | 139 ++++++++------- src/nfc/nfc_extension.cc | 6 +- src/nfc/nfc_instance.cc | 110 ++++++------ src/nfc/nfc_message_utils.cc | 62 +++---- src/nfc/nfc_util.cc | 34 ++-- src/notification/notification_instance.cc | 20 +-- src/notification/notification_manager.cc | 22 +-- src/notification/status_notification.cc | 76 ++++---- src/package/package_extension.cc | 8 +- src/package/package_info_provider.cc | 19 +- src/package/package_instance.cc | 41 +++-- src/power/power_extension.cc | 2 + src/power/power_instance.cc | 22 +-- src/power/power_manager.cc | 34 ++-- src/power/power_platform_proxy.cc | 18 +- src/preference/preference_instance.cc | 1 + src/preference/preference_manager.cc | 3 + src/push/push_instance.cc | 33 ++-- src/push/push_manager.cc | 46 ++--- src/push/push_manager_common.cc | 10 +- src/radio/radio_instance.cc | 38 ++-- src/radio/radio_manager.cc | 62 ++++--- src/secureelement/secureelement_instance.cc | 5 + src/sensor/sensor_instance.cc | 18 +- src/sensor/sensor_service.cc | 104 ++++++----- src/sound/sound_instance.cc | 28 +-- src/sound/sound_manager.cc | 54 +++--- src/systeminfo/systeminfo-utils.cpp | 14 +- .../systeminfo_device_capability.cc | 25 ++- src/systeminfo/systeminfo_instance.cc | 28 +-- src/systeminfo/systeminfo_manager.cc | 167 +++++++++--------- .../systeminfo_properties_manager.cc | 56 +++--- .../systeminfo_sim_details_manager.cc | 29 +-- src/systemsetting/systemsetting_instance.cc | 18 +- src/time/time_extension.cc | 8 +- src/time/time_instance.cc | 44 ++--- src/time/time_manager.cc | 17 +- src/time/time_utils.cc | 24 +-- src/tvinputdevice/tvinputdevice_instance.cc | 4 +- src/utils/utils_extension.cc | 8 +- src/utils/utils_instance.cc | 12 +- src/websetting/websetting_extension.cc | 6 +- src/widgetservice/widgetservice_instance.cc | 6 +- 192 files changed, 2757 insertions(+), 2554 deletions(-) mode change 100755 => 100644 src/filesystem/filesystem_utils.cc diff --git a/src/account/account_instance.cc b/src/account/account_instance.cc index 903b262a..7d754449 100644 --- a/src/account/account_instance.cc +++ b/src/account/account_instance.cc @@ -47,7 +47,7 @@ const std::string kPrivilegeAccountWrite = "http://tizen.org/privilege/account.w } AccountInstance::AccountInstance() { - LoggerD("Enter"); + ScopeLogger(); manager_ = new AccountManager; subscribe_ = NULL; @@ -74,7 +74,7 @@ AccountInstance::AccountInstance() { } AccountInstance::~AccountInstance() { - LoggerD("Enter"); + ScopeLogger(); delete manager_; if (subscribe_) { account_unsubscribe_notification(subscribe_); @@ -82,12 +82,12 @@ AccountInstance::~AccountInstance() { } AccountManager* AccountInstance::GetAccountManager() { - LoggerD("Enter"); + ScopeLogger(); return manager_; } void AccountInstance::AccountSetExtendedData(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountWrite, &out); @@ -103,7 +103,7 @@ void AccountInstance::AccountSetExtendedData(const picojson::value& args, picojs } void AccountInstance::AccountGetExtendedData(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountRead, &out); @@ -114,11 +114,13 @@ void AccountInstance::AccountGetExtendedData(const picojson::value& args, picojs int callback_id = static_cast(args.get("callbackId").get()); auto get_extended_data = [this, account_id](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_extended_dat"); this->manager_->GetExtendedData(account_id, result->get()); }; auto get_extended_data_result = [this, callback_id](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_extended_dat_result"); result->get()["callbackId"] = picojson::value{static_cast(callback_id)}; Instance::PostMessage(this, result->serialize().c_str()); @@ -134,7 +136,7 @@ void AccountInstance::AccountGetExtendedData(const picojson::value& args, picojs void AccountInstance::AccountGetExtendedDataSync(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountRead, &out); @@ -148,25 +150,25 @@ void AccountInstance::AccountGetExtendedDataSync(const picojson::value& args, } void AccountInstance::AccountManagerAdd(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountWrite, &out); manager_->AddAccount(args, out); } void AccountInstance::AccountManagerRemove(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountWrite, &out); manager_->RemoveAccount(args, out); } void AccountInstance::AccountManagerUpdate(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountWrite, &out); manager_->UpdateAccount(args, out); } void AccountInstance::AccountManagerGetAccount(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountRead, &out); @@ -179,7 +181,7 @@ void AccountInstance::AccountManagerGetAccount(const picojson::value& args, pico void AccountInstance::AccountManagerGetAccounts(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountRead, &out); @@ -191,10 +193,12 @@ void AccountInstance::AccountManagerGetAccounts(const picojson::value& args, LoggerD("application ID: [%s]", application_id.c_str()); auto get_accounts = [this, application_id](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function get_accounts"); this->manager_->GetAccountsInfo(application_id, result->get()); }; auto get_accounts_result = [this, callback_id](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_accounts_result"); result->get()["callbackId"] = picojson::value{static_cast(callback_id)}; Instance::PostMessage(this, result->serialize().c_str()); @@ -209,7 +213,7 @@ void AccountInstance::AccountManagerGetAccounts(const picojson::value& args, void AccountInstance::AccountManagerGetProvider(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountRead, &out); @@ -221,7 +225,7 @@ void AccountInstance::AccountManagerGetProvider(const picojson::value& args, void AccountInstance::AccountManagerGetProviders(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountRead, &out); @@ -234,10 +238,12 @@ void AccountInstance::AccountManagerGetProviders(const picojson::value& args, LoggerD("capability [%s]", capability.c_str()); auto get_providers = [this, capability](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_providers"); this->manager_->GetProvidersInfo(capability, result->get()); }; auto get_providers_result = [this, callback_id](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_providers_result"); result->get()["callbackId"] = picojson::value{static_cast(callback_id)}; Instance::PostMessage(this, result->serialize().c_str()); @@ -251,13 +257,13 @@ void AccountInstance::AccountManagerGetProviders(const picojson::value& args, } void AccountInstance::InvokeListener(picojson::object& param) { - LoggerD("Enter"); + ScopeLogger(); picojson::value result = picojson::value(param); Instance::PostMessage(this, result.serialize().c_str()); } static bool AccountEventCb(const char* event_type, int account_id, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); AccountInstance* instance = static_cast(user_data); if (!instance) { @@ -293,7 +299,7 @@ static bool AccountEventCb(const char* event_type, int account_id, void* user_da void AccountInstance::AccountManagerAddAccountListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountRead, &out); if (!subscribe_) { @@ -321,7 +327,7 @@ void AccountInstance::AccountManagerAddAccountListener(const picojson::value& ar void AccountInstance::AccountManagerRemoveAccountListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAccountRead, &out); diff --git a/src/account/account_manager.cc b/src/account/account_manager.cc index b409b899..ca685a84 100644 --- a/src/account/account_manager.cc +++ b/src/account/account_manager.cc @@ -32,7 +32,7 @@ using common::tools::ReportError; namespace { static bool ProviderCapabilitiesCb(char* app_id, char* key, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array* array_data = static_cast(user_data); if (!array_data) { @@ -45,7 +45,7 @@ static bool ProviderCapabilitiesCb(char* app_id, char* key, void* user_data) { } static bool AccountProvidersGetCb(account_type_h provider, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array* array_data = static_cast(user_data); if (!array_data) { @@ -62,7 +62,7 @@ static bool AccountProvidersGetCb(account_type_h provider, void* user_data) { } static bool GetAccountsCallback(account_h handle, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array* array_data = static_cast(user_data); if (!array_data) { @@ -81,7 +81,7 @@ static bool GetAccountsCallback(account_h handle, void* user_data) { } static bool GetCustomAllCallback(char* key, char* value, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array* array_data = static_cast(user_data); if (!array_data) { @@ -103,11 +103,11 @@ static bool GetCustomAllCallback(char* key, char* value, void* user_data) { } // namespace AccountManager::AccountManager() { - LoggerD("Enter"); + ScopeLogger(); } AccountManager::~AccountManager() { - LoggerD("Enter"); + ScopeLogger(); } std::string AccountManager::GetErrorMsg(int error) { @@ -152,7 +152,7 @@ std::string AccountManager::GetErrorMsg(int error) { } void AccountManager::GetAccountsInfo(const std::string& application_id, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); picojson::array array_data; int ret = ACCOUNT_ERROR_NONE; @@ -174,7 +174,7 @@ void AccountManager::GetAccountsInfo(const std::string& application_id, picojson } void AccountManager::GetAccountInfo(int account_id, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); account_h account = NULL; SCOPE_EXIT { @@ -211,7 +211,7 @@ void AccountManager::GetAccountInfo(int account_id, picojson::object& out) { } bool AccountManager::GetProviderInfo(const std::string& provider_id, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); account_type_h provider = NULL; SCOPE_EXIT { @@ -254,7 +254,7 @@ bool AccountManager::GetProviderInfo(const std::string& provider_id, picojson::o } bool AccountManager::ConvertAccountToObject(account_h account, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); char* provider_id = NULL; char* icon_path = NULL; @@ -307,7 +307,7 @@ bool AccountManager::ConvertAccountToObject(account_h account, picojson::object& } bool AccountManager::ConvertProviderToObject(account_type_h provider, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); char* provider_id = NULL; char* display_name = NULL; @@ -373,7 +373,7 @@ bool AccountManager::ConvertProviderToObject(account_type_h provider, picojson:: } void AccountManager::GetProvidersInfo(const std::string& capability, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); picojson::array array_data; int ret = ACCOUNT_ERROR_NONE; @@ -396,7 +396,7 @@ void AccountManager::GetProvidersInfo(const std::string& capability, picojson::o void AccountManager::GetExtendedData(int account_id, const std::string& key, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); account_h account = nullptr; SCOPE_EXIT { @@ -433,7 +433,7 @@ void AccountManager::GetExtendedData(int account_id, const std::string& key, } void AccountManager::GetExtendedData(int account_id, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); account_h account = nullptr; SCOPE_EXIT { @@ -464,7 +464,7 @@ void AccountManager::GetExtendedData(int account_id, picojson::object& out) { void AccountManager::SetExtendedData(int account_id, const std::string& key, const std::string& value, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); account_h account = nullptr; SCOPE_EXIT { @@ -499,7 +499,7 @@ void AccountManager::SetExtendedData(int account_id, const std::string& key, } void AccountManager::AddAccount(const picojson::value& data, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); account_h account_handle = NULL; int account_id; @@ -535,7 +535,7 @@ void AccountManager::AddAccount(const picojson::value& data, picojson::object& o } void AccountManager::RemoveAccount(const picojson::value& data, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); int account_id = static_cast(data.get("accountId").get()); int ret = account_delete_from_db_by_id(account_id); @@ -548,7 +548,7 @@ void AccountManager::RemoveAccount(const picojson::value& data, picojson::object } void AccountManager::UpdateAccount(const picojson::value& data, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); int account_id = static_cast(data.get("accountId").get()); const std::string& user_name = data.get("userName").get(); const std::string& icon_uri = data.get("iconUri").get(); diff --git a/src/alarm/alarm_instance.cc b/src/alarm/alarm_instance.cc index f246c309..1be9f9b1 100644 --- a/src/alarm/alarm_instance.cc +++ b/src/alarm/alarm_instance.cc @@ -25,7 +25,7 @@ namespace alarm { using namespace common; AlarmInstance::AlarmInstance() { - LoggerD("Entered"); + ScopeLogger(); using namespace std::placeholders; RegisterSyncHandler("AlarmManager_add", std::bind(&AlarmManager::Add, &manager_, _1, _2)); @@ -43,7 +43,7 @@ AlarmInstance::AlarmInstance() { } AlarmInstance::~AlarmInstance() { - LoggerD("Entered"); + ScopeLogger(); } } // namespace Alarm diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc index 9921a275..c9690ce1 100644 --- a/src/alarm/alarm_manager.cc +++ b/src/alarm/alarm_manager.cc @@ -65,13 +65,15 @@ const char* kSaturdayShort = "SA"; } AlarmManager::AlarmManager() { + ScopeLogger(); } AlarmManager::~AlarmManager() { + ScopeLogger(); } void AlarmManager::Add(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out); if (!args.contains("alarm")) { @@ -264,7 +266,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) { } void AlarmManager::Remove(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out); int id = 0; @@ -291,7 +293,7 @@ void AlarmManager::Remove(const picojson::value& args, picojson::object& out) { } void AlarmManager::RemoveAll(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out); int ret = alarm_cancel_all(); @@ -305,7 +307,7 @@ void AlarmManager::RemoveAll(const picojson::value& args, picojson::object& out) } PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) { - LoggerD("Entered"); + ScopeLogger(); if (id <= 0) { return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Invalid id.", @@ -427,7 +429,7 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) { } void AlarmManager::Get(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); int id = 0; @@ -448,7 +450,7 @@ void AlarmManager::Get(const picojson::value& args, picojson::object& out) { } static bool AlarmIterateCB(int alarm_id, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); std::vector* alarm_ids = reinterpret_cast*>(user_data); @@ -457,7 +459,7 @@ static bool AlarmIterateCB(int alarm_id, void* user_data) { } void AlarmManager::GetAll(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); std::vector alarm_ids; int ret = alarm_foreach_registered_alarm(AlarmIterateCB, &alarm_ids); @@ -487,7 +489,7 @@ void AlarmManager::GetAll(const picojson::value& args, picojson::object& out) { } void AlarmManager::GetRemainingSeconds(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); struct tm date; struct tm current; @@ -527,7 +529,7 @@ void AlarmManager::GetRemainingSeconds(const picojson::value& args, picojson::ob } void AlarmManager::GetNextScheduledDate(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); int id = 0; diff --git a/src/alarm/alarm_utils.cc b/src/alarm/alarm_utils.cc index 55c1965b..7917e1df 100644 --- a/src/alarm/alarm_utils.cc +++ b/src/alarm/alarm_utils.cc @@ -27,7 +27,7 @@ namespace util { using namespace common; PlatformResult AppControlToService(const picojson::object& obj, app_control_h* app_control) { - LoggerD("Entered"); + ScopeLogger(); const auto it_end = obj.end(); @@ -106,7 +106,7 @@ PlatformResult AppControlToService(const picojson::object& obj, app_control_h* a PlatformResult AppControlToServiceExtraData(const picojson::object& app_obj, app_control_h* app_control) { - LoggerD("Entered"); + ScopeLogger(); const auto it_key = app_obj.find("key"); const auto it_value = app_obj.find("value"); diff --git a/src/application/application.cc b/src/application/application.cc index 68796589..4a3f3ef3 100644 --- a/src/application/application.cc +++ b/src/application/application.cc @@ -32,7 +32,7 @@ RequestedApplicationControl& Application::app_control() { } void Application::GetRequestedAppControl(const picojson::value& args, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); const std::string& encoded_bundle = RequestedApplicationControl::GetEncodedBundle(); diff --git a/src/application/application_extension.cc b/src/application/application_extension.cc index 17e25b4f..853d08d5 100644 --- a/src/application/application_extension.cc +++ b/src/application/application_extension.cc @@ -32,14 +32,14 @@ const char* kApplicationControlData = "tizen.ApplicationControlData"; extern const char kSource_application_api[]; common::Extension* CreateExtension() { - LoggerD("Enter"); + ScopeLogger(); ApplicationExtension* e = new ApplicationExtension(); return e; } ApplicationExtension::ApplicationExtension() { - LoggerD("Enter"); + ScopeLogger(); SetExtensionName(kApplication); SetJavaScriptAPI(kSource_application_api); @@ -49,10 +49,10 @@ ApplicationExtension::ApplicationExtension() { } ApplicationExtension::~ApplicationExtension() { - LoggerD("Enter"); + ScopeLogger(); } common::Instance* ApplicationExtension::CreateInstance() { - LoggerD("Enter"); + ScopeLogger(); return new extension::application::ApplicationInstance(); } diff --git a/src/application/application_instance.cc b/src/application/application_instance.cc index e266380f..76f1d32a 100644 --- a/src/application/application_instance.cc +++ b/src/application/application_instance.cc @@ -38,7 +38,7 @@ const std::string kPrivilegeApplicationLaunch = "http://tizen.org/privilege/appl using namespace common; ApplicationInstance::ApplicationInstance() : manager_(*this) { - LoggerD("Entered"); + ScopeLogger(); app_id_ = CurrentApplication::GetInstance().GetApplicationId(); LoggerD("app_id: %s", app_id_.c_str()); @@ -90,24 +90,24 @@ ApplicationInstance::ApplicationInstance() : manager_(*this) { } ApplicationInstance::~ApplicationInstance() { - LoggerD("Entered"); + ScopeLogger(); } void ApplicationInstance::GetCurrentApplication(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.GetCurrentApplication(app_id_, &out); } void ApplicationInstance::GetAppContext(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.GetAppContext(args, &out); } void ApplicationInstance::GetAppInfo(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); std::string app_id = app_id_; const auto& id = args.get("id"); @@ -119,7 +119,7 @@ void ApplicationInstance::GetAppInfo(const picojson::value& args, picojson::obje } void ApplicationInstance::GetAppCerts(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAppManagerCertificate, &out); @@ -133,7 +133,7 @@ void ApplicationInstance::GetAppCerts(const picojson::value& args, picojson::obj } void ApplicationInstance::GetAppSharedURI(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); std::string app_id = app_id_; const auto& id = args.get("id"); @@ -145,7 +145,7 @@ void ApplicationInstance::GetAppSharedURI(const picojson::value& args, picojson: } void ApplicationInstance::GetAppMetaData(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationInfo, &out); @@ -160,7 +160,7 @@ void ApplicationInstance::GetAppMetaData(const picojson::value& args, picojson:: void ApplicationInstance::AddAppInfoEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: addAppInfoEventListener() is deprecated and will be removed from next " "release. " @@ -171,7 +171,7 @@ void ApplicationInstance::AddAppInfoEventListener(const picojson::value& args, void ApplicationInstance::RemoveAppInfoEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: removeAppInfoEventListener() is deprecated and will be removed from " "next release. " @@ -183,25 +183,25 @@ void ApplicationInstance::RemoveAppInfoEventListener(const picojson::value& args void ApplicationInstance::GetRequestedAppControl(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); current_application_.GetRequestedAppControl(args, &out); } void ApplicationInstance::ReplyResult(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); current_application_.app_control().ReplyResult(args, &out); } void ApplicationInstance::ReplyFailure(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); current_application_.app_control().ReplyFailure(&out); } void ApplicationInstance::GetSize(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationInfo, &out); @@ -209,7 +209,7 @@ void ApplicationInstance::GetSize(const picojson::value& args, picojson::object& } void ApplicationInstance::Kill(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeAppManagerKill, &out); @@ -217,7 +217,7 @@ void ApplicationInstance::Kill(const picojson::value& args, picojson::object& ou } void ApplicationInstance::Launch(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationLaunch, &out); @@ -225,7 +225,7 @@ void ApplicationInstance::Launch(const picojson::value& args, picojson::object& } void ApplicationInstance::LaunchAppControl(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationLaunch, &out); @@ -233,38 +233,38 @@ void ApplicationInstance::LaunchAppControl(const picojson::value& args, picojson } void ApplicationInstance::FindAppControl(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.FindAppControl(args); } void ApplicationInstance::GetAppsContext(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.GetAppsContext(args); } void ApplicationInstance::GetAppsInfo(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.GetAppsInfo(args); } void ApplicationInstance::BroadcastEvent(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.BroadcastEventHelper(args, out, false); } void ApplicationInstance::BroadcastTrustedEvent(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.BroadcastEventHelper(args, out, true); } void ApplicationInstance::AddEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string& event_name = args.get("name").get(); @@ -287,7 +287,7 @@ void ApplicationInstance::AddEventListener(const picojson::value& args, picojson } void ApplicationInstance::RemoveEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string& event_name = args.get("name").get(); diff --git a/src/application/application_manager.cc b/src/application/application_manager.cc index 4c19abe9..6557a505 100644 --- a/src/application/application_manager.cc +++ b/src/application/application_manager.cc @@ -97,16 +97,16 @@ ApplicationManager::ApplicationManager(ApplicationInstance& instance) : pkgmgr_client_handle_(nullptr), pkgmgr_client_uninstall_handle_(nullptr), instance_(instance) { - LoggerD("Enter"); + ScopeLogger(); } ApplicationManager::~ApplicationManager() { - LoggerD("Enter"); + ScopeLogger(); StopAppInfoEventListener(); } void ApplicationManager::GetCurrentApplication(const std::string& app_id, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); // obtain handle to application info pkgmgrinfo_appinfo_h handle; @@ -149,7 +149,7 @@ class TerminateHandler { } void Invoke(const std::shared_ptr& response) { - LoggerD("Entered"); + ScopeLogger(); if (timeout_id_ > 0) { // cancel terminate callback @@ -170,14 +170,14 @@ class TerminateHandler { } void LaunchCheckTerminate() { - LoggerD("Entered"); + ScopeLogger(); timeout_id_ = g_timeout_add(3000, CheckTerminate, this); LoggerD("END"); } private: static gboolean CheckTerminate(gpointer user_data) { - LoggerD("Entered"); + ScopeLogger(); TerminateHandler* that = static_cast(user_data); LoggerD("PID: %d", that->pid_); @@ -221,7 +221,7 @@ class TerminateHandler { void ApplicationManager::AsyncResponse(PlatformResult& result, std::shared_ptr* response) { - LoggerD("Enter"); + ScopeLogger(); LogAndReportError(result, &(*response)->get()); TaskQueue::GetInstance().Async( @@ -232,7 +232,7 @@ void ApplicationManager::AsyncResponse(PlatformResult& result, } void ApplicationManager::Kill(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); @@ -264,7 +264,7 @@ void ApplicationManager::Kill(const picojson::value& args) { } auto kill = [this, callback_id, context_id]() -> void { - LoggerD("Entered Kill async"); + ScopeLogger("Kill async"); std::shared_ptr response = std::shared_ptr(new picojson::value(picojson::object())); @@ -387,7 +387,7 @@ void ApplicationManager::Kill(const picojson::value& args) { } void ApplicationManager::Launch(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); int callback_id = -1; const auto& callback = args.get(kCallbackId); @@ -409,6 +409,7 @@ void ApplicationManager::Launch(const picojson::value& args) { const std::string& id = app_id.get(); auto launch = [id](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, launch"); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); const char* app_id = id.c_str(); const int retry_count = 3; @@ -465,7 +466,7 @@ void ApplicationManager::Launch(const picojson::value& args) { } void ApplicationManager::LaunchAppControl(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); int callback_id = -1; const auto& callback = args.get(kCallbackId); @@ -518,7 +519,7 @@ void ApplicationManager::LaunchAppControl(const picojson::value& args) { auto launch = [this, app_control_ptr, app_id, launch_mode_str, reply_callback](const std::shared_ptr& response) -> void { - LoggerD("Entered"); + ScopeLogger("Entered into asynchronous function, launch"); if (!app_id.empty()) { LoggerD("app_id: %s", app_id.c_str()); @@ -651,7 +652,7 @@ void ApplicationManager::LaunchAppControl(const picojson::value& args) { }; auto launch_response = [this](const std::shared_ptr& response) -> void { - LoggerD("Entered launch_response"); + ScopeLogger("launch_response"); Instance::PostMessage(&this->instance_, response->serialize().c_str()); }; @@ -663,6 +664,7 @@ void ApplicationManager::LaunchAppControl(const picojson::value& args) { // public CAPI did not handling APP_CONTROL_ERROR_APP_NOT_FOUND int app_control_foreach_app_matched_internal(app_control_h app_control, app_control_app_matched_cb callback, void* user_data) { + ScopeLogger(); typedef struct { app_control_h app_control; app_control_app_matched_cb callback; @@ -673,6 +675,9 @@ int app_control_foreach_app_matched_internal(app_control_h app_control, // internal impl of app_control_cb_broker_foreach_app_matched() auto app_control_cb_broker_foreach_app_matched_internal = [](const char* package, void* data) -> int { + ScopeLogger( + "Entered into asynchronous function, app_control_cb_broker_foreach_app_matched_internal's " + "argument"); foreach_context_launchable_app_t_internal* foreach_context; app_control_app_matched_cb app_matched_cb; @@ -725,7 +730,7 @@ int app_control_foreach_app_matched_internal(app_control_h app_control, } void ApplicationManager::FindAppControl(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); int callback_id = -1; const auto& callback = args.get(kCallbackId); @@ -760,8 +765,10 @@ void ApplicationManager::FindAppControl(const picojson::value& args) { } auto find = [app_control_ptr](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, find"); auto app_control_matched = [](app_control_h app_control, const char* appid, void* user_data) -> bool { + ScopeLogger("Entered into asynchronous function, app_control_matched"); if (nullptr == appid) { LoggerD("appid is NULL"); return false; @@ -814,6 +821,7 @@ void ApplicationManager::FindAppControl(const picojson::value& args) { }; auto find_response = [this](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, find_response"); Instance::PostMessage(&this->instance_, response->serialize().c_str()); }; @@ -827,7 +835,7 @@ void ApplicationManager::FindAppControl(const picojson::value& args) { } void ApplicationManager::GetAppsContext(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); int callback_id = -1; const auto& callback = args.get(kCallbackId); @@ -885,7 +893,7 @@ void ApplicationManager::GetAppsContext(const picojson::value& args) { } void ApplicationManager::GetAppContext(const picojson::value& args, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); pid_t pid = 0; const auto& context_id = args.get("contextId"); @@ -934,7 +942,7 @@ void ApplicationManager::GetAppContext(const picojson::value& args, picojson::ob } void ApplicationManager::GetAppsInfo(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); int callback_id = -1; const auto& callback = args.get(kCallbackId); @@ -943,6 +951,7 @@ void ApplicationManager::GetAppsInfo(const picojson::value& args) { } auto get_apps_info = [](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get_apps_info"); picojson::object& response_obj = response->get(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -951,6 +960,7 @@ void ApplicationManager::GetAppsInfo(const picojson::value& args) { .first->second.get(); auto app_info_cb = [](pkgmgrinfo_appinfo_h handle, void* user_data) -> int { + ScopeLogger("Entered into asynchronous function, app_info_cb"); if (nullptr == user_data) { return -1; } @@ -976,6 +986,7 @@ void ApplicationManager::GetAppsInfo(const picojson::value& args) { auto get_apps_info_response = [this, callback_id](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get_apps_info_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair(kCallbackId, picojson::value(static_cast(callback_id)))); Instance::PostMessage(&this->instance_, response->serialize().c_str()); @@ -987,7 +998,7 @@ void ApplicationManager::GetAppsInfo(const picojson::value& args) { } void ApplicationManager::GetAppInfo(const std::string& app_id, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); pkgmgrinfo_appinfo_h handle = nullptr; @@ -1004,7 +1015,7 @@ void ApplicationManager::GetAppInfo(const std::string& app_id, picojson::object* } char* ApplicationManager::GetPackageId(const std::string& app_id) { - LoggerD("Entered"); + ScopeLogger(); app_info_h handle; char* pkg_id = nullptr; @@ -1029,7 +1040,7 @@ char* ApplicationManager::GetPackageId(const std::string& app_id) { } void ApplicationManager::GetAppCerts(const std::string& app_id, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); char* package_id = nullptr; @@ -1115,7 +1126,7 @@ void ApplicationManager::GetAppCerts(const std::string& app_id, picojson::object } void ApplicationManager::GetAppSharedUri(const std::string& app_id, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); char* package_id = nullptr; @@ -1156,7 +1167,7 @@ void ApplicationManager::GetAppSharedUri(const std::string& app_id, picojson::ob } void ApplicationManager::GetAppMetaData(const std::string& app_id, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); pkgmgrinfo_appinfo_h handle = nullptr; @@ -1210,7 +1221,7 @@ class ApplicationListChangedBroker { static int ClientStatusListener(unsigned int target_uid, int id, const char* type, const char* package, const char* key, const char* val, const void* msg, void* data) { - LoggerD("Entered"); + ScopeLogger(); ApplicationListChangedBroker* that = static_cast(data); if (0 == strcasecmp(key, kStartKey)) { @@ -1226,7 +1237,7 @@ class ApplicationListChangedBroker { static int AppUninstallListener(uid_t target_uid, int id, const char* type, const char* package, const char* key, const char* val, const void* msg, void* data) { - LoggerD("Entered"); + ScopeLogger(); ApplicationListChangedBroker* that = static_cast(data); @@ -1244,12 +1255,12 @@ class ApplicationListChangedBroker { } void AddApplicationInstance(ApplicationInstance* app_instance) { - LoggerD("Entered"); + ScopeLogger(); app_instance_list_.push_back(app_instance); } void RemoveApplicationInstance(ApplicationInstance* app_instance) { - LoggerD("Entered"); + ScopeLogger(); for (auto it = app_instance_list_.begin(); it != app_instance_list_.end(); it++) { if (*it == app_instance) { app_instance_list_.erase(it); @@ -1260,13 +1271,13 @@ class ApplicationListChangedBroker { private: void HandleStart(const char* event_type, const char* package) { - LoggerD("Entered"); + ScopeLogger(); app_list_.clear(); set_event_type(event_type); } void HandleEnd(const char* package) { - LoggerD("Entered"); + ScopeLogger(); if (Event::kUninstalled == event_type_) { return; @@ -1319,7 +1330,7 @@ class ApplicationListChangedBroker { } void GetApplicationIdsFromPackage(const char* package) { - LoggerD("Entered"); + ScopeLogger(); package_info_h package_info = nullptr; int ret = package_info_create(package, &package_info); @@ -1341,7 +1352,7 @@ class ApplicationListChangedBroker { } void set_event_type(const char* type) { - LoggerD("Entered"); + ScopeLogger(); if (0 == strcasecmp(type, kInstallEvent)) { event_type_ = Event::kInstalled; } else if (0 == strcasecmp(type, kUpdateEvent)) { @@ -1353,7 +1364,7 @@ class ApplicationListChangedBroker { static bool ApplicationIdCallback(package_info_app_component_type_e comp_type, const char* app_id, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); if (nullptr != app_id) { static_cast(user_data)->app_list_.push_back(app_id); } @@ -1361,20 +1372,20 @@ class ApplicationListChangedBroker { } void HandleUninstallStart() { - LoggerD("Entered"); + ScopeLogger(); app_list_.clear(); set_event_type(kUninstallEvent); } void AddUninstalledAppId(const char* app_id) { - LoggerD("Entered"); + ScopeLogger(); if (nullptr != app_id) { app_list_.push_back(app_id); } } void HandleUninstallEnd() { - LoggerD("Entered"); + ScopeLogger(); for (auto& app_id : app_list_) { picojson::value value = picojson::value(picojson::object()); picojson::object& data_obj = value.get(); @@ -1398,7 +1409,7 @@ class ApplicationListChangedBroker { static ApplicationListChangedBroker g_application_list_changed_broker; void ApplicationManager::StartAppInfoEventListener(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); if (nullptr == pkgmgr_client_handle_ || nullptr == pkgmgr_client_uninstall_handle_) { if (nullptr == pkgmgr_client_handle_) { @@ -1444,7 +1455,7 @@ void ApplicationManager::StartAppInfoEventListener(picojson::object* out) { } void ApplicationManager::StopAppInfoEventListener() { - LoggerD("Entered"); + ScopeLogger(); if (nullptr != pkgmgr_client_handle_ || nullptr != pkgmgr_client_uninstall_handle_) { if (nullptr != pkgmgr_client_handle_) { @@ -1463,7 +1474,7 @@ void ApplicationManager::StopAppInfoEventListener() { void ApplicationManager::GetApplicationInformationSize(const picojson::value& args, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& package_id = args.get("packageId"); if (!package_id.is()) { @@ -1500,7 +1511,7 @@ void ApplicationManager::GetApplicationInformationSize(const picojson::value& ar void ApplicationManager::BroadcastEventHelper(const picojson::value& args, picojson::object& out, bool trusted) { - LoggerD("Entered"); + ScopeLogger(); int ret; std::string event_str = args.get("name").get(); @@ -1534,8 +1545,7 @@ void ApplicationManager::BroadcastEventHelper(const picojson::value& args, picoj } void ApplicationManager::OnEvent(const char* event_name, bundle* event_data, void* user_data) { - LoggerD("Entered"); - LOGGER(DEBUG) << event_name; + ScopeLogger("Event name is: '%f'", event_name); ApplicationManager* manager = static_cast(user_data); @@ -1592,7 +1602,7 @@ void ApplicationManager::OnEvent(const char* event_name, bundle* event_data, voi PlatformResult ApplicationManager::StartEventListener(const std::string& event_name, const JsonCallback& callback) { - LoggerD("Entered"); + ScopeLogger(); int ret; event_handler_h event_handler; @@ -1615,7 +1625,7 @@ PlatformResult ApplicationManager::StartEventListener(const std::string& event_n } void ApplicationManager::StopEventListener(const std::string& event_name) { - LoggerD("Entered"); + ScopeLogger(); int ret; event_handler_h event_handler; diff --git a/src/application/application_utils.cc b/src/application/application_utils.cc index a41e697b..596d292a 100644 --- a/src/application/application_utils.cc +++ b/src/application/application_utils.cc @@ -30,7 +30,7 @@ namespace application { void ApplicationUtils::CreateApplicationInformation(const pkgmgrinfo_appinfo_h handle, picojson::object* app_info) { - LoggerD("Enter"); + ScopeLogger(); char* tmp_str = nullptr; int ret = 0; @@ -81,6 +81,7 @@ void ApplicationUtils::CreateApplicationInformation(const pkgmgrinfo_appinfo_h h ret = pkgmgrinfo_appinfo_foreach_category( handle, [](const char* category, void* user_data) -> int { + ScopeLogger("Entered into asynchronous function"); picojson::array* categories_array = static_cast(user_data); if ((nullptr != category) && (nullptr != categories_array)) { @@ -136,6 +137,7 @@ void ApplicationUtils::CreateApplicationInformation(const pkgmgrinfo_appinfo_h h bool ApplicationUtils::CreateApplicationContext(const app_context_h handle, picojson::object* app_context) { + ScopeLogger(); char* app_id = nullptr; int ret = app_context_get_app_id(handle, &app_id); @@ -162,28 +164,28 @@ bool ApplicationUtils::CreateApplicationContext(const app_context_h handle, void ApplicationUtils::CreateApplicationContext(pid_t pid, const std::string& app_id, picojson::object* app_context) { - LoggerD("Enter"); + ScopeLogger(); app_context->insert(std::make_pair("id", picojson::value(std::to_string(pid)))); app_context->insert(std::make_pair("appId", picojson::value(app_id))); } void ApplicationUtils::CreateApplicationCertificate(const char* cert_type, const char* cert_value, picojson::object* app_certificate) { - LoggerD("Enter"); + ScopeLogger(); app_certificate->insert(std::make_pair("type", picojson::value(cert_type))); app_certificate->insert(std::make_pair("value", picojson::value(cert_value))); } void ApplicationUtils::CreateApplicationMetaData(const char* key, const char* value, picojson::object* app_meta_data) { - LoggerD("Enter"); + ScopeLogger(); app_meta_data->insert(std::make_pair("key", picojson::value(key))); app_meta_data->insert(std::make_pair("value", picojson::value(value))); } PlatformResult ApplicationUtils::ApplicationControlToService( const picojson::object& app_control_obj, app_control_h* app_control) { - LoggerD("Enter"); + ScopeLogger(); const auto it_operation = app_control_obj.find("operation"); const auto it_uri = app_control_obj.find("uri"); const auto it_mime = app_control_obj.find("mime"); @@ -248,7 +250,7 @@ PlatformResult ApplicationUtils::ApplicationControlToService( PlatformResult ApplicationUtils::ApplicationControlDataToServiceExtraData( const picojson::object& app_control_data, app_control_h app_control) { - LoggerD("Enter"); + ScopeLogger(); const auto it_key = app_control_data.find("key"); const auto it_value = app_control_data.find("value"); @@ -283,7 +285,7 @@ PlatformResult ApplicationUtils::ApplicationControlDataToServiceExtraData( void ApplicationUtils::ServiceToApplicationControl(app_control_h app_control, picojson::object* app_control_obj) { - LoggerD("Enter"); + ScopeLogger(); int ret = 0; char* tmp_str = nullptr; @@ -333,7 +335,7 @@ void ApplicationUtils::ServiceToApplicationControl(app_control_h app_control, void ApplicationUtils::ServiceExtraDataToApplicationControlData( app_control_h app_control, const std::string& key, picojson::object* app_control_data) { - LoggerD("Enter"); + ScopeLogger(); int ret = 0; bool is_array = false; @@ -384,12 +386,14 @@ void ApplicationUtils::ServiceExtraDataToApplicationControlData( bool ApplicationUtils::ServiceToApplicationControlDataArray(app_control_h app_control, picojson::array* data) { + ScopeLogger(); int ret = app_control_foreach_extra_data(app_control, ServiceExtraDataCallback, data); return APP_CONTROL_ERROR_NONE == ret; } bool ApplicationUtils::ServiceExtraDataCallback(app_control_h app_control, const char* key, void* user_data) { + ScopeLogger(); picojson::array* data = static_cast(user_data); data->push_back(picojson::value(picojson::object())); diff --git a/src/application/requested_application_control.cc b/src/application/requested_application_control.cc index 1c24f1a3..d0a8661a 100644 --- a/src/application/requested_application_control.cc +++ b/src/application/requested_application_control.cc @@ -33,7 +33,7 @@ namespace extension { namespace application { PlatformResult RequestedApplicationControl::set_bundle(const std::string& encoded_bundle) { - LoggerD("Entered"); + ScopeLogger(); if (encoded_bundle != bundle_) { bundle_ = encoded_bundle; @@ -56,7 +56,7 @@ PlatformResult RequestedApplicationControl::set_bundle(const std::string& encode } void RequestedApplicationControl::set_app_control(app_control_h app_control) { - LoggerD("Entered"); + ScopeLogger(); app_control_.reset(app_control, app_control_destroy); @@ -75,7 +75,7 @@ void RequestedApplicationControl::set_app_control(app_control_h app_control) { } void RequestedApplicationControl::ToJson(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); if (app_control_) { out->insert(std::make_pair("callerAppId", picojson::value(caller_app_id_))); @@ -87,7 +87,7 @@ void RequestedApplicationControl::ToJson(picojson::object* out) { } void RequestedApplicationControl::ReplyResult(const picojson::value& args, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& data_arr = args.get("data"); if (!data_arr.is()) { @@ -139,7 +139,7 @@ void RequestedApplicationControl::ReplyResult(const picojson::value& args, picoj } void RequestedApplicationControl::ReplyFailure(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); // read input data const std::string& encoded_bundle = GetEncodedBundle(); @@ -169,7 +169,7 @@ void RequestedApplicationControl::ReplyFailure(picojson::object* out) { } std::string RequestedApplicationControl::GetEncodedBundle() { - LoggerD("Entered"); + ScopeLogger(); std::string result; std::size_t size = 512; @@ -185,7 +185,7 @@ std::string RequestedApplicationControl::GetEncodedBundle() { } PlatformResult RequestedApplicationControl::VerifyCallerPresence() { - LoggerD("Entered"); + ScopeLogger(); if (caller_app_id_.empty()) { return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Cannot find caller.", diff --git a/src/archive/archive_callback_data.cc b/src/archive/archive_callback_data.cc index 450d9c0f..10e1c8b0 100644 --- a/src/archive/archive_callback_data.cc +++ b/src/archive/archive_callback_data.cc @@ -47,18 +47,18 @@ OperationCallbackData::OperationCallbackData(ArchiveCallbackType callback_type, m_is_error(false), m_is_canceled(false), m_err_code(ErrorCode::NO_ERROR) { - LoggerD("Entered"); + ScopeLogger(); } OperationCallbackData::~OperationCallbackData() { - LoggerD("Entered"); + ScopeLogger(); if (m_op_id > -1) { ArchiveManager::getInstance().eraseElementFromArchiveFileMap(m_op_id); } } void OperationCallbackData::setError(const ErrorCode& err_code, const std::string& err_message) { - LoggerD("Entered"); + ScopeLogger("Setting error, code is: [%d]", err_code); // store only first error if (!m_is_error) { m_err_code = err_code; @@ -68,77 +68,63 @@ void OperationCallbackData::setError(const ErrorCode& err_code, const std::strin } bool OperationCallbackData::isError() const { - LoggerD("Entered"); return m_is_error; } bool OperationCallbackData::isCanceled() const { - LoggerD("Enter"); return m_is_canceled; } void OperationCallbackData::setOperationId(long op_id) { - LoggerD("Entered"); m_op_id = op_id; } long OperationCallbackData::getOperationId() const { - LoggerD("Entered"); return m_op_id; } void OperationCallbackData::setCallbackId(double cid) { - LoggerD("Enter"); m_cid = cid; } double OperationCallbackData::getCallbackId() const { - LoggerD("Enter"); return m_cid; } void OperationCallbackData::setHandle(long handle) { - LoggerD("Enter"); m_handle = handle; } long OperationCallbackData::getHandle() const { - LoggerD("Enter"); return m_handle; } void OperationCallbackData::setIsCanceled(bool canceled) { - LoggerD("Enter"); m_is_canceled = canceled; } void OperationCallbackData::PostMessage(const char* msg) { - LoggerD("Enter"); + ScopeLogger(); Instance::PostMessage(&instance_, msg); } const ErrorCode& OperationCallbackData::getErrorCode() const { - LoggerD("Entered"); return m_err_code; } const std::string& OperationCallbackData::getErrorMessage() const { - LoggerD("Entered"); return m_err_message; } ArchiveCallbackType OperationCallbackData::getCallbackType() const { - LoggerD("Entered"); return m_callback_type; } ArchiveFilePtr OperationCallbackData::getArchiveFile() const { - LoggerD("Enter"); return m_caller_instance; } void OperationCallbackData::setArchiveFile(ArchiveFilePtr caller) { - LoggerD("Enter"); m_caller_instance = caller; } @@ -148,15 +134,15 @@ void OperationCallbackData::setArchiveFile(ArchiveFilePtr caller) { OpenCallbackData::OpenCallbackData(ArchiveInstance& instance) : OperationCallbackData(OPEN_CALLBACK_DATA, instance) { - LoggerD("Entered"); + ScopeLogger(); } OpenCallbackData::~OpenCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } PlatformResult OpenCallbackData::executeOperation(ArchiveFilePtr archive_file_ptr) { - LoggerE("Entered"); + ScopeLogger(); filesystem::FilePtr file = archive_file_ptr->getFile(); if (!file) { @@ -212,25 +198,23 @@ PlatformResult OpenCallbackData::executeOperation(ArchiveFilePtr archive_file_pt GetEntriesCallbackData::GetEntriesCallbackData(ArchiveInstance& instance) : OperationCallbackData(GET_ENTRIES_CALLBACK_DATA, instance) { - LoggerD("Entered"); + ScopeLogger(); } GetEntriesCallbackData::~GetEntriesCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } ArchiveFileEntryPtrMapPtr GetEntriesCallbackData::getEntries() const { - LoggerD("Entered"); return m_entries; } void GetEntriesCallbackData::setEntries(ArchiveFileEntryPtrMapPtr entries) { - LoggerD("Entered"); m_entries = entries; } PlatformResult GetEntriesCallbackData::executeOperation(ArchiveFilePtr archive_file_ptr) { - LoggerD("Entered"); + ScopeLogger(); setEntries(archive_file_ptr->getEntryMap()); @@ -247,35 +231,32 @@ PlatformResult GetEntriesCallbackData::executeOperation(ArchiveFilePtr archive_f GetEntryByNameCallbackData::GetEntryByNameCallbackData(ArchiveInstance& instance) : OperationCallbackData(GET_ENTRY_BY_NAME_CALLBACK_DATA, instance) { - LoggerD("Entered"); + ScopeLogger(); } GetEntryByNameCallbackData::~GetEntryByNameCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } const std::string& GetEntryByNameCallbackData::getName() const { - LoggerD("Entered"); return m_name; } void GetEntryByNameCallbackData::setName(const std::string& name) { - LoggerD("Entered"); m_name = name; } ArchiveFileEntryPtr GetEntryByNameCallbackData::getFileEntry() const { - LoggerD("Entered"); + ScopeLogger(); return m_file_entry; } void GetEntryByNameCallbackData::setFileEntry(ArchiveFileEntryPtr entry) { - LoggerD("Entered"); m_file_entry = entry; } PlatformResult GetEntryByNameCallbackData::executeOperation(ArchiveFilePtr archive_file_ptr) { - LoggerD("Entered"); + ScopeLogger(); ArchiveFileEntryPtrMapPtr entries = archive_file_ptr->getEntryMap(); auto it = entries->find(getName()); @@ -310,20 +291,18 @@ PlatformResult GetEntryByNameCallbackData::executeOperation(ArchiveFilePtr archi BaseProgressCallback::BaseProgressCallback(ArchiveCallbackType callback_type, ArchiveInstance& instance) : OperationCallbackData(callback_type, instance), m_overwrite(false) { - LoggerD("Entered"); + ScopeLogger(); } BaseProgressCallback::~BaseProgressCallback() { - LoggerD("Entered"); + ScopeLogger(); } bool BaseProgressCallback::getOverwrite() const { - LoggerD("Entered"); return m_overwrite; } void BaseProgressCallback::setOverwrite(bool overwrite) { - LoggerD("Entered"); m_overwrite = overwrite; } @@ -336,7 +315,7 @@ struct ProgressHolder { }; void BaseProgressCallback::callSuccessCallbackOnMainThread() { - LoggerD("Entered"); + ScopeLogger(); guint id = g_idle_add(BaseProgressCallback::callSuccessCallbackCB, static_cast(this)); if (!id) { @@ -345,7 +324,7 @@ void BaseProgressCallback::callSuccessCallbackOnMainThread() { } gboolean BaseProgressCallback::callSuccessCallbackCB(void* data) { - LoggerD("Entered"); + ScopeLogger(); BaseProgressCallback* callback = static_cast(data); if (!callback) { @@ -376,7 +355,7 @@ gboolean BaseProgressCallback::callSuccessCallbackCB(void* data) { void BaseProgressCallback::callProgressCallback(long operationId, double value, const std::string& filename, double callbackId) { - LoggerD("Entered"); + ScopeLogger(); picojson::value val = picojson::value(picojson::object()); picojson::object& obj = val.get(); @@ -397,7 +376,7 @@ void BaseProgressCallback::callProgressCallback(long operationId, double value, void BaseProgressCallback::callProgressCallbackOnMainThread(const double progress, ArchiveFileEntryPtr current_entry) { - LoggerD("Entered"); + ScopeLogger(); ProgressHolder* ph = new (std::nothrow) ProgressHolder(); @@ -418,7 +397,7 @@ void BaseProgressCallback::callProgressCallbackOnMainThread(const double progres } gboolean BaseProgressCallback::callProgressCallbackCB(void* data) { - LoggerD("Entered"); + ScopeLogger(); ProgressHolder* ph = static_cast(data); if (!ph) { @@ -446,25 +425,23 @@ gboolean BaseProgressCallback::callProgressCallbackCB(void* data) { AddProgressCallback::AddProgressCallback(ArchiveInstance& instance) : BaseProgressCallback(ADD_PROGRESS_CALLBACK, instance) { - LoggerD("Entered"); + ScopeLogger(); } AddProgressCallback::~AddProgressCallback() { - LoggerD("Entered"); + ScopeLogger(); } ArchiveFileEntryPtr AddProgressCallback::getFileEntry() const { - LoggerD("Entered"); return m_file_entry; } void AddProgressCallback::setFileEntry(ArchiveFileEntryPtr file_entry) { - LoggerD("Entered"); m_file_entry = file_entry; } void AddProgressCallback::setBasePath(const std::string& path) { - LoggerD("Entered"); + ScopeLogger(); m_base_path = path; m_base_virt_path = common::FilesystemProvider::Create().GetVirtualPath(m_base_path); std::string::size_type pos = m_base_virt_path.find(filesystem::Path::getSeparator()); @@ -476,17 +453,15 @@ void AddProgressCallback::setBasePath(const std::string& path) { } const std::string& AddProgressCallback::getBasePath() { - LoggerD("Entered"); return m_base_path; } const std::string& AddProgressCallback::getBaseVirtualPath() { - LoggerD("Entered"); return m_base_virt_path; } PlatformResult AddProgressCallback::executeOperation(ArchiveFilePtr archive_file_ptr) { - LoggerD("Entered"); + ScopeLogger(); if (!m_file_entry) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not add file to archive", @@ -544,39 +519,35 @@ ExtractAllProgressCallback::ExtractAllProgressCallback(ArchiveInstance& instance m_files_extracted(0), m_progress_overall(0), m_overall_decompressed(0) { - LoggerD("Entered"); + ScopeLogger(); } ExtractAllProgressCallback::~ExtractAllProgressCallback() { - LoggerD("Entered"); + ScopeLogger(); } filesystem::FilePtr ExtractAllProgressCallback::getDirectory() const { - LoggerD("Entered"); return m_directory; } void ExtractAllProgressCallback::setDirectory(filesystem::FilePtr directory) { - LoggerD("Entered"); m_directory = directory; } void ExtractAllProgressCallback::startedExtractingFile(unsigned long current_file_size) { - LoggerD("Entered"); - m_current_file_size = current_file_size; m_current_file_extracted_bytes = 0; } void ExtractAllProgressCallback::extractedPartOfFile(unsigned long bytes_decompressed) { - LoggerD("Entered"); + ScopeLogger(); m_current_file_extracted_bytes += bytes_decompressed; updateOverallProgress(bytes_decompressed); } void ExtractAllProgressCallback::finishedExtractingFile() { - LoggerD("Entered"); + ScopeLogger(); m_current_file_size = 0; m_current_file_extracted_bytes = 0; @@ -585,7 +556,7 @@ void ExtractAllProgressCallback::finishedExtractingFile() { } void ExtractAllProgressCallback::updateOverallProgress(unsigned long bytes_decompressed) { - LoggerD("Entered"); + ScopeLogger(); m_overall_decompressed += bytes_decompressed; m_progress_overall = static_cast(m_overall_decompressed + m_files_extracted) / @@ -597,7 +568,7 @@ void ExtractAllProgressCallback::updateOverallProgress(unsigned long bytes_decom } double ExtractAllProgressCallback::getCurrentFileProgress() const { - LoggerD("Entered"); + ScopeLogger(); if (m_current_file_size > 0) { return static_cast(m_current_file_extracted_bytes) / @@ -608,37 +579,26 @@ double ExtractAllProgressCallback::getCurrentFileProgress() const { } double ExtractAllProgressCallback::getOverallProgress() const { - LoggerD("Entered"); - return m_progress_overall; } PlatformResult ExtractAllProgressCallback::executeOperation(ArchiveFilePtr archive_file_ptr) { - LoggerD("Entered"); return archive_file_ptr->extractAllTask(this); } void ExtractAllProgressCallback::setExpectedDecompressedSize(unsigned long exp_dec_size) { - LoggerD("Entered"); - m_expected_decompressed_size = exp_dec_size; } unsigned long ExtractAllProgressCallback::getExpectedDecompressedSize() const { - LoggerD("Entered"); - return m_expected_decompressed_size; } void ExtractAllProgressCallback::setNumberOfFilesToExtract(unsigned long files_count) { - LoggerD("Entered"); - m_files_to_extract = files_count; } unsigned long ExtractAllProgressCallback::getNumberOfFilesToExtract() const { - LoggerD("Entered"); - return m_files_to_extract; } @@ -649,7 +609,7 @@ unsigned long ExtractAllProgressCallback::getNumberOfFilesToExtract() const { const char* OPERATION_CANCELED_EXCEPTION = "OperationCanceledException"; OperationCanceledException::OperationCanceledException(const char* message) { - LoggerD("Entered"); + ScopeLogger(); } //---------------------------------------------------------------------------------------- @@ -658,46 +618,40 @@ OperationCanceledException::OperationCanceledException(const char* message) { ExtractEntryProgressCallback::ExtractEntryProgressCallback(ArchiveInstance& instance) : ExtractAllProgressCallback(instance), m_strip_name(false) { - LoggerD("Entered"); + ScopeLogger(); m_callback_type = EXTRACT_ENTRY_PROGRESS_CALLBACK; } ExtractEntryProgressCallback::~ExtractEntryProgressCallback() { - LoggerD("Entered"); + ScopeLogger(); } ArchiveFileEntryPtr ExtractEntryProgressCallback::getArchiveFileEntry() { - LoggerD("Entered"); return m_archive_file_entry; } void ExtractEntryProgressCallback::setArchiveFileEntry(ArchiveFileEntryPtr afentry) { - LoggerD("Entered"); m_archive_file_entry = afentry; } void ExtractEntryProgressCallback::setStripName(bool strip_name) { - LoggerD("Entered"); m_strip_name = strip_name; } bool ExtractEntryProgressCallback::getStripName() const { - LoggerD("Entered"); return m_strip_name; } void ExtractEntryProgressCallback::setStripBasePath(const std::string& strip_base_path) { - LoggerD("Entered"); m_strip_base_path = strip_base_path; } const std::string& ExtractEntryProgressCallback::getStripBasePath() const { - LoggerD("Entered"); return m_strip_base_path; } PlatformResult ExtractEntryProgressCallback::executeOperation(ArchiveFilePtr archive_file_ptr) { - LoggerD("Entered"); + ScopeLogger(); if (!m_archive_file_entry) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not extract archive file entry", diff --git a/src/archive/archive_extension.cc b/src/archive/archive_extension.cc index dfa97a8f..1e5b212e 100644 --- a/src/archive/archive_extension.cc +++ b/src/archive/archive_extension.cc @@ -22,21 +22,21 @@ extern const char kSource_archive_api[]; common::Extension* CreateExtension() { - LoggerD("Enter"); + ScopeLogger(); return new ArchiveExtension; } ArchiveExtension::ArchiveExtension() { - LoggerD("Enter"); + ScopeLogger(); SetExtensionName("tizen.archive"); SetJavaScriptAPI(kSource_archive_api); } ArchiveExtension::~ArchiveExtension() { - LoggerD("Enter"); + ScopeLogger(); } common::Instance* ArchiveExtension::CreateInstance() { - LoggerD("Enter"); + ScopeLogger(); return new extension::archive::ArchiveInstance(); } diff --git a/src/archive/archive_file.cc b/src/archive/archive_file.cc index f52da91a..797f9632 100644 --- a/src/archive/archive_file.cc +++ b/src/archive/archive_file.cc @@ -34,7 +34,7 @@ namespace extension { namespace archive { Permission::Permission(bool r, bool w, bool rw, bool a) { - LoggerD("Enter"); + ScopeLogger(); permission[0] = r; permission[1] = w; permission[2] = rw; @@ -58,7 +58,7 @@ ArchiveFile::ArchiveFile() m_is_open(false), m_overwrite(false), m_created_as_new_empty_archive(false) { - LoggerD("Entered"); + ScopeLogger(); } ArchiveFile::ArchiveFile(FileMode file_mode) @@ -68,12 +68,12 @@ ArchiveFile::ArchiveFile(FileMode file_mode) m_is_open(false), m_overwrite(false), m_created_as_new_empty_archive(false) { - LoggerD("Enter"); + ScopeLogger(); m_file_mode = file_mode; } ArchiveFile::~ArchiveFile() { - LoggerD("Entered"); + ScopeLogger(); if (m_entry_map) { LoggerD("Unlinking old m_entry_map: %d ArchiveFileEntries", m_entry_map->size()); @@ -86,7 +86,7 @@ ArchiveFile::~ArchiveFile() { } gboolean ArchiveFile::openTaskCompleteCB(void* data) { - LoggerD("Entered"); + ScopeLogger(); auto callback = static_cast(data); if (!callback) { @@ -136,7 +136,7 @@ gboolean ArchiveFile::openTaskCompleteCB(void* data) { } gboolean ArchiveFile::callErrorCallback(void* data) { - LoggerD("Entered"); + ScopeLogger(); auto callback = static_cast(data); if (!callback) { @@ -166,7 +166,7 @@ gboolean ArchiveFile::callErrorCallback(void* data) { } void ArchiveFile::taskManagerThread(gpointer data, gpointer user_data) { - LoggerD("Entered"); + ScopeLogger(); ArchiveFileHolder* archive_file_holder = static_cast(data); if (!archive_file_holder) { LoggerE("archive_file_holder is null"); @@ -227,7 +227,7 @@ void ArchiveFile::taskManagerThread(gpointer data, gpointer user_data) { } PlatformResult ArchiveFile::addOperation(OperationCallbackData* callback) { - LoggerD("Entered callback type:%d", callback->getCallbackType()); + ScopeLogger("callback type: %d", (int)callback->getCallbackType()); const long operation_id = callback->getOperationId(); callback->setArchiveFile(shared_from_this()); @@ -257,7 +257,7 @@ PlatformResult ArchiveFile::addOperation(OperationCallbackData* callback) { } PlatformResult ArchiveFile::extractAllTask(ExtractAllProgressCallback* callback) { - LoggerD("Enter"); + ScopeLogger(); filesystem::FilePtr directory = callback->getDirectory(); if (!directory) { @@ -309,7 +309,7 @@ PlatformResult ArchiveFile::extractAllTask(ExtractAllProgressCallback* callback) } PlatformResult ArchiveFile::getEntries(GetEntriesCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not get list of files in archive", ("callback is NULL")); @@ -324,7 +324,7 @@ PlatformResult ArchiveFile::getEntries(GetEntriesCallbackData* callback) { } gboolean ArchiveFile::getEntriesTaskCompleteCB(void* data) { - LoggerD("Entered"); + ScopeLogger(); LoggerW("STUB Not calling success/error callback"); auto callback = static_cast(data); @@ -375,7 +375,7 @@ gboolean ArchiveFile::getEntriesTaskCompleteCB(void* data) { } PlatformResult ArchiveFile::extractAll(ExtractAllProgressCallback* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not extract all files from archive", ("callback is NULL")); @@ -390,7 +390,7 @@ PlatformResult ArchiveFile::extractAll(ExtractAllProgressCallback* callback) { } PlatformResult ArchiveFile::extractEntryTo(ExtractEntryProgressCallback* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not extract archive file entry", ("callback is NULL")); @@ -409,7 +409,7 @@ PlatformResult ArchiveFile::extractEntryTo(ExtractEntryProgressCallback* callbac } PlatformResult ArchiveFile::add(AddProgressCallback* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not add file to archive", ("callback is NULL")); @@ -428,7 +428,7 @@ PlatformResult ArchiveFile::add(AddProgressCallback* callback) { } void ArchiveFile::close() { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_open) { LoggerD("Archive already closed"); @@ -439,7 +439,7 @@ void ArchiveFile::close() { } PlatformResult ArchiveFile::getEntryByName(GetEntryByNameCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not get archive file entries by name", ("callback is NULL")); @@ -454,7 +454,7 @@ PlatformResult ArchiveFile::getEntryByName(GetEntryByNameCallbackData* callback) } gboolean ArchiveFile::getEntryByNameTaskCompleteCB(void* data) { - LoggerD("Entered"); + ScopeLogger(); auto callback = static_cast(data); if (!callback) { @@ -497,12 +497,10 @@ gboolean ArchiveFile::getEntryByNameTaskCompleteCB(void* data) { } filesystem::FilePtr ArchiveFile::getFile() const { - LoggerD("Entered"); return m_file; } void ArchiveFile::setFile(filesystem::FilePtr file) { - LoggerD("Entered"); m_file = file; } @@ -511,37 +509,31 @@ bool ArchiveFile::isOverwrite() const { } void ArchiveFile::setOverwrite(bool overwrite) { - LoggerD("Entered"); m_overwrite = overwrite; } unsigned long ArchiveFile::getDecompressedSize() const { - LoggerD("Entered"); return m_decompressed_size; } void ArchiveFile::setDecompressedSize(unsigned long decompressed_size) { - LoggerD("Entered"); m_decompressed_size = decompressed_size; } bool ArchiveFile::isOpen() const { - LoggerD("Entered"); return m_is_open; } void ArchiveFile::setIsOpen(bool is_open) { - LoggerD("Entered"); m_is_open = is_open; } ArchiveFileEntryPtrMapPtr ArchiveFile::getEntryMap() const { - LoggerD("Entered"); return m_entry_map; } void ArchiveFile::setEntryMap(ArchiveFileEntryPtrMapPtr entries) { - LoggerD("Entered"); + ScopeLogger(); if (m_entry_map) { LoggerD("Unlinking old m_entry_map: %d ArchiveFileEntries", m_entry_map->size()); @@ -564,7 +556,7 @@ void ArchiveFile::setEntryMap(ArchiveFileEntryPtrMapPtr entries) { } PlatformResult ArchiveFile::createUnZipObject(UnZipPtr* unzip) { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_open) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "File is not opened"); } @@ -582,7 +574,7 @@ PlatformResult ArchiveFile::createUnZipObject(UnZipPtr* unzip) { } PlatformResult ArchiveFile::createZipObject(ZipPtr* zip) { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_open) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "File is not opened"); } @@ -600,7 +592,7 @@ PlatformResult ArchiveFile::createZipObject(ZipPtr* zip) { } bool ArchiveFile::isAllowedOperation(const std::string& method_name) { - LoggerD("Entered"); + ScopeLogger(); PermissionMap::iterator it = s_permission_map.find(method_name); if (it != s_permission_map.end()) { return it->second.permission[m_file_mode]; @@ -609,27 +601,23 @@ bool ArchiveFile::isAllowedOperation(const std::string& method_name) { } FileMode ArchiveFile::getFileMode() const { - LoggerD("Entered"); return m_file_mode; } void ArchiveFile::setFileMode(FileMode file_mode) { - LoggerD("Entered"); m_file_mode = file_mode; } void ArchiveFile::setCreatedAsNewEmptyArchive(bool new_and_empty) { - LoggerD("Entered"); m_created_as_new_empty_archive = new_and_empty; } bool ArchiveFile::isCreatedAsNewEmptyArchive() const { - LoggerD("Entered"); return m_created_as_new_empty_archive; } PlatformResult ArchiveFile::updateListOfEntries() { - LoggerD("Entered"); + ScopeLogger(); // For explanation please see: // ArchiveFile.h m_created_as_new_empty_archive description // @@ -673,7 +661,7 @@ PlatformResult ArchiveFile::updateListOfEntries() { bool ArchiveFile::isEntryWithNameInArchive(const std::string& name_in_zip, bool* out_is_directory, std::string* out_matching_name) { - LoggerD("Enter"); + ScopeLogger(); if (!m_entry_map) { LoggerW("m_entry_map is NULL"); diff --git a/src/archive/archive_file_entry.cc b/src/archive/archive_file_entry.cc index d66a1c60..80b66f8e 100644 --- a/src/archive/archive_file_entry.cc +++ b/src/archive/archive_file_entry.cc @@ -39,11 +39,11 @@ ArchiveFileEntry::ArchiveFileEntry(filesystem::FilePtr file) m_compressed_size(0), m_modified(0), m_compression_level(s_default_compression_level) { - LoggerD("Entered"); + ScopeLogger(); } ArchiveFileEntry::~ArchiveFileEntry() { - LoggerD("Entered"); + ScopeLogger(); } unsigned long ArchiveFileEntry::getCompressedSize() const { @@ -118,6 +118,7 @@ ArchiveFile* ArchiveFileEntry::getArchiveFileNonProtectPtr() { } PlatformResult ArchiveFileEntry::extractTo(ExtractEntryProgressCallback* callback) { + ScopeLogger(); if (!m_archive) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not extract archive file entry", ("m_archive is NULL")); diff --git a/src/archive/archive_instance.cc b/src/archive/archive_instance.cc index 6c26eda0..a4ebd8cd 100644 --- a/src/archive/archive_instance.cc +++ b/src/archive/archive_instance.cc @@ -53,7 +53,7 @@ const std::string kBestCompressionStr = "BEST"; } // namespace ArchiveInstance::ArchiveInstance() { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -79,11 +79,11 @@ ArchiveInstance::ArchiveInstance() { } ArchiveInstance::~ArchiveInstance() { - LoggerD("Entered"); + ScopeLogger(); } void ArchiveInstance::PostError(const PlatformResult& e, double callback_id) { - LoggerD("Entered"); + ScopeLogger(); LoggerE("Posting an error: %d, message: %s", e.error_code(), e.message().c_str()); @@ -97,8 +97,7 @@ void ArchiveInstance::PostError(const PlatformResult& e, double callback_id) { } void ArchiveInstance::Open(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); - LoggerD("%s", args.serialize().c_str()); + ScopeLogger("%s", args.serialize().c_str()); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); @@ -230,8 +229,7 @@ void ArchiveInstance::Open(const picojson::value& args, picojson::object& out) { } void ArchiveInstance::Abort(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); - LoggerD("%s", args.serialize().c_str()); + ScopeLogger("%s", args.serialize().c_str()); picojson::object data = args.get(); picojson::value v_op_id = data.at(PARAM_OPERATION_ID); @@ -244,7 +242,7 @@ void ArchiveInstance::Abort(const picojson::value& args, picojson::object& out) } unsigned int ConvertStringToCompressionLevel(const std::string& level) { - LoggerD("Entered"); + ScopeLogger(); if (kNoCompressionStr == level) { return Z_NO_COMPRESSION; @@ -258,8 +256,7 @@ unsigned int ConvertStringToCompressionLevel(const std::string& level) { } void ArchiveInstance::Add(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); - LoggerD("%s", args.serialize().c_str()); + ScopeLogger("%s", args.serialize().c_str()); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); @@ -346,8 +343,7 @@ void ArchiveInstance::Add(const picojson::value& args, picojson::object& out) { } void ArchiveInstance::ExtractAll(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); - LoggerD("%s", args.serialize().c_str()); + ScopeLogger("%s", args.serialize().c_str()); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); @@ -409,8 +405,7 @@ void ArchiveInstance::ExtractAll(const picojson::value& args, picojson::object& } void ArchiveInstance::GetEntries(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); - LoggerD("%s", args.serialize().c_str()); + ScopeLogger("%s", args.serialize().c_str()); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); @@ -454,8 +449,7 @@ void ArchiveInstance::GetEntries(const picojson::value& args, picojson::object& } void ArchiveInstance::GetEntryByName(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); - LoggerD("%s", args.serialize().c_str()); + ScopeLogger("%s", args.serialize().c_str()); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); @@ -501,8 +495,7 @@ void ArchiveInstance::GetEntryByName(const picojson::value& args, picojson::obje } void ArchiveInstance::Close(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); - LoggerD("%s", args.serialize().c_str()); + ScopeLogger("%s", args.serialize().c_str()); picojson::object data = args.get(); picojson::value v_handle = data.at(ARCHIVE_FILE_HANDLE); @@ -523,8 +516,7 @@ void ArchiveInstance::Close(const picojson::value& args, picojson::object& out) } void ArchiveInstance::Extract(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); - LoggerD("%s", args.serialize().c_str()); + ScopeLogger("%s", args.serialize().c_str()); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); @@ -604,7 +596,7 @@ void ArchiveInstance::Extract(const picojson::value& args, picojson::object& out } void ArchiveInstance::FetchVirtualRoots(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::array roots; for (const auto& root : common::FilesystemProvider::Create().GetVirtualPaths()) { diff --git a/src/archive/archive_manager.cc b/src/archive/archive_manager.cc index 45f63351..bcee48f7 100644 --- a/src/archive/archive_manager.cc +++ b/src/archive/archive_manager.cc @@ -25,20 +25,20 @@ namespace archive { using namespace filesystem; ArchiveManager::ArchiveManager() : m_next_unique_id(0) { - LoggerD("Initialize ArchiveManager"); + ScopeLogger("Initialize ArchiveManager"); // create thread pool with max threads = 1 to make API calls async but // only one call at time m_pool = g_thread_pool_new(ArchiveFile::taskManagerThread, NULL, 1, true, NULL); } ArchiveManager::~ArchiveManager() { - LoggerD("Deinitialize ArchiveManager"); + ScopeLogger("Deinitialize ArchiveManager"); // finish only current task and wait for thread to stop g_thread_pool_free(m_pool, true, true); } ArchiveManager& ArchiveManager::getInstance() { - LoggerD("Entered"); + ScopeLogger(); static ArchiveManager instance; return instance; } @@ -48,7 +48,7 @@ GThreadPool* ArchiveManager::getThreadPool() { } void ArchiveManager::abort(long operation_id) { - LoggerD("Entered"); + ScopeLogger(); ArchiveFileMap::iterator it = m_archive_file_map.find(operation_id); if (it != m_archive_file_map.end()) { @@ -67,7 +67,7 @@ void ArchiveManager::abort(long operation_id) { } void ArchiveManager::erasePrivData(long handle) { - LoggerD("Entered"); + ScopeLogger(); ArchiveFileMap::iterator it = m_priv_map.find(handle); if (it != m_priv_map.end()) { @@ -76,7 +76,7 @@ void ArchiveManager::erasePrivData(long handle) { } long ArchiveManager::addPrivData(ArchiveFilePtr archive_file_ptr) { - LoggerD("Entered"); + ScopeLogger(); long handle = ++m_next_unique_id; m_priv_map.insert(ArchiveFilePair(handle, archive_file_ptr)); @@ -93,7 +93,7 @@ PlatformResult ArchiveManager::getPrivData(long handle, ArchiveFilePtr* archive_ } PlatformResult ArchiveManager::open(OpenCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); // ArchiveFilePtr a_ptr = callback->getArchiveFile(); // std::string filename = callback->getFile(); @@ -107,7 +107,7 @@ PlatformResult ArchiveManager::open(OpenCallbackData* callback) { } void ArchiveManager::eraseElementFromArchiveFileMap(long operation_id) { - LoggerD("Entered"); + ScopeLogger(); ArchiveFileMap::iterator it = m_archive_file_map.find(operation_id); if (it != m_archive_file_map.end()) { m_archive_file_map.erase(it); diff --git a/src/archive/archive_utils.cc b/src/archive/archive_utils.cc index 6976722f..3c91f2ba 100644 --- a/src/archive/archive_utils.cc +++ b/src/archive/archive_utils.cc @@ -27,7 +27,7 @@ namespace archive { using namespace filesystem; std::string bytesToReadableString(const size_t num_bytes) { - LoggerD("Enter"); + ScopeLogger(); std::stringstream ss; static const size_t one_mb = 1024 * 1024; static const size_t one_kb = 1024; @@ -45,7 +45,7 @@ std::string bytesToReadableString(const size_t num_bytes) { } PlatformResult fileModeToString(FileMode fm, std::string* fm_str) { - LoggerD("Enter"); + ScopeLogger(); switch (fm) { case FileMode::READ: *fm_str = "r"; @@ -66,7 +66,7 @@ PlatformResult fileModeToString(FileMode fm, std::string* fm_str) { } PlatformResult stringToFileMode(std::string fmString, FileMode* fm) { - LoggerD("Enter"); + ScopeLogger(); if (!fmString.compare("r")) { *fm = FileMode::READ; return PlatformResult(ErrorCode::NO_ERROR); @@ -87,7 +87,7 @@ PlatformResult stringToFileMode(std::string fmString, FileMode* fm) { void getBasePathAndName(const std::string& filepath, std::string& out_basepath, std::string& out_name) { - LoggerD("Enter"); + ScopeLogger(); const size_t filepath_len = filepath.length(); size_t name_end_index = filepath_len; @@ -114,7 +114,7 @@ void getBasePathAndName(const std::string& filepath, std::string& out_basepath, } std::string removeDuplicatedSlashesFromPath(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); const size_t path_len = path.length(); std::string out; @@ -138,7 +138,7 @@ std::string removeDuplicatedSlashesFromPath(const std::string& path) { } bool isDirectoryPath(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); if (path.empty()) { return false; } @@ -148,7 +148,7 @@ bool isDirectoryPath(const std::string& path) { } std::string removeTrailingDirectorySlashFromPath(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); if (!isDirectoryPath(path)) { return path; } @@ -157,7 +157,7 @@ std::string removeTrailingDirectorySlashFromPath(const std::string& path) { } std::string stripBasePathFromPath(const std::string& fullpath) { - LoggerD("Enter"); + ScopeLogger(); const size_t location = fullpath.find_last_of("/\\"); if (std::string::npos == location) { return fullpath; @@ -176,7 +176,7 @@ static std::string errCRC = "CRC error"; static std::string errUnknown = "Unknown error"; const std::string& getArchiveErrorMessage(int errorCode) { - LoggerD("Enter"); + ScopeLogger(); /** * All errors are defined in minizip library in files: * zip.h and unzip.h @@ -207,7 +207,7 @@ const std::string& getArchiveErrorMessage(int errorCode) { } std::string getBasePathFromPath(const std::string& fullpath) { - LoggerD("Enter"); + ScopeLogger(); const std::string tmp_path = removeTrailingDirectorySlashFromPath(fullpath); const size_t location = tmp_path.find_last_of("/\\"); if (std::string::npos == location) { @@ -218,7 +218,7 @@ std::string getBasePathFromPath(const std::string& fullpath) { } std::string getArchiveLogMessage(const int errorCode, const std::string& hint) { - LoggerD("Enter"); + ScopeLogger(); std::stringstream ss; ss << "Failed " << hint << " : " << getArchiveErrorMessage(errorCode) << ", " << errorCode; return std::string(ss.str()); diff --git a/src/archive/filesystem_file.cc b/src/archive/filesystem_file.cc index 9356a919..7a3fc471 100644 --- a/src/archive/filesystem_file.cc +++ b/src/archive/filesystem_file.cc @@ -24,12 +24,12 @@ namespace filesystem { File::File(NodePtr node, const File::PermissionList& parentPermissions, const std::string& original_location) : m_node(node), m_parentPerms(parentPermissions) { - LoggerD("original_location is fullPath: %s", original_location.c_str()); + ScopeLogger("original_location is fullPath: %s", original_location.c_str()); m_original_fullpath = original_location; } File::~File() { - LoggerD("Enter"); + ScopeLogger(); } NodePtr File::getNode() const { diff --git a/src/archive/filesystem_node.cc b/src/archive/filesystem_node.cc index 7454b18f..b2908fd7 100644 --- a/src/archive/filesystem_node.cc +++ b/src/archive/filesystem_node.cc @@ -39,7 +39,7 @@ using namespace common; #define MAX_NODE_LENGTH 256 PlatformResult Node::checkPermission(const PathPtr& path, const std::string& mode, NodeType type, bool* granted) { - LoggerD("Enter"); + ScopeLogger(); *granted = false; switch (type) { @@ -109,7 +109,7 @@ PlatformResult Node::checkPermission(const PathPtr& path, const std::string& mod } PlatformResult Node::resolve(const PathPtr& path, NodePtr* node) { - LoggerD("Entered path:[%s]", path->getFullPath().c_str()); + ScopeLogger("path: %s", path->getFullPath().c_str()); struct stat info; struct stat syminfo; @@ -163,7 +163,7 @@ PathPtr Node::getPath() const { } PlatformResult Node::getChild(const PathPtr& path, NodePtr* node) { - LoggerD("Enter"); + ScopeLogger(); if (m_type != NT_DIRECTORY) { return LogAndCreateResult(ErrorCode::IO_ERR, "Not a directory."); } @@ -183,7 +183,7 @@ void Node::setPermissions(int perms) { } PlatformResult Node::getChildNames(Node::NameList* out_name_list) const { - LoggerD("Enter"); + ScopeLogger(); if (m_type != NT_DIRECTORY) { return LogAndCreateResult(ErrorCode::IO_ERR, "Node is not directory."); } @@ -221,7 +221,7 @@ PlatformResult Node::getChildNames(Node::NameList* out_name_list) const { } PlatformResult Node::getChildNodes(NodeList* out_node_list) const { - LoggerD("Enter"); + ScopeLogger(); if (m_type != NT_DIRECTORY) { SLoggerE("Path %s Perm %d", m_path->getFullPath().c_str(), m_perms); @@ -270,7 +270,7 @@ PlatformResult Node::getChildNodes(NodeList* out_node_list) const { } PlatformResult Node::createChild(const PathPtr& path, NodeType type, NodePtr* node, int options) { - LoggerD("Enter"); + ScopeLogger(); if (m_type != NT_DIRECTORY) { return LogAndCreateResult(ErrorCode::IO_ERR, "Parent node is not a directory."); } @@ -315,7 +315,7 @@ PlatformResult Node::createChild(const PathPtr& path, NodeType type, NodePtr* no } PlatformResult Node::remove(int options) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result(ErrorCode::NO_ERROR); switch (m_type) { case NT_FILE: @@ -331,7 +331,7 @@ PlatformResult Node::remove(int options) { } PlatformResult Node::getSize(unsigned long long* size) const { - LoggerD("Enter"); + ScopeLogger(); if (m_type == NT_DIRECTORY) { return LogAndCreateResult(ErrorCode::IO_ERR, "Getting size for directories is not supported."); } @@ -353,7 +353,7 @@ PlatformResult Node::getSize(unsigned long long* size) const { } PlatformResult Node::getCreated(std::time_t* time) const { - LoggerD("Enter"); + ScopeLogger(); struct stat info; PlatformResult result = stat(m_path, &info); if (result.error_code() != ErrorCode::NO_ERROR) { @@ -365,7 +365,7 @@ PlatformResult Node::getCreated(std::time_t* time) const { } PlatformResult Node::getModified(std::time_t* time) const { - LoggerD("Enter"); + ScopeLogger(); struct stat info; PlatformResult result = stat(m_path, &info); if (result.error_code() != ErrorCode::NO_ERROR) { @@ -377,7 +377,7 @@ PlatformResult Node::getModified(std::time_t* time) const { } PlatformResult Node::getParent(NodePtr* node) const { - LoggerD("Enter"); + ScopeLogger(); // LocationPaths roots = Manager::getInstance().getLocationPaths(); // for (LocationPaths::iterator it = roots.begin(); it != roots.end(); ++it) { @@ -394,7 +394,7 @@ PlatformResult Node::getParent(NodePtr* node) const { } PlatformResult Node::getMode(int* mode) const { - LoggerD("Enter"); + ScopeLogger(); struct stat info; PlatformResult result = stat(m_path, &info); @@ -432,7 +432,7 @@ PlatformResult Node::getMode(int* mode) const { } PlatformResult Node::exists(const PathPtr& path, bool* existed) { - LoggerD("Enter"); + ScopeLogger(); struct stat info; memset(&info, 0, sizeof(struct stat)); @@ -453,7 +453,7 @@ PlatformResult Node::exists(const PathPtr& path, bool* existed) { } PlatformResult Node::stat(const PathPtr& path, struct stat* out_info) { - LoggerD("Enter"); + ScopeLogger(); struct stat info; memset(&info, 0, sizeof(struct stat)); @@ -466,11 +466,11 @@ PlatformResult Node::stat(const PathPtr& path, struct stat* out_info) { } Node::Node(const PathPtr& path, NodeType type) : m_path(path), m_type(type), m_perms(PERM_NONE) { - LoggerD("Enter"); + ScopeLogger(); } PlatformResult Node::createAsFile(const PathPtr& path, NodePtr* node, int /* options */) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result = createAsFileInternal(path); if (result.error_code() == ErrorCode::NO_ERROR) { @@ -480,7 +480,7 @@ PlatformResult Node::createAsFile(const PathPtr& path, NodePtr* node, int /* opt } PlatformResult Node::createAsFileInternal(const PathPtr& path) { - LoggerD("Enter"); + ScopeLogger(); FILE* file = std::fopen(path->getFullPath().c_str(), "wb"); if (!file) { @@ -492,7 +492,7 @@ PlatformResult Node::createAsFileInternal(const PathPtr& path) { } PlatformResult Node::createAsDirectory(const PathPtr& path, NodePtr* node, int options) { - LoggerD("Enter"); + ScopeLogger(); // if (options & OPT_RECURSIVE) { // auto parts = Utils::getParts(path); @@ -508,7 +508,7 @@ PlatformResult Node::createAsDirectory(const PathPtr& path, NodePtr* node, int o } PlatformResult Node::createAsDirectoryInternal(const PathPtr& path) { - LoggerD("Enter"); + ScopeLogger(); if (mkdir(path->getFullPath().c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) { return LogAndCreateResult(ErrorCode::IO_ERR, "Platform node could not be created."); @@ -517,7 +517,7 @@ PlatformResult Node::createAsDirectoryInternal(const PathPtr& path) { } PlatformResult Node::removeAsFile(const PathPtr& path) { - LoggerD("Enter"); + ScopeLogger(); auto fullPath = path->getFullPath(); if (unlink(fullPath.c_str()) != 0) { @@ -528,7 +528,7 @@ PlatformResult Node::removeAsFile(const PathPtr& path) { } PlatformResult Node::removeAsDirectory(const PathPtr& path, bool recursive) { - LoggerD("Enter"); + ScopeLogger(); if (recursive) { DIR* dir = opendir(path->getFullPath().c_str()); @@ -574,7 +574,7 @@ PlatformResult Node::removeAsDirectory(const PathPtr& path, bool recursive) { } bool Node::isSubPath(std::string aDirPath, PathPtr aFilePath) { - LoggerD("Enter"); + ScopeLogger(); auto myPath = aDirPath; if (!myPath.empty() && myPath[myPath.length() - 1] != Path::getSeparator()) { myPath += Path::getSeparator(); diff --git a/src/archive/filesystem_path.cc b/src/archive/filesystem_path.cc index 8bf7ab4e..5f1fa81e 100644 --- a/src/archive/filesystem_path.cc +++ b/src/archive/filesystem_path.cc @@ -33,7 +33,7 @@ namespace filesystem { const Path::SeparatorType Path::m_pathSeparator = '/'; std::string Path::replaceVirtualRootPath(const char* path) { - LoggerD("Enter"); + ScopeLogger(); const char* old_path = "/opt/usr/media"; char replace_path[MAX_PATH_SIZE] = { @@ -51,7 +51,7 @@ std::string Path::replaceVirtualRootPath(const char* path) { } PathPtr Path::create(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); auto result = std::shared_ptr(new Path()); result->reset(replaceVirtualRootPath(path.c_str())); return result; @@ -96,10 +96,11 @@ PathPtr Path::clone() const { } Path::Path() { + ScopeLogger(); } void Path::reset(const std::string& str) { - LoggerD("Enter"); + ScopeLogger(); if (!isValid(str)) { LoggerD("Invalid string %s", str.c_str()); LoggerW("throw NotFoundException"); diff --git a/src/archive/un_zip.cc b/src/archive/un_zip.cc index de34b5f6..cf2260ab 100644 --- a/src/archive/un_zip.cc +++ b/src/archive/un_zip.cc @@ -44,12 +44,12 @@ UnZip::UnZip(const std::string& filename) m_unzip(NULL), m_default_buffer_size(1024 * 1024), m_is_open(false) { - LoggerD("Entered"); + ScopeLogger(); m_unzip = unzOpen(filename.c_str()); } UnZip::~UnZip() { - LoggerD("Enter"); + ScopeLogger(); for (auto& x : path_access_map) { LoggerD("Setting permission for path: %s [%d] ", x.first.c_str(), x.second); if (chmod(x.first.c_str(), x.second) == -1) { @@ -61,7 +61,7 @@ UnZip::~UnZip() { } PlatformResult UnZip::close() { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_open) { LoggerD("Unzip already closed - exiting"); return PlatformResult(ErrorCode::NO_ERROR); @@ -79,7 +79,7 @@ PlatformResult UnZip::close() { } PlatformResult UnZip::open(const std::string& filename, UnZipPtr* out_unzip) { - LoggerD("Entered"); + ScopeLogger(); UnZipPtr unzip = UnZipPtr(new UnZip(filename)); if (!unzip->m_unzip) { @@ -93,7 +93,7 @@ PlatformResult UnZip::open(const std::string& filename, UnZipPtr* out_unzip) { PlatformResult UnZip::listEntries(unsigned long* decompressedSize, ArchiveFileEntryPtrMapPtr* out_map) { - LoggerD("Enter"); + ScopeLogger(); if (!m_is_open) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to get list of files in zip archive"); } @@ -169,7 +169,7 @@ PlatformResult UnZip::listEntries(unsigned long* decompressedSize, PlatformResult UnZip::extractAllFilesTo(const std::string& extract_path, ExtractAllProgressCallback* callback) { - LoggerD("Enter"); + ScopeLogger(); if (!m_is_open) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to extract zip archive"); } @@ -224,7 +224,7 @@ struct ExtractDataHolder { }; PlatformResult UnZip::extractTo(ExtractEntryProgressCallback* callback) { - LoggerD("Enter"); + ScopeLogger(); if (!m_is_open) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Extract archive file entry failed"); } @@ -295,7 +295,7 @@ PlatformResult UnZip::extractTo(ExtractEntryProgressCallback* callback) { PlatformResult UnZip::extractItFunction(const std::string& file_name, unz_file_info& file_info, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); ExtractDataHolder* h = static_cast(user_data); if (!h) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not list content of zip archive", @@ -315,7 +315,7 @@ PlatformResult UnZip::IterateFilesInZip(unz_global_info& gi, const std::string& OperationCallbackData* callback, UnZip::IterateFunction itfunc, unsigned int& num_file_or_folder_matched, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); int err = unzGoToFirstFile(m_unzip); if (UNZ_OK != err) { LoggerW("%s", getArchiveLogMessage(err, "unzGoToFirstFile()").c_str()); @@ -378,7 +378,7 @@ PlatformResult UnZip::IterateFilesInZip(unz_global_info& gi, const std::string& PlatformResult UnZip::extractCurrentFile(const std::string& extract_path, const std::string& base_strip_path, BaseProgressCallback* callback) { - LoggerD("Entered"); + ScopeLogger(); if (callback->isCanceled()) { return LogAndCreateResult(ErrorCode::OPERATION_CANCELED_ERR, "Operation canceled"); @@ -400,7 +400,7 @@ struct ArchiveStatistics { PlatformResult generateArchiveStatistics(const std::string& file_name, unz_file_info& file_info, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); if (user_data) { ArchiveStatistics* astats = static_cast(user_data); astats->uncompressed_size += file_info.uncompressed_size; @@ -417,7 +417,7 @@ PlatformResult generateArchiveStatistics(const std::string& file_name, unz_file_ PlatformResult UnZip::updateCallbackWithArchiveStatistics(ExtractAllProgressCallback* callback, unz_global_info& out_global_info, const std::string& optional_filter) { - LoggerD("Enter"); + ScopeLogger(); int err = unzGetGlobalInfo(m_unzip, &out_global_info); if (UNZ_OK != err) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, diff --git a/src/archive/un_zip_extract_request.cc b/src/archive/un_zip_extract_request.cc index e3b7adb4..69964704 100644 --- a/src/archive/un_zip_extract_request.cc +++ b/src/archive/un_zip_extract_request.cc @@ -40,7 +40,7 @@ using namespace common; using common::tools::GetErrorString; FilePathStatus getPathStatus(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); if (path.empty()) { return FPS_NOT_EXIST; } @@ -60,7 +60,7 @@ FilePathStatus getPathStatus(const std::string& path) { void divideToPathAndName(const std::string& filepath, std::string& out_path, std::string& out_name) { - LoggerD("Enter"); + ScopeLogger(); size_t pos_last_dir = filepath.find_last_of("/\\"); if (pos_last_dir == std::string::npos) { out_path = ""; @@ -72,7 +72,7 @@ void divideToPathAndName(const std::string& filepath, std::string& out_path, } void createMissingDirectories(const std::string& path, bool check_first = true) { - LoggerD("Enter"); + ScopeLogger(); if (check_first) { const FilePathStatus path_status = getPathStatus(path); // LoggerD("[%s] status: %d", path.c_str(), path_status); @@ -103,7 +103,7 @@ void createMissingDirectories(const std::string& path, bool check_first = true) } void changeFileAccessAndModifyDate(const std::string& filepath, tm_unz tmu_date) { - LoggerD("Enter"); + ScopeLogger(); struct utimbuf ut; struct tm newdate; newdate.tm_sec = tmu_date.tm_sec; @@ -129,7 +129,7 @@ void changeFileAccessAndModifyDate(const std::string& filepath, tm_unz tmu_date) PlatformResult UnZipExtractRequest::execute(UnZip& owner, const std::string& extract_path, const std::string& base_strip_path, BaseProgressCallback* callback) { - LoggerD("Enter"); + ScopeLogger(); UnZipExtractRequest req(owner, extract_path, base_strip_path, callback); if (!req.m_callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Problem with callback functionality", @@ -156,12 +156,12 @@ UnZipExtractRequest::UnZipExtractRequest(UnZip& owner, const std::string& extrac m_new_dir_status(FPS_NOT_EXIST), m_is_directory_entry(false) { - LoggerD("Enter"); + ScopeLogger(); m_filename_inzip[0] = '\0'; } PlatformResult UnZipExtractRequest::run() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = getCurrentFileInfo(); if (result.error_code() != ErrorCode::NO_ERROR) { @@ -179,7 +179,7 @@ PlatformResult UnZipExtractRequest::run() { } UnZipExtractRequest::~UnZipExtractRequest() { - LoggerD("Enter"); + ScopeLogger(); if (m_output_file) { fclose(m_output_file); @@ -207,7 +207,7 @@ UnZipExtractRequest::~UnZipExtractRequest() { } PlatformResult UnZipExtractRequest::getCurrentFileInfo() { - LoggerD("Entered"); + ScopeLogger(); int err = unzGetCurrentFileInfo(m_owner.m_unzip, &m_file_info, m_filename_inzip, sizeof(m_filename_inzip), NULL, 0, NULL, 0); if (err != UNZ_OK) { @@ -270,7 +270,7 @@ PlatformResult UnZipExtractRequest::getCurrentFileInfo() { } PlatformResult UnZipExtractRequest::handleDirectoryEntry() { - LoggerD("Entered"); + ScopeLogger(); if (FPS_DIRECTORY != m_new_dir_status) { if (FPS_FILE == m_new_dir_status) { if (m_callback->getOverwrite()) { // Is a file & overwrite is set: @@ -312,7 +312,7 @@ PlatformResult UnZipExtractRequest::handleDirectoryEntry() { } PlatformResult UnZipExtractRequest::prepareOutputSubdirectory() { - LoggerD("Entered"); + ScopeLogger(); // This zip entry points to file - verify that parent directory in output dir exists if (FPS_DIRECTORY != m_new_dir_status) { if (FPS_FILE == m_new_dir_status) { @@ -362,7 +362,7 @@ PlatformResult UnZipExtractRequest::prepareOutputSubdirectory() { } PlatformResult UnZipExtractRequest::handleFileEntry() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = prepareOutputSubdirectory(); if (result.error_code() != ErrorCode::NO_ERROR) { diff --git a/src/archive/zip.cc b/src/archive/zip.cc index aefd6c9b..b2fb1b46 100644 --- a/src/archive/zip.cc +++ b/src/archive/zip.cc @@ -35,7 +35,7 @@ namespace archive { using namespace common; void Zip::generateZipFileInfo(const std::string& filename, zip_fileinfo& out_zi) { - LoggerD("Enter"); + ScopeLogger(); memset(&out_zi, 0, sizeof(zip_fileinfo)); @@ -67,7 +67,7 @@ void Zip::generateZipFileInfo(const std::string& filename, zip_fileinfo& out_zi) Zip::Zip(const std::string& filename, ZipOpenMode open_mode) : m_zipfile_name(filename), m_zip(NULL), m_default_buffer_size(1024 * 1024), m_is_open(false) { - LoggerD("Entered"); + ScopeLogger(); int append_mode = APPEND_STATUS_CREATE; if (ZOM_CREATEAFTER == open_mode) { @@ -81,13 +81,13 @@ Zip::Zip(const std::string& filename, ZipOpenMode open_mode) } Zip::~Zip() { - LoggerD("Enter"); + ScopeLogger(); close(); } PlatformResult Zip::close() { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_open) { LoggerD("Already closed - exiting."); return PlatformResult(ErrorCode::NO_ERROR); @@ -105,7 +105,7 @@ PlatformResult Zip::close() { } PlatformResult Zip::createNew(const std::string& filename, ZipPtr* out_zip) { - LoggerD("Entered"); + ScopeLogger(); ZipPtr zip = ZipPtr(new Zip(filename, ZOM_CREATE)); if (!zip->m_zip) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Opening/creating zip file failed", @@ -117,7 +117,7 @@ PlatformResult Zip::createNew(const std::string& filename, ZipPtr* out_zip) { } PlatformResult Zip::open(const std::string& filename, ZipPtr* out_zip) { - LoggerD("Entered"); + ScopeLogger(); ZipPtr zip = ZipPtr(new Zip(filename, ZOM_ADDINZIP)); if (!zip->m_zip) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Opening/creating zip file failed", @@ -129,7 +129,7 @@ PlatformResult Zip::open(const std::string& filename, ZipPtr* out_zip) { } PlatformResult Zip::addFile(AddProgressCallback*& callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not add file(-s) to archive", ("callback is NULL!")); diff --git a/src/archive/zip_add_request.cc b/src/archive/zip_add_request.cc index d376d7a1..d8cb38d9 100644 --- a/src/archive/zip_add_request.cc +++ b/src/archive/zip_add_request.cc @@ -37,11 +37,11 @@ ZipAddRequest::ZipAddRequest(Zip& owner, AddProgressCallback*& callback) m_bytes_compressed(0), m_compression_level(0), m_new_file_in_zip_opened(false) { - LoggerD("Enter"); + ScopeLogger(); } ZipAddRequest::~ZipAddRequest() { - LoggerD("Enter"); + ScopeLogger(); if (m_input_file) { fclose(m_input_file); m_input_file = NULL; @@ -59,13 +59,13 @@ ZipAddRequest::~ZipAddRequest() { } PlatformResult ZipAddRequest::execute(Zip& owner, AddProgressCallback*& callback) { - LoggerD("Enter"); + ScopeLogger(); ZipAddRequest req(owner, callback); return req.run(); } PlatformResult ZipAddRequest::run() { - LoggerD("Enter"); + ScopeLogger(); if (!m_callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Could not add file(-s) to archive", ("m_callback is NULL")); @@ -177,7 +177,7 @@ PlatformResult ZipAddRequest::run() { void ZipAddRequest::addNodeAndSubdirsToList(filesystem::NodePtr src_node, filesystem::NodeList& out_list_of_child_nodes) { - LoggerD("Enter"); + ScopeLogger(); out_list_of_child_nodes.push_back(src_node); if (filesystem::NT_DIRECTORY == src_node->getType()) { @@ -193,7 +193,7 @@ void ZipAddRequest::addNodeAndSubdirsToList(filesystem::NodePtr src_node, } PlatformResult ZipAddRequest::addEmptyDirectoryToZipArchive(std::string name_in_zip) { - LoggerD("Entered name_in_zip:%s", name_in_zip.c_str()); + ScopeLogger("name_in_zip: %s", name_in_zip.c_str()); if (name_in_zip.length() == 0) { LoggerW("Trying to create directory with empty name - \"\""); @@ -275,7 +275,7 @@ PlatformResult ZipAddRequest::addEmptyDirectoryToZipArchive(std::string name_in_ } PlatformResult ZipAddRequest::addToZipArchive(filesystem::NodePtr src_file_node) { - LoggerD("Enter"); + ScopeLogger(); const std::string name_in_zip = getNameInZipArchiveFor(src_file_node, m_callback->getFileEntry()->getStriped()); const std::string src_file_path = src_file_node->getPath()->getFullPath(); @@ -441,7 +441,7 @@ PlatformResult ZipAddRequest::addToZipArchive(filesystem::NodePtr src_file_node) } std::string removeDirCharsFromFront(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); for (size_t i = 0; i < path.length(); ++i) { const char& cur = path[i]; if (cur != '/' && cur != '\\') { @@ -453,7 +453,7 @@ std::string removeDirCharsFromFront(const std::string& path) { } std::string generateFullPathForZip(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); // Step 1: Remove / from begining const size_t path_len = path.length(); @@ -488,7 +488,7 @@ std::string generateFullPathForZip(const std::string& path) { } std::string ZipAddRequest::getNameInZipArchiveFor(filesystem::NodePtr node, bool strip) { - LoggerD("Enter"); + ScopeLogger(); const std::string node_full_path = node->getPath()->getFullPath(); std::string cut_path; diff --git a/src/badge/badge_instance.cc b/src/badge/badge_instance.cc index bcdcb13e..b0ee45bd 100644 --- a/src/badge/badge_instance.cc +++ b/src/badge/badge_instance.cc @@ -32,7 +32,7 @@ using namespace common; using namespace extension::badge; BadgeInstance::BadgeInstance() : manager_(*this) { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -45,11 +45,11 @@ BadgeInstance::BadgeInstance() : manager_(*this) { } BadgeInstance::~BadgeInstance() { - LoggerD("Enter"); + ScopeLogger(); } void BadgeInstance::BadgeManagerSetBadgeCount(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); std::string app_id = common::FromJson(args.get(), "appId"); @@ -64,7 +64,7 @@ void BadgeInstance::BadgeManagerSetBadgeCount(const JsonValue& args, JsonObject& } void BadgeInstance::BadgeManagerGetBadgeCount(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); std::string app_id = common::FromJson(args.get(), "appId"); @@ -79,7 +79,7 @@ void BadgeInstance::BadgeManagerGetBadgeCount(const JsonValue& args, JsonObject& } void BadgeInstance::BadgeManagerAddChangeListener(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); PlatformResult status = manager_.AddChangeListener(args.get()); @@ -92,7 +92,7 @@ void BadgeInstance::BadgeManagerAddChangeListener(const JsonValue& args, JsonObj } void BadgeInstance::BadgeManagerRemoveChangeListener(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); PlatformResult status = manager_.RemoveChangeListener(args.get()); diff --git a/src/badge/badge_manager.cc b/src/badge/badge_manager.cc index 54c57b09..fab178e6 100644 --- a/src/badge/badge_manager.cc +++ b/src/badge/badge_manager.cc @@ -39,7 +39,7 @@ BadgeManager::BadgeManager(BadgeInstance &instance) } BadgeManager::~BadgeManager() { - LoggerD("Enter"); + ScopeLogger(); if (is_cb_registered_) { if (!watched_applications_.empty()) watched_applications_.clear(); int ret = badge_unregister_changed_cb(badge_changed_cb); @@ -51,7 +51,7 @@ BadgeManager::~BadgeManager() { } PlatformResult BadgeManager::SetBadgeCount(const std::string &app_id, unsigned int count) { - LoggerD("Enter"); + ScopeLogger(); SLoggerD("app_id : %s ", app_id.c_str()); if (!IsAppInstalled(app_id)) { @@ -109,7 +109,7 @@ PlatformResult BadgeManager::SetBadgeCount(const std::string &app_id, unsigned i } PlatformResult BadgeManager::GetBadgeCount(const std::string &app_id, unsigned int *count) { - LoggerD("Enter"); + ScopeLogger(); SLoggerD("app_id : %s ", app_id.c_str()); Assert(count); @@ -158,7 +158,7 @@ PlatformResult BadgeManager::GetBadgeCount(const std::string &app_id, unsigned i } PlatformResult BadgeManager::AddChangeListener(const JsonObject &obj) { - LoggerD("Enter"); + ScopeLogger(); auto &items = FromJson(obj, "appIdList"); for (auto item : items) { watched_applications_.insert(common::JsonCast(item)); @@ -177,7 +177,7 @@ PlatformResult BadgeManager::AddChangeListener(const JsonObject &obj) { } PlatformResult BadgeManager::RemoveChangeListener(const JsonObject &obj) { - LoggerD("Enter"); + ScopeLogger(); auto &items = FromJson(obj, "appIdList"); for (auto item : items) { watched_applications_.erase(common::JsonCast(item)); @@ -196,7 +196,7 @@ PlatformResult BadgeManager::RemoveChangeListener(const JsonObject &obj) { void BadgeManager::badge_changed_cb(unsigned int action, const char *pkgname, unsigned int count, void *user_data) { - LoggerD("Enter"); + ScopeLogger(); BadgeManager *that = static_cast(user_data); if (action == BADGE_ACTION_UPDATE && that->watched_applications_.find(pkgname) != that->watched_applications_.end()) { @@ -211,7 +211,7 @@ void BadgeManager::badge_changed_cb(unsigned int action, const char *pkgname, un } bool BadgeManager::IsAppInstalled(const std::string &app_id) { - LoggerD("Enter"); + ScopeLogger(); if (app_id.empty()) { return false; diff --git a/src/bluetooth/bluetooth_adapter.cc b/src/bluetooth/bluetooth_adapter.cc index f7a00072..9fbf87ed 100644 --- a/src/bluetooth/bluetooth_adapter.cc +++ b/src/bluetooth/bluetooth_adapter.cc @@ -77,6 +77,7 @@ const unsigned short kTimeout = 180; } static bool IsValidAddress(const std::string& address) { + ScopeLogger(); static pcrecpp::RE re("(([0-9a-zA-Z]+):)+([0-9a-zA-Z]+)"); static std::string compare_address = "00:12:47:08:9A:A6"; @@ -92,6 +93,7 @@ static bool IsValidAddress(const std::string& address) { } static bool IsValidUUID(const std::string& uuid) { + ScopeLogger(); static pcrecpp::RE re("(([0-9a-zA-Z]+)-)+([0-9a-zA-Z]+)"); static std::string compare_uuid = "00001101-0000-1000-8000-00805F9B34FB"; @@ -109,7 +111,7 @@ static bool IsValidUUID(const std::string& uuid) { } void BluetoothAdapter::StateChangedCB(int result, bt_adapter_state_e state, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothAdapter* adapter = static_cast(user_data); if (!adapter) { @@ -165,7 +167,7 @@ void BluetoothAdapter::StateChangedCB(int result, bt_adapter_state_e state, void } void BluetoothAdapter::NameChangedCB(char* name, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothAdapter* adapter = static_cast(user_data); if (!adapter) { @@ -191,7 +193,7 @@ void BluetoothAdapter::NameChangedCB(char* name, void* user_data) { void BluetoothAdapter::VisibilityChangedCB(int result, bt_adapter_visibility_mode_e mode, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothAdapter* adapter = static_cast(user_data); if (!adapter) { @@ -228,7 +230,7 @@ void BluetoothAdapter::VisibilityChangedCB(int result, bt_adapter_visibility_mod } static bool ForeachBondedDevicesCB(bt_device_info_s* device_info, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); if (nullptr == user_data) { LoggerD("user data is NULL."); return false; @@ -260,7 +262,7 @@ void BluetoothAdapter::DiscoveryStateChangedCB(int result, bt_adapter_device_discovery_state_e discovery_state, bt_adapter_device_discovery_info_s* discovery_info, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothAdapter* adapter = static_cast(user_data); if (!adapter) { @@ -360,7 +362,7 @@ BluetoothAdapter::BluetoothAdapter(BluetoothInstance& instance) requested_powered_(), requested_visibility_(), instance_(instance) { - LoggerD("Entered"); + ScopeLogger(); if (BT_ERROR_NONE == bt_initialize()) { LoggerD("Bluetooth service is initialized."); is_initialized_ = true; @@ -390,6 +392,7 @@ BluetoothAdapter::BluetoothAdapter(BluetoothInstance& instance) } BluetoothAdapter::~BluetoothAdapter() { + ScopeLogger(); bt_socket_unset_data_received_cb(); bt_socket_unset_connection_state_changed_cb(); @@ -416,6 +419,7 @@ BluetoothAdapter::~BluetoothAdapter() { } std::string BluetoothAdapter::get_name() const { + ScopeLogger(); char* name = nullptr; std::string str_name = ""; if (BT_ERROR_NONE == bt_adapter_get_name(&name)) { @@ -429,6 +433,7 @@ std::string BluetoothAdapter::get_name() const { } bool BluetoothAdapter::get_visible() const { + ScopeLogger(); bt_adapter_visibility_mode_e mode; if (BT_ERROR_NONE == bt_adapter_get_visibility(&mode, NULL)) { @@ -455,7 +460,7 @@ bool BluetoothAdapter::is_initialized() const { } void BluetoothAdapter::SetName(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -516,7 +521,7 @@ void BluetoothAdapter::SetName(const picojson::value& data, picojson::object& ou } void BluetoothAdapter::SetPowered(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: setPowered() is deprecated and will be removed from next release. " "Let the user turn on/off Bluetooth through the Settings application instead."); @@ -635,7 +640,7 @@ void BluetoothAdapter::SetPowered(const picojson::value& data, picojson::object& } void BluetoothAdapter::SetVisible(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothManager, &out); @@ -789,7 +794,7 @@ void BluetoothAdapter::SetVisible(const picojson::value& data, picojson::object& } void BluetoothAdapter::DiscoverDevices(const picojson::value& /* data */, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothGap, &out); @@ -826,7 +831,7 @@ void BluetoothAdapter::DiscoverDevices(const picojson::value& /* data */, picojs } void BluetoothAdapter::StopDiscovery(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothGap, &out); @@ -878,7 +883,7 @@ void BluetoothAdapter::StopDiscovery(const picojson::value& data, picojson::obje } void BluetoothAdapter::GetKnownDevices(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothGap, &out); @@ -933,7 +938,7 @@ void BluetoothAdapter::GetKnownDevices(const picojson::value& data, picojson::ob } void BluetoothAdapter::GetDevice(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothGap, &out); @@ -944,6 +949,7 @@ void BluetoothAdapter::GetDevice(const picojson::value& data, picojson::object& const auto& address = FromJson(args, "address"); auto get_device = [this, address](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function"); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); if (!IsValidAddress(address)) { ret = LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Wrong address"); @@ -995,6 +1001,7 @@ void BluetoothAdapter::GetDevice(const picojson::value& data, picojson::object& auto get_device_response = [this, callback_handle](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function"); instance_.SyncResponse(callback_handle, response); }; @@ -1009,6 +1016,7 @@ class BondingHandler { public: BondingHandler(BluetoothInstance& instance, double callback_handle, const std::string& address) : instance_(instance), callback_handle_(callback_handle), address_(address) { + ScopeLogger(); } void set_address(const std::string& address) { @@ -1020,7 +1028,7 @@ class BondingHandler { } void Invoke(const PlatformResult& result, const std::shared_ptr& response) { - LoggerD("Entered"); + ScopeLogger(); if (result.IsError()) { LogAndReportError(result, &response->get()); @@ -1038,7 +1046,7 @@ class BondingHandler { }; void BluetoothAdapter::CreateBonding(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothGap, &out); @@ -1049,6 +1057,7 @@ void BluetoothAdapter::CreateBonding(const picojson::value& data, picojson::obje const auto& address = FromJson(args, "address"); auto create_bonding = [address, callback_handle, this]() -> void { + ScopeLogger("Entered into asynchronous function, create_bonding"); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); if (!IsValidAddress(address)) { result = LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Wrong address", @@ -1062,7 +1071,7 @@ void BluetoothAdapter::CreateBonding(const picojson::value& data, picojson::obje if (result.IsSuccess() && this->get_powered()) { auto bond_create_callback = [](int callback_result, bt_device_info_s* device_info, void* user_data) { - LoggerD("bond_create_callback"); + ScopeLogger("Entered into asynchronous function, bond_create_callback"); BondingHandler* handler = static_cast(user_data); if (!handler) { @@ -1154,7 +1163,7 @@ void BluetoothAdapter::CreateBonding(const picojson::value& data, picojson::obje } void BluetoothAdapter::DestroyBonding(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothGap, &out); @@ -1165,6 +1174,7 @@ void BluetoothAdapter::DestroyBonding(const picojson::value& data, picojson::obj const auto& address = FromJson(args, "address"); auto destroy_bonding = [address, callback_handle, this]() -> void { + ScopeLogger("Entered into asynchronous function, destroy_bonding"); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); if (!IsValidAddress(address)) { result = LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Wrong address", @@ -1265,7 +1275,7 @@ void BluetoothAdapter::DestroyBonding(const picojson::value& data, picojson::obj void BluetoothAdapter::RegisterRFCOMMServiceByUUID(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothSpp, &out); @@ -1277,6 +1287,7 @@ void BluetoothAdapter::RegisterRFCOMMServiceByUUID(const picojson::value& data, const auto& name = FromJson(args, "name"); auto rfcomm = [this, uuid, name](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, rfcomm"); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); if (!this->is_initialized()) { result = LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Bluetooth service is not initialized."); @@ -1353,6 +1364,7 @@ void BluetoothAdapter::RegisterRFCOMMServiceByUUID(const picojson::value& data, auto rfcomm_response = [this, callback_handle](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, rfcomm_response"); instance_.SyncResponse(callback_handle, response); }; @@ -1364,7 +1376,7 @@ void BluetoothAdapter::RegisterRFCOMMServiceByUUID(const picojson::value& data, } void BluetoothAdapter::UnregisterUUID(const std::string& uuid, int callback_handle) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); if (!IsValidUUID(uuid)) { @@ -1398,7 +1410,7 @@ void BluetoothAdapter::UnregisterUUID(const std::string& uuid, int callback_hand void BluetoothAdapter::GetBluetoothProfileHandler(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& args = util::GetArguments(data); auto profile = FromJson(args, "profileType"); @@ -1430,13 +1442,13 @@ void BluetoothAdapter::GetBluetoothProfileHandler(const picojson::value& data, } void BluetoothAdapter::GetName(const picojson::value& /* data */, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ReportSuccess(picojson::value(get_name()), out); } void BluetoothAdapter::GetAddress(const picojson::value& /* data */, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); if (!is_initialized_) { LogAndReportError( @@ -1457,20 +1469,20 @@ void BluetoothAdapter::GetAddress(const picojson::value& /* data */, picojson::o } void BluetoothAdapter::GetPowered(const picojson::value& /* data */, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ReportSuccess(picojson::value(is_powered_), out); } void BluetoothAdapter::GetVisible(const picojson::value& /* data */, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ReportSuccess(picojson::value(get_visible()), out); } void BluetoothAdapter::OnSocketConnected(int result, bt_socket_connection_state_e state, bt_socket_connection_s* connection, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothAdapter* object = static_cast(user_data); @@ -1578,7 +1590,7 @@ void BluetoothAdapter::OnSocketConnected(int result, bt_socket_connection_state_ } void BluetoothAdapter::OnSocketReceivedData(bt_socket_received_data_s* data, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothAdapter* object = static_cast(user_data); @@ -1608,7 +1620,7 @@ void BluetoothAdapter::OnSocketReceivedData(bt_socket_received_data_s* data, voi void BluetoothAdapter::ConnectToServiceByUUID(const std::string& address, const std::string& uuid, double callback_handle) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); @@ -1661,6 +1673,7 @@ void BluetoothAdapter::ConnectToServiceByUUID(const std::string& address, const } void BluetoothAdapter::InvokeSocketEvent(int id, const char* event) { + ScopeLogger(); picojson::value value = picojson::value(picojson::object()); picojson::object& value_obj = value.get(); value_obj.insert(std::make_pair("id", picojson::value(std::to_string(id)))); @@ -1669,14 +1682,17 @@ void BluetoothAdapter::InvokeSocketEvent(int id, const char* event) { } void BluetoothAdapter::InvokeSocketOnMessageEvent(int id) { + ScopeLogger(); InvokeSocketEvent(id, "onmessage"); } void BluetoothAdapter::InvokeSocketOnCloseEvent(int id) { + ScopeLogger(); InvokeSocketEvent(id, "onclose"); } void BluetoothAdapter::RemoveSocket(int socket) { + ScopeLogger(); const auto data_it = socket_data_.find(socket); if (data_it != socket_data_.end()) { @@ -1698,7 +1714,7 @@ void BluetoothAdapter::RemoveSocket(int socket) { } void BluetoothAdapter::StoreSocketData(bt_socket_received_data_s* data) { - LoggerD("Entered"); + ScopeLogger(); auto& data_store = socket_data_[data->socket_fd]; @@ -1708,13 +1724,13 @@ void BluetoothAdapter::StoreSocketData(bt_socket_received_data_s* data) { } const std::list& BluetoothAdapter::ReadSocketData(int socket) { - LoggerD("Entered"); + ScopeLogger(); return socket_data_[socket]; } void BluetoothAdapter::ClearSocketData(int socket) { - LoggerD("Entered"); + ScopeLogger(); const auto data_it = socket_data_.find(socket); @@ -1724,7 +1740,7 @@ void BluetoothAdapter::ClearSocketData(int socket) { } void BluetoothAdapter::IsServiceConnected(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& args = util::GetArguments(data); const auto& uuid = FromJson(args, "uuid"); diff --git a/src/bluetooth/bluetooth_class.cc b/src/bluetooth/bluetooth_class.cc index 976c1516..4a56131c 100644 --- a/src/bluetooth/bluetooth_class.cc +++ b/src/bluetooth/bluetooth_class.cc @@ -120,7 +120,7 @@ std::map g_service_enum_map = { {BT_MAJOR_SERVICE_CLASS_INFORMATION, 0x0400}}; unsigned long BluetoothClass::GetMajorValue(bt_major_device_class_e major) { - LoggerD("Enter"); + ScopeLogger(); auto iter = g_major_enum_map.find(major); if (iter != g_major_enum_map.end()) { return iter->second; @@ -130,7 +130,7 @@ unsigned long BluetoothClass::GetMajorValue(bt_major_device_class_e major) { } unsigned long BluetoothClass::GetMinorValue(bt_minor_device_class_e minor) { - LoggerD("Enter"); + ScopeLogger(); auto iter = g_minor_enum_map.find(minor); if (iter != g_minor_enum_map.end()) { return iter->second; @@ -140,7 +140,7 @@ unsigned long BluetoothClass::GetMinorValue(bt_minor_device_class_e minor) { } std::vector BluetoothClass::getServiceValues(int serviceMask) { - LoggerD("Enter"); + ScopeLogger(); std::vector ret; for (auto iter = g_service_enum_map.begin(); iter != g_service_enum_map.end(); iter++) { if (iter->first & serviceMask) { diff --git a/src/bluetooth/bluetooth_device.cc b/src/bluetooth/bluetooth_device.cc index 0f82b456..b686530f 100644 --- a/src/bluetooth/bluetooth_device.cc +++ b/src/bluetooth/bluetooth_device.cc @@ -47,7 +47,7 @@ const std::string kDeviceIsConnected = "isConnected"; } static void ToJsonFromBTClass(bt_class_s bluetooth_class, picojson::object* device) { - LoggerD("Entered"); + ScopeLogger(); picojson::object& bt = device->insert(std::make_pair(kDeviceClass, picojson::value(picojson::object()))) @@ -73,7 +73,7 @@ static void ToJsonFromBTClass(bt_class_s bluetooth_class, picojson::object* devi } static void ToJsonFromUUID(char** service_uuid, int service_count, picojson::object* device) { - LoggerD("Entered"); + ScopeLogger(); picojson::array& array = device->insert(std::make_pair(kDeviceUuids, picojson::value(picojson::array()))) @@ -85,10 +85,11 @@ static void ToJsonFromUUID(char** service_uuid, int service_count, picojson::obj } BluetoothDevice::BluetoothDevice(BluetoothAdapter& adapter) : adapter_(adapter) { + ScopeLogger(); } void BluetoothDevice::ToJson(bt_device_info_s* info, picojson::object* device) { - LoggerD("Entered"); + ScopeLogger(); device->insert(std::make_pair(kDeviceName, picojson::value(std::string(info->remote_name)))); device->insert( std::make_pair(kDeviceAddress, picojson::value(std::string(info->remote_address)))); @@ -98,7 +99,7 @@ void BluetoothDevice::ToJson(bt_device_info_s* info, picojson::object* device) { } void BluetoothDevice::ToJson(bt_adapter_device_discovery_info_s* info, picojson::object* device) { - LoggerD("Entered"); + ScopeLogger(); device->insert(std::make_pair(kDeviceName, picojson::value(info->remote_name))); device->insert(std::make_pair(kDeviceAddress, picojson::value(info->remote_address))); @@ -108,7 +109,7 @@ void BluetoothDevice::ToJson(bt_adapter_device_discovery_info_s* info, picojson: } void BluetoothDevice::ConnectToServiceByUUID(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothSpp, &out); @@ -123,7 +124,7 @@ void BluetoothDevice::ConnectToServiceByUUID(const picojson::value& data, picojs } void BluetoothDevice::GetBoolValue(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& args = util::GetArguments(data); const auto& address = FromJson(args, "address"); diff --git a/src/bluetooth/bluetooth_gatt_service.cc b/src/bluetooth/bluetooth_gatt_service.cc index eaa7894f..14f4bc70 100644 --- a/src/bluetooth/bluetooth_gatt_service.cc +++ b/src/bluetooth/bluetooth_gatt_service.cc @@ -59,11 +59,11 @@ bool IsProperty(int propertyBits, bt_gatt_property_e property) { } BluetoothGATTService::BluetoothGATTService(BluetoothInstance& instance) : instance_(instance) { - LoggerD("Entered"); + ScopeLogger(); } BluetoothGATTService::~BluetoothGATTService() { - LoggerD("Entered"); + ScopeLogger(); for (auto it : gatt_characteristic_) { // unregister callback, ignore errors @@ -82,7 +82,7 @@ bool BluetoothGATTService::IsStillConnected(const std::string& address) { } bt_gatt_client_h BluetoothGATTService::GetGattClient(const std::string& address) { - LoggerD("Entered"); + ScopeLogger(); bt_gatt_client_h client = nullptr; @@ -105,6 +105,7 @@ bt_gatt_client_h BluetoothGATTService::GetGattClient(const std::string& address) // this method should be used to inform this object that some device was disconnected void BluetoothGATTService::TryDestroyClient(const std::string& address) { + ScopeLogger(); auto it = gatt_clients_.find(address); if (gatt_clients_.end() != it) { LoggerD("destroying client for address: %s", it->first.c_str()); @@ -118,7 +119,7 @@ void BluetoothGATTService::TryDestroyClient(const std::string& address) { PlatformResult BluetoothGATTService::GetSpecifiedGATTService(const std::string& address, const std::string& uuid, picojson::object* result) { - LoggerD("Entered"); + ScopeLogger(); bt_gatt_client_h client = GetGattClient(address); @@ -158,7 +159,7 @@ PlatformResult BluetoothGATTService::GetSpecifiedGATTService(const std::string& } void BluetoothGATTService::GetServices(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); bt_gatt_h handle = (bt_gatt_h) static_cast(args.get("handle").get()); const std::string& address = args.get("address").get(); @@ -174,7 +175,7 @@ void BluetoothGATTService::GetServices(const picojson::value& args, picojson::ob PlatformResult BluetoothGATTService::GetServicesHelper(bt_gatt_h handle, const std::string& address, picojson::array* array) { - LoggerD("Entered"); + ScopeLogger(); if (!IsStillConnected(address)) { return LogAndCreateResult(ErrorCode::INVALID_STATE_ERR, "Device is not connected", @@ -184,7 +185,9 @@ PlatformResult BluetoothGATTService::GetServicesHelper(bt_gatt_h handle, const s int ret = bt_gatt_service_foreach_included_services( handle, [](int total, int index, bt_gatt_h gatt_handle, void* data) { - LoggerD("Enter"); + ScopeLogger( + "Entered into asynchronous function, argument in " + "bt_gatt_service_foreach_included_services"); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -213,7 +216,7 @@ PlatformResult BluetoothGATTService::GetServicesHelper(bt_gatt_h handle, const s } void BluetoothGATTService::GetCharacteristics(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); bt_gatt_h handle = (bt_gatt_h) static_cast(args.get("handle").get()); const std::string& uuid = args.get("uuid").get(); @@ -232,7 +235,7 @@ PlatformResult BluetoothGATTService::GetCharacteristicsHelper(bt_gatt_h handle, const std::string& address, const std::string& uuid, picojson::array* array) { - LoggerD("Entered"); + ScopeLogger(); if (!IsStillConnected(address)) { return LogAndCreateResult(ErrorCode::INVALID_STATE_ERR, "Device is not connected", @@ -250,7 +253,9 @@ PlatformResult BluetoothGATTService::GetCharacteristicsHelper(bt_gatt_h handle, int ret = bt_gatt_service_foreach_characteristics( handle, [](int total, int index, bt_gatt_h gatt_handle, void* data) { - LoggerD("Enter"); + ScopeLogger( + "Entered into asynchronous function, bt_gatt_service_foreach_characteristics's " + "argument"); Data* user_data = static_cast(data); picojson::array* array = user_data->array; PlatformResult* platform_result = user_data->platform_res; @@ -268,7 +273,7 @@ PlatformResult BluetoothGATTService::GetCharacteristicsHelper(bt_gatt_h handle, int ret = bt_gatt_characteristic_foreach_descriptors( gatt_handle, [](int total, int index, bt_gatt_h desc_handle, void* data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array& desc_array = *(static_cast(data)); picojson::value desc = picojson::value(picojson::object()); @@ -328,7 +333,7 @@ PlatformResult BluetoothGATTService::GetCharacteristicsHelper(bt_gatt_h handle, } void BluetoothGATTService::ReadValue(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -349,6 +354,7 @@ void BluetoothGATTService::ReadValue(const picojson::value& args, picojson::obje bt_gatt_h handle = (bt_gatt_h) static_cast(args.get("handle").get()); auto read_value = [](int result, bt_gatt_h handle, void* user_data) -> void { + ScopeLogger("Entered into asynchronous function, read_value"); Data* data = static_cast(user_data); double callback_handle = data->callback_handle; BluetoothGATTService* service = data->service; @@ -401,7 +407,7 @@ void BluetoothGATTService::ReadValue(const picojson::value& args, picojson::obje } void BluetoothGATTService::WriteValue(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -429,6 +435,7 @@ void BluetoothGATTService::WriteValue(const picojson::value& args, picojson::obj bt_gatt_h handle = (bt_gatt_h) static_cast(args.get("handle").get()); auto write_value = [](int result, bt_gatt_h handle, void* user_data) -> void { + ScopeLogger("Entered into asynchronous function, write_value"); Data* data = static_cast(user_data); double callback_handle = data->callback_handle; BluetoothGATTService* service = data->service; @@ -479,7 +486,7 @@ void BluetoothGATTService::WriteValue(const picojson::value& args, picojson::obj void BluetoothGATTService::AddValueChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& address = args.get("address").get(); if (!IsStillConnected(address)) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Device is not connected"), &out, @@ -503,7 +510,7 @@ void BluetoothGATTService::AddValueChangeListener(const picojson::value& args, void BluetoothGATTService::RemoveValueChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& address = args.get("address").get(); if (!IsStillConnected(address)) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Device is not connected"), &out, @@ -530,7 +537,7 @@ void BluetoothGATTService::RemoveValueChangeListener(const picojson::value& args common::PlatformResult BluetoothGATTService::GetServiceAllUuids(const std::string& address, picojson::array* array) { - LoggerD("Entered"); + ScopeLogger(); bt_gatt_client_h client = GetGattClient(address); @@ -539,7 +546,8 @@ common::PlatformResult BluetoothGATTService::GetServiceAllUuids(const std::strin } auto foreach_callback = [](int total, int index, bt_gatt_h gatt_handle, void* user_data) -> bool { - LoggerD("Entered foreach_callback, total: %d, index: %d", total, index); + ScopeLogger("Entered into asynchronous function, foreach_callback, total: %d, index: %d", total, + index); char* uuid = nullptr; int ret = bt_gatt_get_uuid(gatt_handle, &uuid); @@ -569,8 +577,8 @@ common::PlatformResult BluetoothGATTService::GetServiceAllUuids(const std::strin void BluetoothGATTService::OnCharacteristicValueChanged(bt_gatt_h characteristic, char* value, int length, void* user_data) { - LoggerD("Entered, characteristic: [%p], len: [%d], user_data: [%p]", characteristic, length, - user_data); + ScopeLogger("characteristic: [%p], len: [%d], user_data: [%p]", characteristic, length, + user_data); auto service = static_cast(user_data); diff --git a/src/bluetooth/bluetooth_health_application.cc b/src/bluetooth/bluetooth_health_application.cc index 7d347f7c..7b58724b 100644 --- a/src/bluetooth/bluetooth_health_application.cc +++ b/src/bluetooth/bluetooth_health_application.cc @@ -38,10 +38,11 @@ using namespace common; BluetoothHealthApplication::BluetoothHealthApplication(BluetoothHealthProfileHandler& handler) : handler_(handler) { + ScopeLogger(); } void BluetoothHealthApplication::Unregister(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothHealth, &out); @@ -56,6 +57,7 @@ void BluetoothHealthApplication::Unregister(const picojson::value& data, picojso void BluetoothHealthApplication::ToJson(short data_type, const std::string& name, const char* id, picojson::object* out) { + ScopeLogger(); out->insert(std::make_pair(kDataType, picojson::value(static_cast(data_type)))); out->insert(std::make_pair(kName, picojson::value(name))); out->insert(std::make_pair(kId, picojson::value(id))); diff --git a/src/bluetooth/bluetooth_health_channel.cc b/src/bluetooth/bluetooth_health_channel.cc index da7f6f68..8d192791 100644 --- a/src/bluetooth/bluetooth_health_channel.cc +++ b/src/bluetooth/bluetooth_health_channel.cc @@ -42,7 +42,7 @@ const std::string kId = "_id"; } // namespace void BluetoothHealthChannel::Close(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothHealth, &out); @@ -63,7 +63,7 @@ void BluetoothHealthChannel::Close(const picojson::value& data, picojson::object } void BluetoothHealthChannel::SendData(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothHealth, &out); @@ -92,7 +92,7 @@ void BluetoothHealthChannel::SendData(const picojson::value& data, picojson::obj void BluetoothHealthChannel::ToJson(unsigned int channel, bt_hdp_channel_type_e type, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); const char* type_str = "UNKNOWN"; switch (type) { @@ -117,7 +117,7 @@ void BluetoothHealthChannel::ToJson(unsigned int channel, bt_hdp_channel_type_e void BluetoothHealthChannel::ToJson(unsigned int channel, bt_hdp_channel_type_e type, bt_device_info_s* device_info, const char* app_id, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); ToJson(channel, type, out); auto& device = out->insert(std::make_pair(kPeer, picojson::value(picojson::object()))) .first->second.get(); diff --git a/src/bluetooth/bluetooth_health_profile_handler.cc b/src/bluetooth/bluetooth_health_profile_handler.cc index 7581eefd..2aeacb58 100644 --- a/src/bluetooth/bluetooth_health_profile_handler.cc +++ b/src/bluetooth/bluetooth_health_profile_handler.cc @@ -48,7 +48,7 @@ const std::string kChangeCallback = "BluetoothHealthChannelChangeCallback"; BluetoothHealthProfileHandler::BluetoothHealthProfileHandler(BluetoothInstance& instance) : instance_(instance) { // initialize listeners - LoggerD("Entered"); + ScopeLogger(); if (BT_ERROR_NONE != bt_hdp_set_connection_state_changed_cb(OnConnected, OnDisconnected, this)) { LoggerE("bt_hdp_set_connection_state_changed_cb() failed"); } @@ -59,7 +59,7 @@ BluetoothHealthProfileHandler::BluetoothHealthProfileHandler(BluetoothInstance& } BluetoothHealthProfileHandler::~BluetoothHealthProfileHandler() { - LoggerD("Entered"); + ScopeLogger(); bt_hdp_unset_connection_state_changed_cb(); bt_hdp_unset_data_received_cb(); @@ -71,7 +71,7 @@ BluetoothHealthProfileHandler::~BluetoothHealthProfileHandler() { void BluetoothHealthProfileHandler::OnConnected(int result, const char* remote_address, const char* app_id, bt_hdp_channel_type_e type, unsigned int channel, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothHealthProfileHandler* object = static_cast(user_data); @@ -162,7 +162,7 @@ void BluetoothHealthProfileHandler::OnConnected(int result, const char* remote_a void BluetoothHealthProfileHandler::OnDisconnected(int result, const char* /* remote_address */, unsigned int channel, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothHealthProfileHandler* object = static_cast(user_data); @@ -185,7 +185,7 @@ void BluetoothHealthProfileHandler::OnDisconnected(int result, const char* /* re void BluetoothHealthProfileHandler::OnDataReceived(unsigned int channel, const char* data, unsigned int size, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); BluetoothHealthProfileHandler* object = static_cast(user_data); @@ -216,7 +216,7 @@ void BluetoothHealthProfileHandler::OnDataReceived(unsigned int channel, const c void BluetoothHealthProfileHandler::RegisterSinkApp(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothHealth, &out); @@ -229,7 +229,7 @@ void BluetoothHealthProfileHandler::RegisterSinkApp(const picojson::value& data, auto register_app = [data_type, name, this](const std::shared_ptr& response) -> void { - LoggerD("Entered"); + ScopeLogger(); PlatformResult platform_result = PlatformResult(ErrorCode::NO_ERROR); char* app_id = nullptr; @@ -266,6 +266,7 @@ void BluetoothHealthProfileHandler::RegisterSinkApp(const picojson::value& data, auto register_app_response = [this, callback_handle](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, register_app_response"); instance_.SyncResponse(callback_handle, response); }; @@ -278,7 +279,7 @@ void BluetoothHealthProfileHandler::RegisterSinkApp(const picojson::value& data, void BluetoothHealthProfileHandler::ConnectToSource(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothHealth, &out); @@ -332,10 +333,10 @@ void BluetoothHealthProfileHandler::ConnectToSource(const picojson::value& data, void BluetoothHealthProfileHandler::UnregisterSinkAppAsync(const std::string& app_id, int callback_handle) { - LoggerD("Entered"); + ScopeLogger(); auto unregister_app = [app_id, this](const std::shared_ptr& response) -> void { - LoggerD("Entered"); + ScopeLogger("Entered into asynchronous function, uregister_app"); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); auto iter = this->registered_health_apps_.find(app_id); @@ -376,6 +377,7 @@ void BluetoothHealthProfileHandler::UnregisterSinkAppAsync(const std::string& ap auto unregister_app_response = [this, callback_handle](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, unregister_app_response"); instance_.SyncResponse(callback_handle, response); }; diff --git a/src/bluetooth/bluetooth_instance.cc b/src/bluetooth/bluetooth_instance.cc index 30829859..a3dd1355 100644 --- a/src/bluetooth/bluetooth_instance.cc +++ b/src/bluetooth/bluetooth_instance.cc @@ -37,7 +37,7 @@ BluetoothInstance::BluetoothInstance() bluetooth_le_adapter_(*this), bluetooth_gatt_service_(*this), bluetooth_le_device_(*this, bluetooth_gatt_service_) { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -166,7 +166,7 @@ BluetoothInstance::BluetoothInstance() } BluetoothInstance::~BluetoothInstance() { - LoggerD("Entered"); + ScopeLogger(); } namespace { @@ -176,7 +176,7 @@ const char* JSON_LISTENER_ID = "listenerId"; void BluetoothInstance::AsyncResponse(double callback_handle, const std::shared_ptr& response) { - LoggerD("Entered"); + ScopeLogger(); common::TaskQueue::GetInstance().Async( [this, callback_handle](const std::shared_ptr& response) { SyncResponse(callback_handle, response); @@ -185,7 +185,7 @@ void BluetoothInstance::AsyncResponse(double callback_handle, } void BluetoothInstance::AsyncResponse(double callback_handle, const PlatformResult& result) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr response = std::shared_ptr(new picojson::value(picojson::object())); @@ -197,6 +197,7 @@ void BluetoothInstance::AsyncResponse(double callback_handle, const PlatformResu TaskQueue::GetInstance().Async( [this, callback_handle](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous response"); SyncResponse(callback_handle, response); }, response); @@ -204,28 +205,28 @@ void BluetoothInstance::AsyncResponse(double callback_handle, const PlatformResu void BluetoothInstance::SyncResponse(double callback_handle, const std::shared_ptr& response) { - LoggerD("Entered"); + ScopeLogger(); auto& obj = response->get(); obj[JSON_CALLBACK_ID] = picojson::value(callback_handle); Instance::PostMessage(this, response->serialize().c_str()); } void BluetoothInstance::FireEvent(const std::string& event, picojson::value& value) { - LoggerD("Entered"); + ScopeLogger(); auto& obj = value.get(); obj[JSON_LISTENER_ID] = picojson::value(event); Instance::PostMessage(this, value.serialize().c_str()); } void BluetoothInstance::FireEvent(const std::string& event, const picojson::value& value) { - LoggerD("Entered"); + ScopeLogger(); picojson::value v{value}; FireEvent(event, v); } void BluetoothInstance::FireEvent(const std::string& event, const std::shared_ptr& value) { - LoggerD("Entered"); + ScopeLogger(); FireEvent(event, *value.get()); } diff --git a/src/bluetooth/bluetooth_le_adapter.cc b/src/bluetooth/bluetooth_le_adapter.cc index 58efa13d..83dabfc4 100644 --- a/src/bluetooth/bluetooth_le_adapter.cc +++ b/src/bluetooth/bluetooth_le_adapter.cc @@ -32,8 +32,10 @@ namespace { class ParsedDataHolder { public: ParsedDataHolder() : valid_(false) { + ScopeLogger(); } virtual ~ParsedDataHolder() { + ScopeLogger(); } bool valid() const { @@ -55,6 +57,7 @@ class HexData { } void Parse(const std::string& d) { + ScopeLogger(); const char* p_data = d.c_str(); int size = d.length(); if (size > 2 && (d.find("0x", 0) == 0 || d.find("0X", 0) == 0)) { @@ -101,7 +104,7 @@ class BluetoothLEServiceData : public ParsedDataHolder { private: static bool ParseUUID(const picojson::value& obj, BluetoothLEServiceData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& uuid = obj.get("uuid"); if (uuid.is()) { out->uuid_ = uuid.get(); @@ -113,7 +116,7 @@ class BluetoothLEServiceData : public ParsedDataHolder { } static bool ParseData(const picojson::value& obj, BluetoothLEServiceData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& data = obj.get("data"); if (data.is()) { out->data_.Parse(data.get()); @@ -139,7 +142,7 @@ class BluetoothLEManufacturerData : public ParsedDataHolder { } static bool Construct(const picojson::value& obj, BluetoothLEManufacturerData* out) { - LoggerD("Entered"); + ScopeLogger(); if (!obj.is() || !ParseId(obj, out) || !ParseData(obj, out)) { return false; } @@ -151,7 +154,7 @@ class BluetoothLEManufacturerData : public ParsedDataHolder { private: static bool ParseId(const picojson::value& obj, BluetoothLEManufacturerData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& id = obj.get("id"); if (id.is()) { out->id_ = id.get(); @@ -163,7 +166,7 @@ class BluetoothLEManufacturerData : public ParsedDataHolder { } static bool ParseData(const picojson::value& obj, BluetoothLEManufacturerData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& val_data = obj.get("data"); @@ -186,6 +189,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { include_name_(false), appearance_(0), // 0 means unknown include_tx_power_level_(false) { + ScopeLogger(); } bool include_name() const { @@ -217,7 +221,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { } static bool Construct(const picojson::value& obj, BluetoothLEAdvertiseData* out) { - LoggerD("Entered"); + ScopeLogger(); if (!obj.is() || !ParseIncludeName(obj, out) || !ParseServiceUUIDs(obj, out) || !ParseSolicitationUUIDs(obj, out) || !ParseAppearance(obj, out) || !ParseIncludeTxPowerLevel(obj, out) || @@ -232,7 +236,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { private: static bool ParseIncludeName(const picojson::value& obj, BluetoothLEAdvertiseData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& include_name = obj.get("includeName"); if (include_name.is()) { out->include_name_ = include_name.get(); @@ -244,7 +248,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { } static bool ParseServiceUUIDs(const picojson::value& obj, BluetoothLEAdvertiseData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& service_uuids = obj.get("uuids"); if (service_uuids.is()) { for (const auto& i : service_uuids.get()) { @@ -262,7 +266,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { } static bool ParseSolicitationUUIDs(const picojson::value& obj, BluetoothLEAdvertiseData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& solicitation_uuids = obj.get("solicitationuuids"); if (solicitation_uuids.is()) { for (const auto& i : solicitation_uuids.get()) { @@ -280,7 +284,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { } static bool ParseAppearance(const picojson::value& obj, BluetoothLEAdvertiseData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& appearance = obj.get("appearance"); if (appearance.is()) { out->appearance_ = static_cast(appearance.get()); @@ -292,7 +296,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { } static bool ParseIncludeTxPowerLevel(const picojson::value& obj, BluetoothLEAdvertiseData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& include_tx_power_level = obj.get("includeTxPowerLevel"); if (include_tx_power_level.is()) { out->include_tx_power_level_ = include_tx_power_level.get(); @@ -304,7 +308,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { } static bool ParseServiceData(const picojson::value& obj, BluetoothLEAdvertiseData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& service_data = obj.get("serviceData"); BluetoothLEServiceData data; if (BluetoothLEServiceData::Construct(service_data, &data)) { @@ -317,7 +321,7 @@ class BluetoothLEAdvertiseData : public ParsedDataHolder { } static bool ParseManufacturerData(const picojson::value& obj, BluetoothLEAdvertiseData* out) { - LoggerD("Entered"); + ScopeLogger(); const auto& manufacturer_data = obj.get("manufacturerData"); BluetoothLEManufacturerData data; if (BluetoothLEManufacturerData::Construct(manufacturer_data, &data)) { @@ -366,7 +370,7 @@ using common::tools::ReportSuccess; BluetoothLEAdapter::BluetoothLEAdapter(BluetoothInstance& instance) : instance_(instance), enabled_(false), scanning_(false), bt_advertiser_(nullptr) { - LoggerD("Entered"); + ScopeLogger(); bt_adapter_le_state_e le_state = BT_ADAPTER_LE_DISABLED; @@ -385,7 +389,7 @@ BluetoothLEAdapter::BluetoothLEAdapter(BluetoothInstance& instance) } BluetoothLEAdapter::~BluetoothLEAdapter() { - LoggerD("Entered"); + ScopeLogger(); bt_adapter_le_unset_state_changed_cb(); if (scanning_) { bt_adapter_le_stop_scan(); @@ -397,7 +401,7 @@ BluetoothLEAdapter::~BluetoothLEAdapter() { } void BluetoothLEAdapter::StartScan(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -423,7 +427,7 @@ void BluetoothLEAdapter::StartScan(const picojson::value& data, picojson::object } void BluetoothLEAdapter::StopScan(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -439,7 +443,7 @@ void BluetoothLEAdapter::StopScan(const picojson::value& data, picojson::object& } void BluetoothLEAdapter::StartAdvertise(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -638,7 +642,7 @@ void BluetoothLEAdapter::StartAdvertise(const picojson::value& data, picojson::o } void BluetoothLEAdapter::StopAdvertise(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -661,7 +665,7 @@ void BluetoothLEAdapter::StopAdvertise(const picojson::value& data, picojson::ob void BluetoothLEAdapter::OnStateChanged(int result, bt_adapter_le_state_e adapter_le_state, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); auto adapter = static_cast(user_data); @@ -675,7 +679,7 @@ void BluetoothLEAdapter::OnStateChanged(int result, bt_adapter_le_state_e adapte void BluetoothLEAdapter::OnScanResult(int result, bt_adapter_le_device_scan_result_info_s* info, void* user_data) { - LoggerD("Entered, result: %d, info: %p, data: %p", result, info, user_data); + ScopeLogger("result: %d, info: %p, data: %p", result, info, user_data); auto adapter = static_cast(user_data); @@ -714,8 +718,8 @@ void BluetoothLEAdapter::OnScanResult(int result, bt_adapter_le_device_scan_resu void BluetoothLEAdapter::OnAdvertiseResult(int result, bt_advertiser_h advertiser, bt_adapter_le_advertising_state_e adv_state, void* user_data) { - LoggerD("Entered, result: %d, advertiser: %p, adv_state: %d, user_data: %p", result, advertiser, - adv_state, user_data); + ScopeLogger("result: %d, advertiser: %p, adv_state: %d, user_data: %p", result, advertiser, + adv_state, user_data); auto adapter = static_cast(user_data); diff --git a/src/bluetooth/bluetooth_le_device.cc b/src/bluetooth/bluetooth_le_device.cc index 34e2964d..c10ebc81 100644 --- a/src/bluetooth/bluetooth_le_device.cc +++ b/src/bluetooth/bluetooth_le_device.cc @@ -57,7 +57,7 @@ const std::string kConnectChangeEvent = "BluetoothLEConnectChangeCallback"; BluetoothLEDevice::BluetoothLEDevice(BluetoothInstance& instance, BluetoothGATTService& service) : instance_(instance), service_(service), is_listener_set_(false) { - LoggerD("Entered"); + ScopeLogger(); int ret = bt_gatt_set_connection_state_changed_cb(GattConnectionState, this); if (BT_ERROR_NONE != ret && BT_ERROR_ALREADY_DONE != ret) { LoggerE("Can't add connection state listener: %d", ret); @@ -65,7 +65,7 @@ BluetoothLEDevice::BluetoothLEDevice(BluetoothInstance& instance, BluetoothGATTS } BluetoothLEDevice::~BluetoothLEDevice() { - LoggerD("Entered"); + ScopeLogger(); int ret = bt_gatt_unset_connection_state_changed_cb(); if (ret != BT_ERROR_NONE) { LoggerW("Failed to unset listener: %d", ret); @@ -74,7 +74,7 @@ BluetoothLEDevice::~BluetoothLEDevice() { static void UUIDsToJson(char** service_uuid, int service_count, const std::string& field, picojson::object* le_device) { - LoggerD("Entered"); + ScopeLogger(); picojson::array& array = le_device->insert(std::make_pair(field, picojson::value(picojson::array()))) @@ -87,7 +87,7 @@ static void UUIDsToJson(char** service_uuid, int service_count, const std::strin static void ServiceDataToJson(bt_adapter_le_service_data_s* service_data_list, int service_data_list_count, picojson::object* le_device) { - LoggerD("Entered"); + ScopeLogger(); picojson::array& array = le_device->insert(std::make_pair(kServiceData, picojson::value(picojson::array()))) @@ -113,7 +113,7 @@ static void ServiceDataToJson(bt_adapter_le_service_data_s* service_data_list, static void ManufacturerToJson(int manufacturer_id, char* manufacturer_data, int manufacturer_count, picojson::object* le_device) { - LoggerD("Entered"); + ScopeLogger(); picojson::value response = picojson::value(picojson::object()); picojson::object& response_obj = response.get(); @@ -132,7 +132,7 @@ static void ManufacturerToJson(int manufacturer_id, char* manufacturer_data, int PlatformResult BluetoothLEDevice::ToJson(bt_adapter_le_device_scan_result_info_s* info, picojson::object* le_device) { - LoggerD("Entered"); + ScopeLogger(); le_device->insert( std::make_pair(kDeviceAddress, picojson::value(std::string(info->remote_address)))); @@ -283,7 +283,7 @@ PlatformResult BluetoothLEDevice::ToJson(bt_adapter_le_device_scan_result_info_s } void BluetoothLEDevice::Connect(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -320,7 +320,7 @@ void BluetoothLEDevice::Connect(const picojson::value& data, picojson::object& o } void BluetoothLEDevice::Disconnect(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -362,7 +362,7 @@ void BluetoothLEDevice::Disconnect(const picojson::value& data, picojson::object } void BluetoothLEDevice::GetService(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothAdmin, &out); @@ -393,8 +393,6 @@ void BluetoothLEDevice::GetService(const picojson::value& data, picojson::object void BluetoothLEDevice::AddConnectStateChangeListener(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); - is_listener_set_ = true; ReportSuccess(out); @@ -402,15 +400,13 @@ void BluetoothLEDevice::AddConnectStateChangeListener(const picojson::value& dat void BluetoothLEDevice::RemoveConnectStateChangeListener(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); - is_listener_set_ = false; ReportSuccess(out); } void BluetoothLEDevice::GetServiceAllUuids(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& args = util::GetArguments(data); const auto& address = common::FromJson(args, "address"); @@ -429,7 +425,7 @@ void BluetoothLEDevice::GetServiceAllUuids(const picojson::value& data, picojson void BluetoothLEDevice::GattConnectionState(int result, bool connected, const char* remote_address, void* user_data) { - LoggerD("Entered: %s connected: %d", remote_address, connected); + ScopeLogger("%s connected: %d", remote_address, connected); auto le_device = static_cast(user_data); if (!le_device) { diff --git a/src/bluetooth/bluetooth_service_handler.cc b/src/bluetooth/bluetooth_service_handler.cc index d249f89f..8e270972 100644 --- a/src/bluetooth/bluetooth_service_handler.cc +++ b/src/bluetooth/bluetooth_service_handler.cc @@ -34,7 +34,7 @@ BluetoothServiceHandler::BluetoothServiceHandler(BluetoothAdapter& adapter) : ad } void BluetoothServiceHandler::Unregister(const picojson::value& data, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothSpp, &out); diff --git a/src/bluetooth/bluetooth_socket.cc b/src/bluetooth/bluetooth_socket.cc index 3d4a8c10..7625ae4e 100644 --- a/src/bluetooth/bluetooth_socket.cc +++ b/src/bluetooth/bluetooth_socket.cc @@ -45,10 +45,11 @@ using namespace common; using namespace common::tools; BluetoothSocket::BluetoothSocket(BluetoothAdapter& adapter) : adapter_(adapter) { + ScopeLogger(); } void BluetoothSocket::WriteData(const picojson::value& data, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothSpp, &out); @@ -75,7 +76,7 @@ void BluetoothSocket::WriteData(const picojson::value& data, picojson::object& o } void BluetoothSocket::ReadData(const picojson::value& data, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothSpp, &out); @@ -98,7 +99,7 @@ void BluetoothSocket::ReadData(const picojson::value& data, picojson::object& ou } void BluetoothSocket::Close(const picojson::value& data, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_BACKWARD_COMPABILITY_PRIVILEGE_ACCESS(Privilege::kBluetooth, Privilege::kBluetoothSpp, &out); @@ -117,7 +118,7 @@ void BluetoothSocket::Close(const picojson::value& data, picojson::object& out) } picojson::value BluetoothSocket::ToJson(bt_socket_connection_s* connection) { - LoggerD("Enter"); + ScopeLogger(); picojson::value ret = picojson::value(picojson::object()); auto& ret_obj = ret.get(); diff --git a/src/bookmark/bookmark_instance.cc b/src/bookmark/bookmark_instance.cc index e600e552..884dba14 100644 --- a/src/bookmark/bookmark_instance.cc +++ b/src/bookmark/bookmark_instance.cc @@ -42,7 +42,7 @@ const std::string kPrivilegeBookmarkWrite = "http://tizen.org/privilege/bookmark } // namespace BookmarkInstance::BookmarkInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -56,11 +56,11 @@ BookmarkInstance::BookmarkInstance() { } BookmarkInstance::~BookmarkInstance() { - LoggerD("Enter"); + ScopeLogger(); } bool BookmarkInstance::bookmark_foreach(Context& ctx, bp_bookmark_info_fmt& info) { - LoggerD("Enter"); + ScopeLogger(); int ids_count = 0; int* ids = NULL; BookmarkObject item; @@ -84,7 +84,7 @@ bool BookmarkInstance::bookmark_foreach(Context& ctx, bp_bookmark_info_fmt& info } PlatformResult BookmarkInstance::BookmarkUrlExists(const char* url, bool* exists) { - LoggerD("Enter"); + ScopeLogger(); int ids_count = 0; int* ids = nullptr; char* compare_url = nullptr; @@ -131,7 +131,7 @@ PlatformResult BookmarkInstance::BookmarkUrlExists(const char* url, bool* exists PlatformResult BookmarkInstance::BookmarkTitleExistsInParent(const char* title, int parent, bool* exists) { - LoggerD("Enter"); + ScopeLogger(); int ids_count = 0; int compare_parent = -1; int* ids = nullptr; @@ -182,9 +182,9 @@ PlatformResult BookmarkInstance::BookmarkTitleExistsInParent(const char* title, } void BookmarkInstance::BookmarkGet(const picojson::value& arg, picojson::object& o) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeBookmarkRead, &o); - LoggerD("Enter"); Context ctx = {0}; bp_bookmark_info_fmt info = {0}; picojson::value::array arr; @@ -214,9 +214,9 @@ void BookmarkInstance::BookmarkGet(const picojson::value& arg, picojson::object& } void BookmarkInstance::BookmarkAdd(const picojson::value& arg, picojson::object& o) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeBookmarkWrite, &o); - LoggerD("Enter"); int saved_id = -1; const auto& title = arg.get(kTitle).get(); @@ -289,9 +289,9 @@ void BookmarkInstance::BookmarkAdd(const picojson::value& arg, picojson::object& } void BookmarkInstance::BookmarkRemove(const picojson::value& arg, picojson::object& o) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeBookmarkWrite, &o); - LoggerD("Enter"); int id = common::stol(common::FromJson(arg.get(), kId)); int ntv_ret = bp_bookmark_adaptor_delete(id); @@ -303,9 +303,9 @@ void BookmarkInstance::BookmarkRemove(const picojson::value& arg, picojson::obje } void BookmarkInstance::BookmarkRemoveAll(const picojson::value& msg, picojson::object& o) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeBookmarkWrite, &o); - LoggerD("Enter"); int ntv_ret = bp_bookmark_adaptor_reset(); if (ntv_ret < 0) { LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to remove bookmark"), &o); @@ -315,7 +315,7 @@ void BookmarkInstance::BookmarkRemoveAll(const picojson::value& msg, picojson::o } void BookmarkInstance::BookmarkGetRootId(const picojson::value& msg, picojson::object& o) { - LoggerD("Enter"); + ScopeLogger(); int rootId(0); int ntv_ret = bp_bookmark_adaptor_get_root(&rootId); if (ntv_ret < 0) { diff --git a/src/calendar/calendar.cc b/src/calendar/calendar.cc index 0995fdb5..ef161c0e 100644 --- a/src/calendar/calendar.cc +++ b/src/calendar/calendar.cc @@ -41,9 +41,11 @@ void CalendarFilterDeleter(calendar_filter_h calendar_filter) { using namespace common; Calendar::Calendar(CalendarInstance& instance) : current_db_version_(0), instance_(instance) { + ScopeLogger(); } Calendar::~Calendar() { + ScopeLogger(); int ret; if (listeners_registered_.find("EVENT") != listeners_registered_.end()) { @@ -62,6 +64,7 @@ Calendar::~Calendar() { } PlatformResult Calendar::Get(const picojson::object& args, picojson::object& out) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -102,6 +105,7 @@ PlatformResult Calendar::Get(const picojson::object& args, picojson::object& out } PlatformResult Calendar::Add(const picojson::object& args, picojson::object& out) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -141,6 +145,7 @@ PlatformResult Calendar::Add(const picojson::object& args, picojson::object& out } PlatformResult Calendar::AddBatch(const picojson::object& args, picojson::array& array) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -215,6 +220,7 @@ PlatformResult Calendar::AddBatch(const picojson::object& args, picojson::array& } PlatformResult Calendar::Update(const picojson::object& args, picojson::object& /*out*/) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -297,6 +303,7 @@ PlatformResult Calendar::Update(const picojson::object& args, picojson::object& } PlatformResult Calendar::UpdateBatch(const picojson::object& args, picojson::array& array) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -367,6 +374,7 @@ PlatformResult Calendar::UpdateBatch(const picojson::object& args, picojson::arr } PlatformResult Calendar::Remove(const picojson::object& args, picojson::object& out) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -384,7 +392,7 @@ PlatformResult Calendar::Remove(const picojson::object& args, picojson::object& } PlatformResult Calendar::SetDefaultFilter(calendar_query_h* calendar_query, int type, int id) { - LoggerD("Entered"); + ScopeLogger(); const long UNIFIED_CALENDAR_ID = 0; int error_code = 0; @@ -423,6 +431,7 @@ PlatformResult Calendar::SetDefaultFilter(calendar_query_h* calendar_query, int } PlatformResult Calendar::Find(const picojson::object& args, picojson::array& array) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -452,6 +461,7 @@ PlatformResult Calendar::Find(const picojson::object& args, picojson::array& arr FilterVisitor visitor; visitor.SetOnAttributeFilter([&](const std::string& name, AttributeMatchFlag match_flag, const picojson::value& match_value) { + ScopeLogger("Entered into asynchronous function, visitor.SetOnAttributeFilter' argument"); int value = 0; calendar_filter_h calendar_filter = nullptr; @@ -558,12 +568,15 @@ PlatformResult Calendar::Find(const picojson::object& args, picojson::array& arr return PlatformResult(ErrorCode::NO_ERROR); }); visitor.SetOnCompositeFilterBegin([&](CompositeFilterType type) { + ScopeLogger( + "Entered into asynchronous function, visitor.SetOnCompositeFilterBegin's argument"); intermediate_filters.push_back(std::vector()); return PlatformResult(ErrorCode::NO_ERROR); }); visitor.SetOnCompositeFilterEnd([&](CompositeFilterType calType) { + ScopeLogger("Entered into asynchronous function, visitor.SetOnCompositeFilterEnd's argument"); if (intermediate_filters.size() == 0) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Reached stack size equal to 0!"); } @@ -596,6 +609,8 @@ PlatformResult Calendar::Find(const picojson::object& args, picojson::array& arr visitor.SetOnAttributeRangeFilter([&](const std::string& name, const JsonValue& initial_value, const JsonValue& end_value) { + ScopeLogger( + "Entered into asynchronous function, visitor.SetOnAttributeRangeFilter's argument"); unsigned int propertyId = 0; if (name == "startDate" || name == "endDate" || name == "dueDate") { PlatformResult status = @@ -842,6 +857,7 @@ PlatformResult Calendar::Find(const picojson::object& args, picojson::array& arr } PlatformResult Calendar::RemoveBatch(const picojson::object& args, picojson::array& array) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -907,6 +923,7 @@ PlatformResult Calendar::RemoveBatch(const picojson::object& args, picojson::arr } PlatformResult Calendar::AddChangeListener(const picojson::object& args, picojson::object& out) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -942,6 +959,7 @@ PlatformResult Calendar::AddChangeListener(const picojson::object& args, picojso } PlatformResult Calendar::RemoveChangeListener(const picojson::object& args, picojson::object& out) { + ScopeLogger(); if (!CalendarManager::GetInstance().IsConnected()) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -966,7 +984,7 @@ PlatformResult Calendar::RemoveChangeListener(const picojson::object& args, pico } void Calendar::ChangeCallback(const char* view_uri, void* user_data) { - LoggerD("enter"); + ScopeLogger(); Calendar* c = static_cast(user_data); diff --git a/src/calendar/calendar_instance.cc b/src/calendar/calendar_instance.cc index 66c17771..c1a7e968 100644 --- a/src/calendar/calendar_instance.cc +++ b/src/calendar/calendar_instance.cc @@ -40,7 +40,7 @@ using namespace common; using namespace extension::calendar; CalendarInstance::CalendarInstance() : calendar_(*this) { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -71,11 +71,11 @@ CalendarInstance::CalendarInstance() : calendar_(*this) { } CalendarInstance::~CalendarInstance() { - LoggerD("Enter"); + ScopeLogger(); } void CalendarInstance::CalendarGet(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarRead, &out); JsonValue val{JsonObject{}}; @@ -90,7 +90,7 @@ void CalendarInstance::CalendarGet(const JsonValue& args, JsonObject& out) { } void CalendarInstance::CalendarAdd(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarWrite, &out); JsonValue val{JsonObject{}}; @@ -105,7 +105,7 @@ void CalendarInstance::CalendarAdd(const JsonValue& args, JsonObject& out) { } void CalendarInstance::CalendarAddBatch(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarWrite, &out); const double callback_id = args.get("callbackId").get(); @@ -123,7 +123,7 @@ void CalendarInstance::CalendarAddBatch(const JsonValue& args, JsonObject& out) }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { - LoggerD("CalendarAddBatch->get_response"); + ScopeLogger("Entered into asynchronous function, CalendarAddBatch->get_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); LoggerD("callback is %s", response->serialize().c_str()); @@ -136,7 +136,7 @@ void CalendarInstance::CalendarAddBatch(const JsonValue& args, JsonObject& out) } void CalendarInstance::CalendarUpdate(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarWrite, &out); JsonValue val{JsonObject{}}; @@ -152,12 +152,13 @@ void CalendarInstance::CalendarUpdate(const JsonValue& args, JsonObject& out) { } void CalendarInstance::CalendarUpdateBatch(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarWrite, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { - LoggerD("CalendarUpdateBatch->get"); + ScopeLogger("Entered into asynchronous function, CalendarUpdateBatch->get"); + JsonValue result = JsonValue(JsonArray()); PlatformResult status = calendar_.UpdateBatch(common::JsonCast(args), result.get()); @@ -170,7 +171,8 @@ void CalendarInstance::CalendarUpdateBatch(const JsonValue& args, JsonObject& ou }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { - LoggerD("CalendarUpdateBatch->get_response"); + ScopeLogger("Entered into asynchronous function, CalendarUpdateBatch->get_response"); + picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); LoggerD("callback is %s", response->serialize().c_str()); @@ -183,7 +185,7 @@ void CalendarInstance::CalendarUpdateBatch(const JsonValue& args, JsonObject& ou } void CalendarInstance::CalendarRemove(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarWrite, &out); JsonValue val{JsonObject{}}; @@ -199,12 +201,13 @@ void CalendarInstance::CalendarRemove(const JsonValue& args, JsonObject& out) { } void CalendarInstance::CalendarRemoveBatch(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarWrite, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { - LoggerD("CalendarRemoveBatch->get"); + ScopeLogger("Entered into asynchronous function, CalendarRemoveBatch->get"); + JsonValue result = JsonValue(JsonArray()); PlatformResult status = calendar_.RemoveBatch(common::JsonCast(args), result.get()); @@ -217,7 +220,8 @@ void CalendarInstance::CalendarRemoveBatch(const JsonValue& args, JsonObject& ou }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { - LoggerD("CalendarRemoveBatch->get_response"); + ScopeLogger("Entered into asynchronous function, CalendarRemoveBatch->get_response"); + picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); LoggerD("callback is %s", response->serialize().c_str()); @@ -230,12 +234,13 @@ void CalendarInstance::CalendarRemoveBatch(const JsonValue& args, JsonObject& ou } void CalendarInstance::CalendarFind(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarRead, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { - LoggerD("CalendarFind->get"); + ScopeLogger("Entered into asynchronous function, CalendarFind->get"); + JsonValue result = JsonValue(JsonArray()); PlatformResult status = calendar_.Find(common::JsonCast(args), result.get()); @@ -248,10 +253,11 @@ void CalendarInstance::CalendarFind(const JsonValue& args, JsonObject& out) { }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { - LoggerD("CalendarFind->get_response"); + ScopeLogger("Entered into asynchronous function, CalendarFind->get_response"); + picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); - LoggerD("callback isssssss %s", response->serialize().c_str()); + LoggerD("callback is %s", response->serialize().c_str()); Instance::PostMessage(this, response->serialize().c_str()); }; @@ -261,7 +267,7 @@ void CalendarInstance::CalendarFind(const JsonValue& args, JsonObject& out) { } void CalendarInstance::CalendarAddChangeListener(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarRead, &out); JsonValue val{JsonObject{}}; @@ -277,7 +283,7 @@ void CalendarInstance::CalendarAddChangeListener(const JsonValue& args, JsonObje } void CalendarInstance::CalendarRemoveChangeListener(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarRead, &out); JsonValue val{JsonObject{}}; @@ -294,7 +300,7 @@ void CalendarInstance::CalendarRemoveChangeListener(const JsonValue& args, JsonO // CalendarManager void CalendarInstance::CalendarManagerAddCalendar(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarWrite, &out); JsonValue val{JsonObject{}}; @@ -309,7 +315,7 @@ void CalendarInstance::CalendarManagerAddCalendar(const JsonValue& args, JsonObj } void CalendarInstance::CalendarManagerGetCalendar(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarRead, &out); JsonValue val{JsonObject{}}; @@ -324,12 +330,13 @@ void CalendarInstance::CalendarManagerGetCalendar(const JsonValue& args, JsonObj } void CalendarInstance::CalendarManagerGetCalendars(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarRead, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { - LoggerD("CalendarManagerGetCalendars->get"); + ScopeLogger("Entered into asynchronous function, CalendarManagerGetCalendars->get"); + JsonValue result = JsonValue(JsonArray()); PlatformResult status = CalendarManager::GetInstance().GetCalendars( @@ -343,7 +350,8 @@ void CalendarInstance::CalendarManagerGetCalendars(const JsonValue& args, JsonOb }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { - LoggerD("CalendarManagerGetCalendars->get_response"); + ScopeLogger("Entered into asynchronous function, CalendarManagerGetCalendars->get_response"); + picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); LoggerD("callback is %s", response->serialize().c_str()); @@ -356,7 +364,7 @@ void CalendarInstance::CalendarManagerGetCalendars(const JsonValue& args, JsonOb } void CalendarInstance::CalendarManagerRemoveCalendar(const JsonValue& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCalendarWrite, &out); JsonValue val{JsonObject{}}; diff --git a/src/calendar/calendar_item.cc b/src/calendar/calendar_item.cc index be2eda7e..6ac5c8c1 100644 --- a/src/calendar/calendar_item.cc +++ b/src/calendar/calendar_item.cc @@ -193,7 +193,7 @@ const PlatformEnumMap CalendarItem::platform_enum_map_ = { PlatformEnumReverseMap CalendarItem::platform_enum_reverse_map_ = {}; PlatformResult CalendarItem::Create(int type, calendar_record_h* handle) { - LoggerD("Enter"); + ScopeLogger(); std::string value_str; PlatformResult status = CalendarRecord::TypeToUri(type, &value_str); if (status.IsError()) { @@ -204,7 +204,7 @@ PlatformResult CalendarItem::Create(int type, calendar_record_h* handle) { } PlatformResult CalendarItem::Remove(int type, int id) { - LoggerD("Enter"); + ScopeLogger(); std::string view_uri; PlatformResult status = CalendarRecord::TypeToUri(type, &view_uri); if (status.IsError()) { @@ -245,7 +245,7 @@ PlatformResult CalendarItem::Remove(int type, int id) { PlatformResult CalendarItem::GetPlatformProperty(int type, const std::string& property, unsigned int* value) { - LoggerD("Enter"); + ScopeLogger(); if (platform_property_map_.find(property) == platform_property_map_.end()) { std::string message = std::string("Undefined property ") + property; return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, message); @@ -265,7 +265,7 @@ PlatformResult CalendarItem::GetPlatformProperty(int type, const std::string& pr PlatformResult CalendarItem::StringToPlatformEnum(const std::string& field, const std::string& value, int* platform_enum) { - LoggerD("Enter"); + ScopeLogger(); auto iter = platform_enum_map_.find(field); if (iter == platform_enum_map_.end()) { std::string message = std::string("Undefined platform enum type ") + field; @@ -292,7 +292,7 @@ PlatformResult CalendarItem::StringToPlatformEnum(const std::string& field, PlatformResult CalendarItem::PlatformEnumToString(const std::string& field, int value, std::string* platform_str) { - LoggerD("Enter"); + ScopeLogger(); // @todo can be replaced by Boost.Bimap if (platform_enum_reverse_map_.empty()) { for (auto& def : platform_enum_map_) { @@ -325,7 +325,7 @@ PlatformResult CalendarItem::PlatformEnumToString(const std::string& field, int PlatformResult CalendarItem::SetString(int type, calendar_record_h rec, const std::string& property, const picojson::object& in, bool optional) { - LoggerD("set: %s", property.c_str()); + ScopeLogger("set: %s", property.c_str()); if (optional && IsNull(in, property.c_str())) { return PlatformResult(ErrorCode::NO_ERROR); @@ -338,7 +338,7 @@ PlatformResult CalendarItem::SetString(int type, calendar_record_h rec, const st PlatformResult CalendarItem::SetString(int type, calendar_record_h rec, const std::string& property, const std::string& value) { - LoggerD("set: %s", property.c_str()); + ScopeLogger("set: %s", property.c_str()); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); @@ -358,7 +358,7 @@ PlatformResult CalendarItem::SetString(int type, calendar_record_h rec, const st PlatformResult CalendarItem::GetString(int type, calendar_record_h rec, const std::string& property, std::string* value) { - LoggerD("get: %s", property.c_str()); + ScopeLogger("set: %s", property.c_str()); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); @@ -371,7 +371,7 @@ PlatformResult CalendarItem::GetString(int type, calendar_record_h rec, const st PlatformResult CalendarItem::SetInt(int type, calendar_record_h rec, const std::string& property, const picojson::object& in, bool optional) { - LoggerD("set: %s", property.c_str()); + ScopeLogger("set: %s", property.c_str()); if (optional && IsNull(in, property.c_str())) { return PlatformResult(ErrorCode::NO_ERROR); @@ -384,7 +384,7 @@ PlatformResult CalendarItem::SetInt(int type, calendar_record_h rec, const std:: PlatformResult CalendarItem::SetInt(int type, calendar_record_h rec, const std::string& property, int value) { - LoggerD("set: %s", property.c_str()); + ScopeLogger("set: %s" + property); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); @@ -397,7 +397,7 @@ PlatformResult CalendarItem::SetInt(int type, calendar_record_h rec, const std:: PlatformResult CalendarItem::GetInt(int type, calendar_record_h rec, const std::string& property, int* value) { - LoggerD("get: %s", property.c_str()); + ScopeLogger("set: %s" + property); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); @@ -410,7 +410,7 @@ PlatformResult CalendarItem::GetInt(int type, calendar_record_h rec, const std:: PlatformResult CalendarItem::SetEnum(int type, calendar_record_h rec, const std::string& property, const picojson::object& in, const std::string& enum_name) { - LoggerD("Enter"); + ScopeLogger(); std::string value = common::FromJson(in, property.c_str()); int value_int; @@ -429,7 +429,7 @@ PlatformResult CalendarItem::SetEnum(int type, calendar_record_h rec, const std: PlatformResult CalendarItem::SetEnum(calendar_record_h rec, unsigned int property, const std::string& enum_name, const std::string& value) { - LoggerD("Enter"); + ScopeLogger(); int value_int; PlatformResult status = StringToPlatformEnum(enum_name, value, &value_int); if (status.IsError()) { @@ -446,6 +446,7 @@ PlatformResult CalendarItem::SetEnum(calendar_record_h rec, unsigned int propert PlatformResult CalendarItem::GetEnum(int type, calendar_record_h rec, const std::string& property, const std::string& enum_name, std::string* enum_str) { + ScopeLogger(); int value; PlatformResult status = GetInt(type, rec, property, &value); if (status.IsError()) { @@ -457,7 +458,7 @@ PlatformResult CalendarItem::GetEnum(int type, calendar_record_h rec, const std: PlatformResult CalendarItem::GetEnum(calendar_record_h rec, unsigned int property, const std::string& enum_name, std::string* enum_str) { - LoggerD("Enter"); + ScopeLogger(); int value; PlatformResult status = CalendarRecord::GetInt(rec, property, &value); if (status.IsError()) { @@ -469,7 +470,7 @@ PlatformResult CalendarItem::GetEnum(calendar_record_h rec, unsigned int propert PlatformResult CalendarItem::SetDouble(int type, calendar_record_h rec, const std::string& property, double value) { - LoggerD("set: %s", property.c_str()); + ScopeLogger("set: %s", property.c_str()); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); @@ -489,7 +490,7 @@ PlatformResult CalendarItem::SetDouble(int type, calendar_record_h rec, const st PlatformResult CalendarItem::GetDouble(int type, calendar_record_h rec, const std::string& property, double* value) { - LoggerD("get: %s", property.c_str()); + ScopeLogger("get: %s", property.c_str()); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); @@ -510,7 +511,7 @@ PlatformResult CalendarItem::GetDouble(int type, calendar_record_h rec, const st PlatformResult CalendarItem::SetCaltime(int type, calendar_record_h rec, const std::string& property, calendar_time_s value, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); if (status.IsError()) { @@ -522,7 +523,7 @@ PlatformResult CalendarItem::SetCaltime(int type, calendar_record_h rec, PlatformResult CalendarItem::SetCaltime(calendar_record_h rec, unsigned int property, calendar_time_s value, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_set_caltime(rec, property, value); if (CALENDAR_ERROR_NONE != ret) { @@ -540,7 +541,7 @@ PlatformResult CalendarItem::SetCaltime(calendar_record_h rec, unsigned int prop PlatformResult CalendarItem::GetCaltime(int type, calendar_record_h rec, const std::string& property, calendar_time_s* cal_time, bool throw_on_error) { - LoggerD("get: %s", property.c_str()); + ScopeLogger("set: %s" + property); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); @@ -553,7 +554,7 @@ PlatformResult CalendarItem::GetCaltime(int type, calendar_record_h rec, PlatformResult CalendarItem::GetCaltime(calendar_record_h rec, unsigned int property, calendar_time_s* cal_time, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); if (property != -1u) { int ret = calendar_record_get_caltime(rec, property, cal_time); if (CALENDAR_ERROR_NONE != ret) { @@ -570,7 +571,7 @@ PlatformResult CalendarItem::GetCaltime(calendar_record_h rec, unsigned int prop PlatformResult CalendarItem::SetLli(calendar_record_h rec, unsigned int property, long long int value, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_set_lli(rec, property, value); if (CALENDAR_ERROR_NONE != ret) { @@ -587,7 +588,7 @@ PlatformResult CalendarItem::SetLli(calendar_record_h rec, unsigned int property PlatformResult CalendarItem::GetLli(int type, calendar_record_h rec, const std::string& property, long long int* lli) { - LoggerD("get: %s", property.c_str()); + ScopeLogger("set: %s" + property); unsigned int prop; PlatformResult status = GetPlatformProperty(type, property, &prop); @@ -600,7 +601,7 @@ PlatformResult CalendarItem::GetLli(int type, calendar_record_h rec, const std:: PlatformResult CalendarItem::GetLli(calendar_record_h rec, unsigned int property, long long int* value, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_get_lli(rec, property, value); if (CALENDAR_ERROR_NONE != ret) { LoggerW("Can't get lli value form record: %d", ret); @@ -614,7 +615,7 @@ PlatformResult CalendarItem::GetLli(calendar_record_h rec, unsigned int property } Date CalendarItem::DateFromJson(const picojson::object& in) { - LoggerD("json date %s", picojson::value(in).serialize().c_str()); + ScopeLogger("json date " + picojson::value(in).serialize()); Date date = {(long long int)common::FromJson(in, "UTCTimestamp"), (int)common::FromJson(in, "year"), @@ -625,12 +626,12 @@ Date CalendarItem::DateFromJson(const picojson::object& in) { } Date CalendarItem::DateFromJson(const picojson::object& in, const char* obj_name) { - LoggerD("Enter"); + ScopeLogger(); return DateFromJson(common::FromJson(in, obj_name)); } picojson::value CalendarItem::DateToJson(Date* date) { - LoggerD("timestamp: %lld", date->utc_timestamp_); + ScopeLogger("timestamp: %lld", date->utc_timestamp_); picojson::value date_val = picojson::value(picojson::object()); picojson::object& date_obj = date_val.get(); @@ -646,7 +647,7 @@ picojson::value CalendarItem::DateToJson(Date* date) { PlatformResult CalendarItem::CategoriesFromJson(int type, calendar_record_h rec, const picojson::array& value) { - LoggerD("Enter"); + ScopeLogger(); std::string categories = ""; for (auto iter = value.begin(); iter != value.end(); ++iter) { if (iter == value.begin()) { @@ -666,7 +667,7 @@ PlatformResult CalendarItem::CategoriesFromJson(int type, calendar_record_h rec, PlatformResult CalendarItem::CategoriesToJson(int type, calendar_record_h rec, picojson::array* value) { - LoggerD("Enter"); + ScopeLogger(); std::string categories; PlatformResult status = GetString(type, rec, "categories", &categories); if (status.IsError()) { @@ -680,7 +681,7 @@ PlatformResult CalendarItem::CategoriesToJson(int type, calendar_record_h rec, PlatformResult CalendarItem::AttendeesFromJson(int type, calendar_record_h rec, const picojson::array& value) { - LoggerD("Enter"); + ScopeLogger(); // Remove the preset child attendees before adding new ones. unsigned int property; if (type == CALENDAR_BOOK_TYPE_EVENT) { @@ -792,7 +793,7 @@ PlatformResult CalendarItem::AttendeesFromJson(int type, calendar_record_h rec, PlatformResult CalendarItem::AttendeesToJson(int type, calendar_record_h rec, picojson::array* out) { - LoggerD("Enter"); + ScopeLogger(); unsigned int property; if (type == CALENDAR_BOOK_TYPE_EVENT) { property = _calendar_event.calendar_attendee; @@ -914,7 +915,7 @@ PlatformResult CalendarItem::AttendeesToJson(int type, calendar_record_h rec, PlatformResult CalendarItem::AlarmsFromJson(int type, calendar_record_h rec, const picojson::array& alarms) { - LoggerD("Enter"); + ScopeLogger(); unsigned int property; if (type == CALENDAR_BOOK_TYPE_EVENT) { property = _calendar_event.calendar_alarm; @@ -1012,7 +1013,7 @@ PlatformResult CalendarItem::AlarmsFromJson(int type, calendar_record_h rec, } PlatformResult CalendarItem::AlarmsToJson(int type, calendar_record_h rec, picojson::array* out) { - LoggerD("Enter"); + ScopeLogger(); unsigned int property; if (type == CALENDAR_BOOK_TYPE_EVENT) { property = _calendar_event.calendar_alarm; @@ -1115,7 +1116,7 @@ PlatformResult CalendarItem::AlarmsToJson(int type, calendar_record_h rec, picoj PlatformResult CalendarItem::RecurrenceRuleFromJson(calendar_record_h rec, const picojson::object& rrule) { - LoggerD("Enter"); + ScopeLogger(); const std::string& frequency = common::FromJson(rrule, "frequency"); PlatformResult status = SetEnum(rec, _calendar_event.freq, kRecurrenceRuleFrequency, frequency); if (status.IsError()) { @@ -1198,7 +1199,7 @@ PlatformResult CalendarItem::RecurrenceRuleFromJson(calendar_record_h rec, } std::string CalendarItem::ExceptionsFromJson(const picojson::array& exceptions) { - LoggerD("Enter"); + ScopeLogger(); std::string result; Date date; for (auto iter = exceptions.begin(); iter != exceptions.end(); ++iter) { @@ -1219,7 +1220,7 @@ std::string CalendarItem::ExceptionsFromJson(const picojson::array& exceptions) PlatformResult CalendarItem::RecurrenceRuleToJson(calendar_record_h rec, picojson::object* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); picojson::object& out = *out_ptr; std::string enum_str; @@ -1300,7 +1301,7 @@ PlatformResult CalendarItem::RecurrenceRuleToJson(calendar_record_h rec, } calendar_time_s CalendarItem::DateToPlatform(const Date& date, bool is_all_day) { - LoggerD("Enter"); + ScopeLogger(); calendar_time_s cal; if (is_all_day) { @@ -1317,7 +1318,7 @@ calendar_time_s CalendarItem::DateToPlatform(const Date& date, bool is_all_day) PlatformResult CalendarItem::DateFromPlatform(int type, calendar_record_h rec, const std::string& property, Date* date_from_platform) { - LoggerD("Enter"); + ScopeLogger(); calendar_time_s cal; PlatformResult status = GetCaltime(type, rec, property + "_time", &cal); if (status.IsError()) { @@ -1341,7 +1342,7 @@ PlatformResult CalendarItem::DateFromPlatform(int type, calendar_record_h rec, PlatformResult CalendarItem::DateFromPlatform(calendar_record_h rec, unsigned int property, Date* date_from_platform) { - LoggerD("Enter"); + ScopeLogger(); calendar_time_s cal; PlatformResult status = GetCaltime(rec, property, &cal); if (status.IsError()) { @@ -1358,7 +1359,7 @@ PlatformResult CalendarItem::DateFromPlatform(calendar_record_h rec, unsigned in } PlatformResult CalendarItem::FromJson(int type, calendar_record_h rec, const picojson::object& in) { - LoggerD("Enter"); + ScopeLogger(); if (in.empty()) { return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Empty Calendar object."); } @@ -1514,7 +1515,7 @@ PlatformResult CalendarItem::FromJson(int type, calendar_record_h rec, const pic } PlatformResult CalendarItem::ToJson(int type, calendar_record_h rec, picojson::object* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); if (NULL == rec) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Calendar record is null"); } @@ -1722,7 +1723,7 @@ PlatformResult CalendarItem::ToJson(int type, calendar_record_h rec, picojson::o } picojson::array CalendarItem::StringToArray(const std::string& string) { - LoggerD("Enter"); + ScopeLogger(); picojson::array out = picojson::array(); size_t cstr_length = string.length() + 1; diff --git a/src/calendar/calendar_manager.cc b/src/calendar/calendar_manager.cc index 5de0579b..4c2edafc 100644 --- a/src/calendar/calendar_manager.cc +++ b/src/calendar/calendar_manager.cc @@ -37,7 +37,7 @@ const int kUnifiedCalendardId = 0; using namespace common; CalendarManager::CalendarManager() { - LoggerD("Enter"); + ScopeLogger(); if (CALENDAR_ERROR_NONE == calendar_connect()) { LoggerD("Calendar DB connected"); is_connected_ = true; @@ -47,7 +47,7 @@ CalendarManager::CalendarManager() { } CalendarManager::~CalendarManager() { - LoggerD("Enter"); + ScopeLogger(); if (is_connected_) { if (CALENDAR_ERROR_NONE == calendar_disconnect()) { LoggerD("Calendar DB disconnected"); @@ -58,7 +58,7 @@ CalendarManager::~CalendarManager() { } CalendarManager& CalendarManager::GetInstance() { - LoggerD("Enter"); + ScopeLogger(); static CalendarManager instance; return instance; } @@ -68,7 +68,7 @@ bool CalendarManager::IsConnected() { } PlatformResult CalendarManager::GetCalendars(const JsonObject& args, JsonArray& array) { - LoggerD("Enter"); + ScopeLogger(); if (!is_connected_) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -138,7 +138,7 @@ PlatformResult CalendarManager::GetCalendars(const JsonObject& args, JsonArray& } PlatformResult CalendarManager::GetCalendar(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); if (!is_connected_) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -174,7 +174,7 @@ PlatformResult CalendarManager::GetCalendar(const JsonObject& args, JsonObject& } PlatformResult CalendarManager::AddCalendar(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); if (!is_connected_) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } @@ -205,7 +205,7 @@ PlatformResult CalendarManager::AddCalendar(const JsonObject& args, JsonObject& } PlatformResult CalendarManager::RemoveCalendar(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); if (!is_connected_) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "DB Connection failed."); } diff --git a/src/calendar/calendar_plugin.cc b/src/calendar/calendar_plugin.cc index cf466e7d..3d3fe8fb 100644 --- a/src/calendar/calendar_plugin.cc +++ b/src/calendar/calendar_plugin.cc @@ -36,15 +36,18 @@ class CalendarPlugin : public NativePlugin { EXPORT_NATIVE_PLUGIN(webapi::calendar::CalendarPlugin); CalendarPlugin::CalendarPlugin() { + ScopeLogger(); manager_ = &CalendarManager::GetInstance(); calendar_ = &Calendar::GetInstance(); } CalendarPlugin::~CalendarPlugin() { + ScopeLogger(); manager_ = nullptr; } void CalendarPlugin::OnLoad() { + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; diff --git a/src/calendar/calendar_record.cc b/src/calendar/calendar_record.cc index d8e6b98d..87926f50 100644 --- a/src/calendar/calendar_record.cc +++ b/src/calendar/calendar_record.cc @@ -32,7 +32,7 @@ const std::string kCalendarTypeTask = "TASK"; using namespace common; PlatformResult CalendarRecord::CheckReturn(int ret, const std::string& error_name) { - LoggerD("Enter"); + ScopeLogger(); if (CALENDAR_ERROR_NONE != ret) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, error_name, ("%s : %d (%s)", error_name.c_str(), ret, get_error_message(ret))); @@ -42,7 +42,7 @@ PlatformResult CalendarRecord::CheckReturn(int ret, const std::string& error_nam } void CalendarRecord::QueryDeleter(calendar_query_h handle) { - LoggerD("Enter"); + ScopeLogger(); if (handle) { if (CALENDAR_ERROR_NONE != calendar_query_destroy(handle)) { LoggerW("calendar_query_destroy failed"); @@ -51,7 +51,7 @@ void CalendarRecord::QueryDeleter(calendar_query_h handle) { } void CalendarRecord::Deleter(calendar_record_h handle) { - LoggerD("Enter"); + ScopeLogger(); if (handle) { if (CALENDAR_ERROR_NONE != calendar_record_destroy(handle, true)) { LoggerW("calendar_record_destroy failed"); @@ -60,7 +60,7 @@ void CalendarRecord::Deleter(calendar_record_h handle) { } void CalendarRecord::ListDeleter(calendar_list_h handle) { - LoggerD("Enter"); + ScopeLogger(); if (handle) { if (CALENDAR_ERROR_NONE != calendar_list_destroy(handle, true)) { LoggerW("calendar_list_destroy failed"); @@ -70,7 +70,7 @@ void CalendarRecord::ListDeleter(calendar_list_h handle) { PlatformResult CalendarRecord::GetString(calendar_record_h rec, unsigned int property, std::string* str, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); char* value = NULL; int ret = calendar_record_get_str(rec, property, &value); if (CALENDAR_ERROR_NONE != ret) { @@ -91,7 +91,7 @@ PlatformResult CalendarRecord::GetString(calendar_record_h rec, unsigned int pro PlatformResult CalendarRecord::SetString(calendar_record_h record, unsigned int property, const std::string& value, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_set_str(record, property, value.empty() ? NULL : value.c_str()); if (CALENDAR_ERROR_NONE != ret) { @@ -106,7 +106,7 @@ PlatformResult CalendarRecord::SetString(calendar_record_h record, unsigned int PlatformResult CalendarRecord::GetInt(calendar_record_h rec, unsigned int property, int* value, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_get_int(rec, property, value); if (CALENDAR_ERROR_NONE != ret) { LoggerE("Can't get int value form record: %d (%s)", ret, get_error_message(ret)); @@ -120,7 +120,7 @@ PlatformResult CalendarRecord::GetInt(calendar_record_h rec, unsigned int proper PlatformResult CalendarRecord::SetInt(calendar_record_h record, unsigned int property, int value, bool throw_on_error) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_set_int(record, property, value); if (CALENDAR_ERROR_NONE != ret) { @@ -134,7 +134,7 @@ PlatformResult CalendarRecord::SetInt(calendar_record_h record, unsigned int pro } std::string CalendarRecord::TypeToString(int type) { - LoggerD("Enter"); + ScopeLogger(); if (CALENDAR_BOOK_TYPE_EVENT == type) { return kCalendarTypeEvent; } @@ -147,7 +147,7 @@ std::string CalendarRecord::TypeToString(int type) { } std::string CalendarRecord::TypeToString(const char* view_uri) { - LoggerD("Enter"); + ScopeLogger(); if (0 == strcmp(view_uri, _calendar_event._uri)) { return kCalendarTypeEvent; } @@ -159,7 +159,7 @@ std::string CalendarRecord::TypeToString(const char* view_uri) { } int CalendarRecord::TypeToInt(const std::string& type) { - LoggerD("Enter"); + ScopeLogger(); if (kCalendarTypeEvent == type) { return CALENDAR_BOOK_TYPE_EVENT; } @@ -171,7 +171,7 @@ int CalendarRecord::TypeToInt(const std::string& type) { } int CalendarRecord::TypeToInt(const char* view_uri) { - LoggerD("Enter"); + ScopeLogger(); if (0 == strcmp(view_uri, _calendar_event._uri)) { return CALENDAR_BOOK_TYPE_EVENT; } @@ -183,7 +183,7 @@ int CalendarRecord::TypeToInt(const char* view_uri) { } PlatformResult CalendarRecord::TypeToUri(const std::string& type, std::string* uri) { - LoggerD("Enter"); + ScopeLogger(); if (kCalendarTypeEvent == type) { *uri = _calendar_event._uri; } else if (kCalendarTypeTask == type) { @@ -197,7 +197,7 @@ PlatformResult CalendarRecord::TypeToUri(const std::string& type, std::string* u } PlatformResult CalendarRecord::TypeToUri(int type, std::string* uri) { - LoggerD("Enter"); + ScopeLogger(); if (CALENDAR_BOOK_TYPE_EVENT == type) { *uri = _calendar_event._uri; } else if (CALENDAR_BOOK_TYPE_TODO == type) { @@ -211,7 +211,7 @@ PlatformResult CalendarRecord::TypeToUri(int type, std::string* uri) { } PlatformResult CalendarRecord::Create(const char* view_uri, calendar_record_h* handle) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_create(view_uri, handle); if (CALENDAR_ERROR_NONE != ret || nullptr == handle) { return LogAndCreateResult( @@ -223,12 +223,12 @@ PlatformResult CalendarRecord::Create(const char* view_uri, calendar_record_h* h } PlatformResult CalendarRecord::CreateCalendar(calendar_record_h* handle) { - LoggerD("Enter"); + ScopeLogger(); return Create(_calendar_book._uri, handle); } PlatformResult CalendarRecord::GetById(int id, const char* view_uri, calendar_record_h* handle) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_db_get_record(view_uri, id, handle); if (CALENDAR_ERROR_NONE != ret || nullptr == handle) { return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Fail to get record with given id", @@ -240,7 +240,7 @@ PlatformResult CalendarRecord::GetById(int id, const char* view_uri, calendar_re } PlatformResult CalendarRecord::Insert(calendar_record_h rec, int* record_id) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_db_insert_record(rec, record_id); if (CALENDAR_ERROR_NONE != ret) { @@ -254,7 +254,7 @@ PlatformResult CalendarRecord::Insert(calendar_record_h rec, int* record_id) { PlatformResult CalendarRecord::AddChildRecord(calendar_record_h rec, unsigned int property, calendar_record_h child) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_add_child_record(rec, property, child); if (CALENDAR_ERROR_NONE != ret) { if (child) { @@ -269,7 +269,7 @@ PlatformResult CalendarRecord::AddChildRecord(calendar_record_h rec, unsigned in } void CalendarRecord::RemoveChildRecords(calendar_record_h rec, unsigned int property_id) { - LoggerD("Enter"); + ScopeLogger(); unsigned int count = 0; if (CALENDAR_ERROR_NONE != calendar_record_get_child_record_count(rec, property_id, &count)) { @@ -297,7 +297,7 @@ void CalendarRecord::RemoveChildRecords(calendar_record_h rec, unsigned int prop PlatformResult CalendarRecord::GetChildRecordCount(calendar_record_h rec, unsigned int property, bool throw_on_error, unsigned int* value) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_get_child_record_count(rec, property, value); if (CALENDAR_ERROR_NONE != ret) { LoggerE("Can't get child record count: %d (%s)", ret, get_error_message(ret)); @@ -311,7 +311,7 @@ PlatformResult CalendarRecord::GetChildRecordCount(calendar_record_h rec, unsign PlatformResult CalendarRecord::GetChildRecordAt(calendar_record_h rec, unsigned int property, calendar_record_h* result, int index) { - LoggerD("Enter"); + ScopeLogger(); int ret = calendar_record_get_child_record_at_p(rec, property, index, result); if (CALENDAR_ERROR_NONE != ret) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Get child record at failed.", @@ -322,7 +322,7 @@ PlatformResult CalendarRecord::GetChildRecordAt(calendar_record_h rec, unsigned } PlatformResult CalendarRecord::CalendarToJson(calendar_record_h rec, picojson::object* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); picojson::object& out = *out_ptr; if (NULL == rec) { @@ -353,7 +353,7 @@ PlatformResult CalendarRecord::CalendarToJson(calendar_record_h rec, picojson::o } PlatformResult CalendarRecord::CalendarFromJson(calendar_record_h rec, const picojson::object& in) { - LoggerD("Enter"); + ScopeLogger(); if (in.empty()) { return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Empty Calendar object."); } diff --git a/src/callhistory/callhistory.cc b/src/callhistory/callhistory.cc index 73522376..f5311188 100644 --- a/src/callhistory/callhistory.cc +++ b/src/callhistory/callhistory.cc @@ -39,7 +39,7 @@ namespace callhistory { namespace { static void get_sim_msisdn_cb(TapiHandle* handle, int result, void* data, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); TelSimMsisdnList_t* list; std::promise* prom = reinterpret_cast*>(user_data); @@ -62,7 +62,7 @@ static void get_sim_msisdn_cb(TapiHandle* handle, int result, void* data, void* CallHistory::CallHistory(CallHistoryInstance& instance) : m_is_listener_set(false), instance_(instance), utils_(*this) { - LoggerD("Entered"); + ScopeLogger(); if (CONTACTS_ERROR_NONE == contacts_connect()) { LoggerD("Successful to connect Call history DB"); } else { @@ -71,7 +71,7 @@ CallHistory::CallHistory(CallHistoryInstance& instance) } CallHistory::~CallHistory() { - LoggerD("Entered"); + ScopeLogger(); if (m_is_listener_set) { int ret = @@ -90,7 +90,7 @@ CallHistory::~CallHistory() { } void CallHistory::FindThread(const picojson::object& args, CallHistory* call_history) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr response{new picojson::value(picojson::object())}; @@ -233,6 +233,7 @@ void CallHistory::FindThread(const picojson::object& args, CallHistory* call_his auto find_response = [call_history, callback_id](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, find_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(&call_history->instance_, response->serialize().c_str()); @@ -242,7 +243,7 @@ void CallHistory::FindThread(const picojson::object& args, CallHistory* call_his } void CallHistory::LoadPhoneNumbers(const picojson::object& args, CallHistory* call_history) { - LoggerD("Entered"); + ScopeLogger(); CallHistory::LockedVector phone_numbers = call_history->getPhoneNumbers(); if (0 != phone_numbers.size()) { LoggerD("m_phone_numbers is already filled. Returning."); @@ -303,13 +304,13 @@ void CallHistory::LoadPhoneNumbers(const picojson::object& args, CallHistory* ca } void CallHistory::find(const picojson::object& args) { - LoggerD("Entered"); + ScopeLogger(); std::thread(LoadPhoneNumbers, args, this).detach(); std::thread(FindThread, args, this).detach(); } PlatformResult CallHistory::remove(const picojson::object& args) { - LoggerD("Entered"); + ScopeLogger(); const auto it_uid = args.find("uid"); const auto it_args_end = args.end(); @@ -328,7 +329,7 @@ PlatformResult CallHistory::remove(const picojson::object& args) { } common::PlatformResult CallHistory::removeBatch(const picojson::object& args) { - LoggerD("Entered"); + ScopeLogger(); const auto it_uid = args.find("uid"); const auto it_args_end = args.end(); @@ -362,6 +363,7 @@ common::PlatformResult CallHistory::removeBatch(const picojson::object& args) { auto remove_batch_response = [this, callback_id](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, remove_batch_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(&this->instance_, response->serialize().c_str()); @@ -374,7 +376,7 @@ common::PlatformResult CallHistory::removeBatch(const picojson::object& args) { } void CallHistory::removeAll(const picojson::object& args) { - LoggerD("Entered"); + ScopeLogger(); const double callback_id = args.find("callbackId")->second.get(); @@ -468,6 +470,7 @@ void CallHistory::removeAll(const picojson::object& args) { auto remove_all_response = [this, callback_id](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, remove_all_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(&this->instance_, response->serialize().c_str()); @@ -487,7 +490,7 @@ CallHistoryUtils& CallHistory::getUtils() { } void CallHistory::changeListenerCB(const char* view_uri, char* changes, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); CallHistory* h = static_cast(user_data); @@ -589,7 +592,7 @@ void CallHistory::changeListenerCB(const char* view_uri, char* changes, void* us } PlatformResult CallHistory::startCallHistoryChangeListener() { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_listener_set) { int ret = @@ -605,7 +608,7 @@ PlatformResult CallHistory::startCallHistoryChangeListener() { } PlatformResult CallHistory::stopCallHistoryChangeListener() { - LoggerD("Entered"); + ScopeLogger(); if (m_is_listener_set) { int ret = contacts_db_remove_changed_cb_with_info(_contacts_phone_log._uri, changeListenerCB, this); @@ -619,7 +622,7 @@ PlatformResult CallHistory::stopCallHistoryChangeListener() { } PlatformResult CallHistory::setMissedDirection(int uid) { - LoggerD("Entered"); + ScopeLogger(); contacts_record_h record = nullptr; SCOPE_EXIT { diff --git a/src/callhistory/callhistory_instance.cc b/src/callhistory/callhistory_instance.cc index 64d8166d..bcadb8a6 100644 --- a/src/callhistory/callhistory_instance.cc +++ b/src/callhistory/callhistory_instance.cc @@ -33,7 +33,7 @@ const std::string kPrivilegeCallHistoryWrite = "http://tizen.org/privilege/callh using namespace common; CallHistoryInstance::CallHistoryInstance() : history_(*this) { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -53,17 +53,18 @@ CallHistoryInstance::CallHistoryInstance() : history_(*this) { } CallHistoryInstance::~CallHistoryInstance() { + ScopeLogger(); } void CallHistoryInstance::Find(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryRead, &out); history_.find(args.get()); ReportSuccess(out); } void CallHistoryInstance::Remove(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryWrite, &out); PlatformResult result = history_.remove(args.get()); if (result.IsSuccess()) { @@ -74,7 +75,7 @@ void CallHistoryInstance::Remove(const picojson::value& args, picojson::object& } void CallHistoryInstance::RemoveBatch(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryWrite, &out); PlatformResult result = history_.removeBatch(args.get()); if (result.IsSuccess()) { @@ -85,14 +86,14 @@ void CallHistoryInstance::RemoveBatch(const picojson::value& args, picojson::obj } void CallHistoryInstance::RemoveAll(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryWrite, &out); history_.removeAll(args.get()); ReportSuccess(out); } void CallHistoryInstance::AddChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryRead, &out); PlatformResult result = history_.startCallHistoryChangeListener(); if (result.IsSuccess()) { @@ -103,7 +104,7 @@ void CallHistoryInstance::AddChangeListener(const picojson::value& args, picojso } void CallHistoryInstance::RemoveChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryRead, &out); PlatformResult result = history_.stopCallHistoryChangeListener(); if (result.IsSuccess()) { @@ -114,7 +115,7 @@ void CallHistoryInstance::RemoveChangeListener(const picojson::value& args, pico } void CallHistoryInstance::SetMissedDirection(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); if (!args.contains("uid")) { LoggerD("args doesn't contain attribute 'uid'"); @@ -133,7 +134,7 @@ void CallHistoryInstance::SetMissedDirection(const picojson::value& args, picojs } void CallHistoryInstance::CallHistoryChange(picojson::object& data) { - LoggerD("Entered"); + ScopeLogger(); picojson::value event = picojson::value(data); picojson::object& obj = event.get(); obj["listenerId"] = picojson::value("CallHistoryChangeCallback"); diff --git a/src/callhistory/callhistory_utils.cc b/src/callhistory/callhistory_utils.cc index 9b67c74e..536b3453 100644 --- a/src/callhistory/callhistory_utils.cc +++ b/src/callhistory/callhistory_utils.cc @@ -38,10 +38,11 @@ enum CompositeTypeEnum { UNION = 0, INTERSECTION = 1, NONE = 2 }; } CallHistoryUtils::CallHistoryUtils(CallHistory& history) : history_(history) { + ScopeLogger(); } void CallHistoryUtils::parseRecordList(contacts_list_h* record_list, picojson::array& array) { - LoggerD("Entered"); + ScopeLogger(); contacts_record_h record = NULL; int total = 0; @@ -74,7 +75,7 @@ void CallHistoryUtils::parseRecordList(contacts_list_h* record_list, picojson::a } void CallHistoryUtils::parseRecord(contacts_record_h* record, picojson::object& obj) { - LoggerD("Entered"); + ScopeLogger(); int int_data; @@ -111,7 +112,7 @@ void CallHistoryUtils::parseRecord(contacts_record_h* record, picojson::object& } void CallHistoryUtils::parseLogType(contacts_phone_log_type_e log_type, picojson::object& obj) { - LoggerD("Entered"); + ScopeLogger(); picojson::value val = picojson::value(picojson::array()); picojson::array& features = val.get(); @@ -188,7 +189,7 @@ void CallHistoryUtils::parseLogType(contacts_phone_log_type_e log_type, picojson } void CallHistoryUtils::parseRemoteParties(contacts_record_h* record, picojson::object& obj) { - LoggerD("Entered"); + ScopeLogger(); char* char_data = NULL; int int_data; @@ -215,7 +216,7 @@ void CallHistoryUtils::parseRemoteParties(contacts_record_h* record, picojson::o } void CallHistoryUtils::parseCallingParty(contacts_record_h* record, picojson::object& obj) { - LoggerD("Entered"); + ScopeLogger(); int sim_count = 0; { @@ -238,7 +239,7 @@ void CallHistoryUtils::parseCallingParty(contacts_record_h* record, picojson::ob } unsigned int CallHistoryUtils::convertAttributeName(const std::string& attribute_name) { - LoggerD("Entered"); + ScopeLogger(); if (STR_RP_REMOTEPARTY == attribute_name) { return _contacts_phone_log.address; @@ -256,7 +257,7 @@ unsigned int CallHistoryUtils::convertAttributeName(const std::string& attribute } static FilterTypeEnum getFilterType(const picojson::object& filter) { - LoggerD("Entered"); + ScopeLogger(); const auto it_end = filter.end(); @@ -281,7 +282,7 @@ static FilterTypeEnum getFilterType(const picojson::object& filter) { } static CompositeTypeEnum getCompositeType(const picojson::object& filter) { - LoggerD("Entered"); + ScopeLogger(); CompositeTypeEnum type = NONE; const std::string& str_type = filter.find("type")->second.get(); @@ -294,7 +295,7 @@ static CompositeTypeEnum getCompositeType(const picojson::object& filter) { } static contacts_match_str_flag_e getMatchFlag(const std::string& match_flag) { - LoggerD("Entered"); + ScopeLogger(); if (STR_FILTER_FULLSTRING == match_flag) { return CONTACTS_MATCH_FULLSTRING; } else if (STR_FILTER_CONTAINS == match_flag) { @@ -311,7 +312,7 @@ static contacts_match_str_flag_e getMatchFlag(const std::string& match_flag) { } static std::time_t toTimeT(const std::string& value) { - LoggerD("Entered"); + ScopeLogger(); struct tm date; if (nullptr == strptime(value.c_str(), "%Y-%m-%dT%H:%M:%S", &date)) { LOGW("Couldn't convert supplied date."); @@ -320,7 +321,7 @@ static std::time_t toTimeT(const std::string& value) { } static void visitAttribute(std::stack& stack, const picojson::object filter) { - LoggerD("Entered"); + ScopeLogger(); contacts_filter_h filter_top = stack.top(); contacts_filter_h sub_filter = NULL; @@ -483,7 +484,7 @@ static void visitAttribute(std::stack& stack, const picojson: static void visitAttributeRange(std::stack& stack, const picojson::object filter) { - LoggerD("Entered"); + ScopeLogger(); unsigned int prop_id = 0; const auto it_attr_name = filter.find("attributeName"); @@ -563,7 +564,7 @@ static void visitAttributeRange(std::stack& stack, static void generateFilter(std::stack& stack, const picojson::object filter, CompositeTypeEnum type) { - LoggerD("Entered"); + ScopeLogger(); switch (getFilterType(filter)) { case FILTER_ATTRIBUTE: { visitAttribute(stack, filter); @@ -616,7 +617,7 @@ static void generateFilter(std::stack& stack, const picojson: } void CallHistoryUtils::createFilter(contacts_filter_h filter, const picojson::object filter_obj) { - LoggerD("Entered"); + ScopeLogger(); std::stack filter_stack; filter_stack.push(filter); generateFilter(filter_stack, filter_obj, CompositeTypeEnum::NONE); diff --git a/src/common/GDBus/connection.cpp b/src/common/GDBus/connection.cpp index 1cf69e80..55e64d1a 100644 --- a/src/common/GDBus/connection.cpp +++ b/src/common/GDBus/connection.cpp @@ -23,7 +23,7 @@ namespace common { namespace dbus { Connection& Connection::getInstance() { - LoggerD("Entered"); + ScopeLogger(); static Connection instance; return instance; } @@ -33,11 +33,11 @@ GDBusConnection* Connection::getDBus() { } Connection::Connection() { + ScopeLogger(); m_dbus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &m_error); if (!m_dbus || m_error) { LoggerE("Could not get connection"); } - LoggerD("Connection set"); } Connection::~Connection() { diff --git a/src/common/XW_Extension.cc b/src/common/XW_Extension.cc index cee62c78..dcf87c27 100644 --- a/src/common/XW_Extension.cc +++ b/src/common/XW_Extension.cc @@ -34,7 +34,7 @@ class Extension::Detail { }; int32_t Extension::Detail::XW_Initialize(XW_Extension extension, XW_GetInterface get_interface) { - LoggerD("Enter"); + ScopeLogger(); g_extension = CreateExtension(); if (!g_extension) { LoggerE("Can't initialize extension: CreateExtension() returned NULL."); @@ -44,7 +44,7 @@ int32_t Extension::Detail::XW_Initialize(XW_Extension extension, XW_GetInterface } void Extension::Detail::OnInstanceCreated(XW_Instance xw_instance) { - LoggerD("Enter"); + ScopeLogger(); if (!g_extension) { return; } @@ -56,7 +56,7 @@ void Extension::Detail::OnInstanceCreated(XW_Instance xw_instance) { } void Extension::Detail::OnShutdown(XW_Extension) { - LoggerD("Enter"); + ScopeLogger(); delete g_extension; g_extension = nullptr; } diff --git a/src/common/converter.cc b/src/common/converter.cc index 583ce3d3..48ccd601 100644 --- a/src/common/converter.cc +++ b/src/common/converter.cc @@ -22,7 +22,7 @@ namespace common { const picojson::value& FindValue(const picojson::object& in, const char* name) { - LoggerD("Enter"); + ScopeLogger(); auto it = in.find(name); if (it == in.end()) { throw common::UnknownException(std::string("Failed to find required JSON property: ") + name + diff --git a/src/common/current_application.cc b/src/common/current_application.cc index c2da8c0f..eaa85be9 100644 --- a/src/common/current_application.cc +++ b/src/common/current_application.cc @@ -27,28 +27,28 @@ namespace common { CurrentApplication& CurrentApplication::GetInstance() { - LoggerD("Enter"); + ScopeLogger(); static CurrentApplication current_application; return current_application; } pid_t CurrentApplication::GetProcessId() const { - LoggerD("Enter"); + ScopeLogger(); return pid_; } std::string CurrentApplication::GetApplicationId() const { - LoggerD("Enter"); + ScopeLogger(); return app_id_; } std::string CurrentApplication::GetPackageId() const { - LoggerD("Enter"); + ScopeLogger(); return package_id_; } std::string CurrentApplication::GetRoot() const { - LoggerD("Enter"); + ScopeLogger(); return root_; } @@ -57,11 +57,11 @@ CurrentApplication::CurrentApplication() app_id_(FetchApplicationId()), package_id_(FetchPackageId()), root_(FetchRoot()) { - LoggerD("Enter"); + ScopeLogger(); } std::string CurrentApplication::FetchApplicationId() const { - LoggerD("Enter"); + ScopeLogger(); std::string app_id; char* tmp_str = nullptr; @@ -79,7 +79,7 @@ std::string CurrentApplication::FetchApplicationId() const { } std::string CurrentApplication::FetchPackageId() const { - LoggerD("Enter"); + ScopeLogger(); std::string package_id; app_info_h app_info; int err = app_info_create(app_id_.c_str(), &app_info); @@ -106,7 +106,7 @@ std::string CurrentApplication::FetchPackageId() const { } std::string CurrentApplication::FetchRoot() const { - LoggerD("Enter"); + ScopeLogger(); char* path = nullptr; path = app_get_data_path(); diff --git a/src/common/extension.cc b/src/common/extension.cc index 983c73a1..22f7f430 100644 --- a/src/common/extension.cc +++ b/src/common/extension.cc @@ -36,7 +36,7 @@ const XW_Internal_RuntimeInterface* g_runtime = NULL; const XW_Internal_PermissionsInterface* g_permission = NULL; bool InitializeInterfaces(XW_GetInterface get_interface) { - LoggerD("Enter"); + ScopeLogger(); static bool initialized = false; if (!initialized) { @@ -95,47 +95,47 @@ bool InitializeInterfaces(XW_GetInterface get_interface) { namespace common { Extension::Extension() : xw_extension_(g_xw_extension_) { - LoggerD("Enter"); + ScopeLogger(); } Extension::~Extension() { - LoggerD("Enter"); + ScopeLogger(); } void Extension::SetExtensionName(const char* name) { - LoggerD("Enter"); + ScopeLogger(); g_core->SetExtensionName(xw_extension_, name); } void Extension::SetJavaScriptAPI(const char* api) { - LoggerD("Enter"); + ScopeLogger(); g_core->SetJavaScriptAPI(xw_extension_, api); } void Extension::SetExtraJSEntryPoints(const char** entry_points) { - LoggerD("Enter"); + ScopeLogger(); if (g_entry_points) g_entry_points->SetExtraJSEntryPoints(xw_extension_, entry_points); } bool Extension::RegisterPermissions(const char* perm_table) { - LoggerD("Enter"); + ScopeLogger(); if (g_permission) return g_permission->RegisterPermissions(xw_extension_, perm_table); return false; } bool Extension::CheckAPIAccessControl(const char* api_name) { - LoggerD("Enter"); + ScopeLogger(); if (g_permission) return g_permission->CheckAPIAccessControl(xw_extension_, api_name); return false; } Instance* Extension::CreateInstance() { - LoggerD("Enter"); + ScopeLogger(); return NULL; } std::string Extension::GetRuntimeVariable(const char* var_name, unsigned len) { - LoggerD("Enter"); + ScopeLogger(); if (!g_runtime) return ""; std::vector res(len + 1, 0); @@ -157,7 +157,7 @@ std::string Extension::GetRuntimeVariable(const char* var_name, unsigned len) { // static void Extension::OnInstanceCreated(XW_Instance xw_instance, Instance* instance) { - LoggerD("Enter"); + ScopeLogger(); Assert(!g_core->GetInstanceData(xw_instance)); if (!instance) return; instance->xw_instance_ = xw_instance; @@ -167,7 +167,7 @@ void Extension::OnInstanceCreated(XW_Instance xw_instance, Instance* instance) { // static void Extension::OnInstanceDestroyed(XW_Instance xw_instance) { - LoggerD("Enter"); + ScopeLogger(); Instance* instance = reinterpret_cast(g_core->GetInstanceData(xw_instance)); if (!instance) return; instance->xw_instance_ = 0; @@ -176,7 +176,7 @@ void Extension::OnInstanceDestroyed(XW_Instance xw_instance) { // static void Extension::HandleMessage(XW_Instance xw_instance, const char* msg) { - LoggerD("Enter"); + ScopeLogger(); Instance* instance = reinterpret_cast(g_core->GetInstanceData(xw_instance)); if (!instance) return; instance->HandleMessage(msg); @@ -184,7 +184,7 @@ void Extension::HandleMessage(XW_Instance xw_instance, const char* msg) { // static void Extension::HandleSyncMessage(XW_Instance xw_instance, const char* msg) { - LoggerD("Enter"); + ScopeLogger(); Instance* instance = reinterpret_cast(g_core->GetInstanceData(xw_instance)); if (!instance) return; instance->HandleSyncMessage(msg); @@ -195,7 +195,7 @@ int32_t Extension::XW_Initialize(XW_Extension extension, XW_GetInterface get_int XW_Initialize_Func initialize, XW_CreatedInstanceCallback created_instance, XW_ShutdownCallback shutdown) { - LoggerD("Enter"); + ScopeLogger(); Assert(extension); if (!InitializeInterfaces(get_interface)) { @@ -221,18 +221,18 @@ int32_t Extension::XW_Initialize(XW_Extension extension, XW_GetInterface get_int std::unordered_set Instance::all_instances_; Instance::Instance() : xw_instance_(0) { - LoggerD("Enter"); + ScopeLogger(); { all_instances_.insert(this); } } Instance::~Instance() { - LoggerD("Enter"); + ScopeLogger(); { all_instances_.erase(this); } Assert(xw_instance_ == 0); } void Instance::PostMessage(Instance* that, const char* msg) { - LoggerD("Enter"); + ScopeLogger(); if (that && all_instances_.end() != all_instances_.find(that)) { that->PostMessage(msg); } else { @@ -241,7 +241,7 @@ void Instance::PostMessage(Instance* that, const char* msg) { } void Instance::PostMessage(const char* msg) { - LoggerD("Enter"); + ScopeLogger(); if (!xw_instance_) { LoggerE( "Ignoring PostMessage() in the constructor or after the " @@ -252,7 +252,7 @@ void Instance::PostMessage(const char* msg) { } void Instance::SendSyncReply(const char* reply) { - LoggerD("Enter"); + ScopeLogger(); if (!xw_instance_) { LoggerE( "Ignoring SendSyncReply() in the constructor or after the " @@ -263,60 +263,60 @@ void Instance::SendSyncReply(const char* reply) { } ParsedInstance::ParsedInstance() { - LoggerD("Enter"); + ScopeLogger(); } ParsedInstance::~ParsedInstance() { - LoggerD("Enter"); + ScopeLogger(); } void ParsedInstance::RegisterHandler(const std::string& name, const NativeHandler& func) { - LoggerD("Enter"); + ScopeLogger(); handler_map_.insert(std::make_pair(name, func)); } void ParsedInstance::RegisterSyncHandler(const std::string& name, const NativeHandler& func) { - LoggerD("Enter"); + ScopeLogger(); handler_map_.insert(std::make_pair("#SYNC#" + name, func)); } void ParsedInstance::ReportSuccess(picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); tools::ReportSuccess(out); } void ParsedInstance::ReportSuccess(const picojson::value& result, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); tools::ReportSuccess(result, out); } void ParsedInstance::ReportError(picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); tools::ReportError(out); } void ParsedInstance::ReportError(const PlatformException& ex, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); tools::ReportError(ex, out); } void ParsedInstance::ReportError(const PlatformResult& error, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); tools::ReportError(error, out); } void ParsedInstance::HandleMessage(const char* msg) { - LoggerD("Enter"); + ScopeLogger(); HandleMessage(msg, false); } void ParsedInstance::HandleSyncMessage(const char* msg) { - LoggerD("Enter"); + ScopeLogger(); HandleMessage(msg, true); } void ParsedInstance::HandleMessage(const char* msg, bool is_sync) { - LoggerD("Enter"); + ScopeLogger(); try { picojson::value value; std::string err; @@ -360,7 +360,7 @@ void ParsedInstance::HandleMessage(const char* msg, bool is_sync) { } void ParsedInstance::HandleException(const PlatformException& ex) { - LoggerD("Enter"); + ScopeLogger(); LoggerE("Exception: %s", ex.message().c_str()); picojson::value result = picojson::value(picojson::object()); ReportError(ex, result.get()); diff --git a/src/common/filesystem/filesystem_provider.cc b/src/common/filesystem/filesystem_provider.cc index 882f3f9f..140b7496 100644 --- a/src/common/filesystem/filesystem_provider.cc +++ b/src/common/filesystem/filesystem_provider.cc @@ -21,58 +21,58 @@ namespace common { IFilesystemProvider::IFilesystemProvider() { - LoggerD("enter"); + ScopeLogger(); } IFilesystemProvider::~IFilesystemProvider() { - LoggerD("enter"); + ScopeLogger(); } FilesystemProvider::FilesystemProvider() : provider_(FilesystemProviderDeviced::Create()) { } FilesystemProvider& FilesystemProvider::Create() { - LoggerD("Entered"); + ScopeLogger(); static FilesystemProvider instance; return instance; } FilesystemProvider::~FilesystemProvider() { - LoggerD("Entered"); + ScopeLogger(); } void FilesystemProvider::RegisterDeviceChangeState(DeviceChangeStateFun callback) { - LoggerD("Entered"); + ScopeLogger(); provider_.RegisterDeviceChangeState(callback); } void FilesystemProvider::UnregisterDeviceChangeState() { - LoggerD("Entered"); + ScopeLogger(); provider_.UnregisterDeviceChangeState(); } Storages FilesystemProvider::GetStorages() { - LoggerD("Entered"); + ScopeLogger(); return provider_.GetStorages(); } VirtualRoots FilesystemProvider::GetVirtualPaths() { - LoggerD("Entered"); + ScopeLogger(); return provider_.GetVirtualPaths(); } VirtualStorages FilesystemProvider::GetAllStorages() { - LoggerD("Entered"); + ScopeLogger(); return provider_.GetAllStorages(); } std::string FilesystemProvider::GetRealPath(const std::string& path_or_uri) { - LoggerD("Entered"); + ScopeLogger(); return FilesystemProviderStorage::Create().GetRealPath(path_or_uri); } std::string FilesystemProvider::GetVirtualPath(const std::string& real_path) const { - LoggerD("Entered"); + ScopeLogger(); return FilesystemProviderStorage::Create().GetVirtualPath(real_path); } diff --git a/src/common/filesystem/filesystem_provider_deviced.cc b/src/common/filesystem/filesystem_provider_deviced.cc index 19e7a125..2ce1ab43 100644 --- a/src/common/filesystem/filesystem_provider_deviced.cc +++ b/src/common/filesystem/filesystem_provider_deviced.cc @@ -93,7 +93,7 @@ struct UsbListElem { }; FilesystemProviderDeviced::~FilesystemProviderDeviced() { - LoggerD("Entered"); + ScopeLogger(); UnregisterDeviceChangeState(); } @@ -104,7 +104,7 @@ FilesystemProviderDeviced::FilesystemProviderDeviced() block_signal_subscribe_id_(0), virtual_roots_provider_(FilesystemProviderStorage::Create()), is_initialized_(false) { - LoggerD("Entered"); + ScopeLogger(); GError* error = nullptr; @@ -122,7 +122,7 @@ FilesystemProviderDeviced::FilesystemProviderDeviced() } FilesystemProviderDeviced& FilesystemProviderDeviced::Create() { - LoggerD("Entered"); + ScopeLogger(); static FilesystemProviderDeviced instance; @@ -134,7 +134,7 @@ void FilesystemProviderDeviced::BlockSignalProxy(GDBusConnection* connection, const gchar* interface_name, const gchar* signal_name, GVariant* parameters, gpointer user_data) { - LoggerD("Entered"); + ScopeLogger(); FilesystemProviderDeviced* instance = static_cast(user_data); DeviceListElem elem; @@ -145,7 +145,7 @@ void FilesystemProviderDeviced::BlockSignalProxy(GDBusConnection* connection, } void FilesystemProviderDeviced::BlockSignalCallback(DeviceListElem elem) { - LoggerD("Entered"); + ScopeLogger(); StorageState previous_state = StorageState::kUnmounted; auto it = previous_device_state_map_.find(elem.syspath); if (it == previous_device_state_map_.end()) { @@ -161,7 +161,7 @@ void FilesystemProviderDeviced::BlockSignalCallback(DeviceListElem elem) { } void FilesystemProviderDeviced::RegisterDeviceChangeState(DeviceChangeStateFun _callback) { - LoggerD("Entered"); + ScopeLogger(); if (!is_initialized_) { LoggerE("DeviceD Core api not initialized"); @@ -178,7 +178,7 @@ void FilesystemProviderDeviced::RegisterDeviceChangeState(DeviceChangeStateFun _ } void FilesystemProviderDeviced::UnregisterDeviceChangeState() { - LoggerD("Entered"); + ScopeLogger(); if (!is_initialized_) { LoggerE("DeviceD Core api not initialized"); @@ -193,7 +193,7 @@ void FilesystemProviderDeviced::UnregisterDeviceChangeState() { } std::shared_ptr FilesystemProviderDeviced::GetStorage(const DeviceListElem& elem) { - LoggerD("Entered"); + ScopeLogger(); return std::make_shared(GetIdFromUUID(elem.fs_uuid_enc), (elem.block_type ? StorageType::kMmc : StorageType::kUsbDevice), (elem.state ? StorageState::kMounted : StorageState::kUnmounted), @@ -201,7 +201,7 @@ std::shared_ptr FilesystemProviderDeviced::GetStorage(const DeviceListE } std::string FilesystemProviderDeviced::GetNameFromPath(const char* const char_path) { - LoggerD("Entered"); + ScopeLogger(); std::string path = char_path; std::string name = "removable_"; std::size_t last_slash_pos = path.find_last_of("/"); @@ -215,12 +215,12 @@ std::string FilesystemProviderDeviced::GetNameFromPath(const char* const char_pa } int FilesystemProviderDeviced::GetIdFromUUID(const char* const char_uuid) { - LoggerD("Entered"); + ScopeLogger(); return (int)std::hash()(std::string(char_uuid)); } Storages FilesystemProviderDeviced::GetStorages() { - LoggerD("Entered"); + ScopeLogger(); if (!is_initialized_) { LoggerE("DeviceD Core api not initialized"); return Storages(); @@ -249,7 +249,7 @@ Storages FilesystemProviderDeviced::GetStorages() { } Storages FilesystemProviderDeviced::GetStoragesFromGVariant(GVariant* variant) { - LoggerD("Entered"); + ScopeLogger(); Storages storages; GVariantIter* iter; @@ -281,7 +281,7 @@ Storages FilesystemProviderDeviced::GetStoragesFromGVariant(GVariant* variant) { } VirtualRoots FilesystemProviderDeviced::GetVirtualPaths() { - LoggerD("Entered"); + ScopeLogger(); if (!is_initialized_) { LoggerE("DeviceD Core api not initialized"); @@ -292,7 +292,7 @@ VirtualRoots FilesystemProviderDeviced::GetVirtualPaths() { } VirtualStorages FilesystemProviderDeviced::GetAllStorages() { - LoggerD("Entered"); + ScopeLogger(); if (!is_initialized_) { LoggerE("DeviceD Core api not initialized"); diff --git a/src/common/filesystem/filesystem_provider_storage.cc b/src/common/filesystem/filesystem_provider_storage.cc index a744dc9a..a82e6308 100644 --- a/src/common/filesystem/filesystem_provider_storage.cc +++ b/src/common/filesystem/filesystem_provider_storage.cc @@ -51,7 +51,7 @@ const std::string kFileUriPrefix = "file://"; namespace common { StorageState TranslateCoreStorageState(storage_state_e coreStorageState) { - LoggerD("Entered"); + ScopeLogger(); StorageState state = StorageState::kUnknown; if (coreStorageState == STORAGE_STATE_REMOVED) { state = StorageState::kUnmounted; @@ -66,7 +66,7 @@ StorageState TranslateCoreStorageState(storage_state_e coreStorageState) { } void OnStorageChange(int storage_id, storage_state_e state, void* user_data) { - LoggerD("Entered, id: %d", storage_id); + ScopeLogger("id: %d", storage_id); FilesystemProviderStorage* provider = static_cast(user_data); for (auto& storage : provider->GetStorages()) { @@ -83,7 +83,7 @@ void OnStorageChange(int storage_id, storage_state_e state, void* user_data) { bool OnForeachStorage(int storage_id, storage_type_e type, storage_state_e state, const char* path, void* user_data) { - LoggerD("Entered, id: %d", storage_id); + ScopeLogger("id: %d", storage_id); FilesystemProviderStorage* provider = static_cast(user_data); // handling only internal storages (external are handled with deviced api) @@ -104,7 +104,7 @@ DeviceChangeStateFun FilesystemProviderStorage::GetListener() { } FilesystemProviderStorage::FilesystemProviderStorage() { - LoggerD("Entered"); + ScopeLogger(); int err = storage_foreach_device_supported(OnForeachStorage, this); if (err != STORAGE_ERROR_NONE) { LoggerE("Unknown Error on getting storage paths"); @@ -112,13 +112,13 @@ FilesystemProviderStorage::FilesystemProviderStorage() { } FilesystemProviderStorage& FilesystemProviderStorage::Create() { - LoggerD("Entered"); + ScopeLogger(); static FilesystemProviderStorage fs; return fs; } FilesystemProviderStorage::~FilesystemProviderStorage() { - LoggerD("Entered"); + ScopeLogger(); } void FilesystemProviderStorage::FillVirtualPaths(int storage_id) { @@ -143,27 +143,27 @@ void FilesystemProviderStorage::FillVirtualPaths(int storage_id) { } void FilesystemProviderStorage::RegisterDeviceChangeState(DeviceChangeStateFun callback) { - LoggerD("Entered"); + ScopeLogger(); listener_ = callback; } void FilesystemProviderStorage::UnregisterDeviceChangeState() { - LoggerD("Entered"); + ScopeLogger(); listener_ = nullptr; } Storages FilesystemProviderStorage::GetStorages() { - LoggerD("Entered"); + ScopeLogger(); return storages_; } VirtualRoots FilesystemProviderStorage::GetVirtualPaths() { - LoggerD("Entered"); + ScopeLogger(); return virtual_paths_; } std::string FilesystemProviderStorage::GetRealPath(const std::string& path_or_uri) { - LoggerD("Enter"); + ScopeLogger(); std::string realpath; std::size_t pos = path_or_uri.find(kFileUriPrefix); if (pos != std::string::npos) { @@ -187,7 +187,7 @@ std::string FilesystemProviderStorage::GetRealPath(const std::string& path_or_ur } std::string FilesystemProviderStorage::GetVirtualPath(const std::string& real_path) const { - LoggerD("Enter"); + ScopeLogger(); for (const auto& kv : virtual_paths_) { if (0 == real_path.compare(0, kv.path_.size(), kv.path_)) { return std::string(real_path).replace(0, kv.path_.size(), kv.name_); @@ -197,7 +197,7 @@ std::string FilesystemProviderStorage::GetVirtualPath(const std::string& real_pa } VirtualStorages FilesystemProviderStorage::GetAllStorages() { - LoggerD("Entered"); + ScopeLogger(); VirtualStorages vs; for (auto storage : storages_) { vs.push_back(storage); diff --git a/src/common/filesystem/filesystem_storage.cc b/src/common/filesystem/filesystem_storage.cc index a776e698..0efc1865 100644 --- a/src/common/filesystem/filesystem_storage.cc +++ b/src/common/filesystem/filesystem_storage.cc @@ -23,13 +23,13 @@ namespace common { VirtualRoot::VirtualRoot(std::string const& name, std::string const& path, StorageType type, StorageState state) : name_(name), path_(path), type_(type), state_(state) { - LoggerD("Entered"); + ScopeLogger(); } Storage::Storage(int id, StorageType type, StorageState state, std::string const& path, std::string const& name) : VirtualRoot(name, path, type, state), id_(id) { - LoggerD("Enter"); + ScopeLogger(); if (name_ == "") { switch (type) { case StorageType::kInternal: @@ -50,7 +50,7 @@ Storage::Storage(int id, StorageType type, StorageState state, std::string const } picojson::value VirtualRoot::ToJson() const { - LoggerD("Entered"); + ScopeLogger(); picojson::value v{picojson::object{}}; picojson::object& obj = v.get(); @@ -63,7 +63,7 @@ picojson::value VirtualRoot::ToJson() const { } picojson::value Storage::ToJson() const { - LoggerD("Entered"); + ScopeLogger(); picojson::value value = VirtualRoot::ToJson(); picojson::object& obj = value.get(); obj["storage_id"] = picojson::value(static_cast(id_)); @@ -71,12 +71,12 @@ picojson::value Storage::ToJson() const { } Storage::Storage(Storage const& other) : VirtualRoot(other) { - LoggerD("Entered"); + ScopeLogger(); this->id_ = other.id_; } VirtualRoot::VirtualRoot(VirtualRoot const& other) { - LoggerD("Entered"); + ScopeLogger(); this->path_ = other.path_; this->name_ = other.name_; this->state_ = other.state_; @@ -84,7 +84,7 @@ VirtualRoot::VirtualRoot(VirtualRoot const& other) { } std::string VirtualRoot::ToString(StorageType type) { - LoggerD("Entered"); + ScopeLogger(); switch (type) { case StorageType::kInternal: return "INTERNAL"; @@ -99,7 +99,7 @@ std::string VirtualRoot::ToString(StorageType type) { } std::string VirtualRoot::ToString(StorageState state) { - LoggerD("Entered"); + ScopeLogger(); switch (state) { case StorageState::kUnmounted: return "REMOVED"; diff --git a/src/common/filter-utils.cc b/src/common/filter-utils.cc index 9bc7441a..c263ce3d 100644 --- a/src/common/filter-utils.cc +++ b/src/common/filter-utils.cc @@ -23,7 +23,7 @@ namespace common { PlatformResult AttributeMatchFlagFromString(const std::string &str, AttributeMatchFlag *filter_match_flag) { - LoggerD("Enter"); + ScopeLogger(); if (str == "EXACTLY") { *filter_match_flag = AttributeMatchFlag::kExactly; } else if (str == "FULLSTRING") { @@ -46,7 +46,7 @@ PlatformResult AttributeMatchFlagFromString(const std::string &str, PlatformResult CompositeFilterTypeFromString(const std::string &str, CompositeFilterType *comp_filter_type) { - LoggerD("Enter"); + ScopeLogger(); if (str == "UNION") { *comp_filter_type = CompositeFilterType::kUnion; } else if (str == "INTERSECTION") { @@ -61,27 +61,27 @@ PlatformResult CompositeFilterTypeFromString(const std::string &str, } void FilterVisitor::SetOnAttributeFilter(const AttributeFilterOnVisit &func) { - LoggerD("Enter"); + ScopeLogger(); m_attributeFilterOnVisit = func; } void FilterVisitor::SetOnAttributeRangeFilter(const AttributeRangeFilterOnVisit &func) { - LoggerD("Enter"); + ScopeLogger(); m_attributeRangeFilterOnVisit = func; } void FilterVisitor::SetOnCompositeFilterBegin(const CompositeFilterOnBegin &func) { - LoggerD("Enter"); + ScopeLogger(); m_compositeFilterOnBegin = func; } void FilterVisitor::SetOnCompositeFilterEnd(const CompositeFilterOnEnd &func) { - LoggerD("Enter"); + ScopeLogger(); m_compositeFilterOnEnd = func; } PlatformResult FilterVisitor::Visit(const picojson::object &filter) { - LoggerD("Enter"); + ScopeLogger(); const std::string &filterType = FromJson(filter, "filterType"); if (filterType == "AttributeFilter") { PlatformResult status = VisitAttributeFilter(filter); @@ -101,7 +101,7 @@ PlatformResult FilterVisitor::Visit(const picojson::object &filter) { } PlatformResult FilterVisitor::VisitAttributeFilter(const picojson::object &filter) { - LoggerD("Enter"); + ScopeLogger(); const std::string &attribute_name = FromJson(filter, "attributeName"); AttributeMatchFlag match_flag; @@ -120,7 +120,7 @@ PlatformResult FilterVisitor::VisitAttributeFilter(const picojson::object &filte } PlatformResult FilterVisitor::VisitAttributeRangeFilter(const picojson::object &filter) { - LoggerD("Enter"); + ScopeLogger(); const std::string &attributeName = FromJson(filter, "attributeName"); const picojson::value &initialValue = FindValue(filter, "initialValue"); const picojson::value &endValue = FindValue(filter, "endValue"); @@ -134,7 +134,7 @@ PlatformResult FilterVisitor::VisitAttributeRangeFilter(const picojson::object & } PlatformResult FilterVisitor::VisitCompositeFilter(const picojson::object &filter) { - LoggerD("Enter"); + ScopeLogger(); CompositeFilterType filter_type; PlatformResult status = CompositeFilterTypeFromString(FromJson(filter, "type"), &filter_type); diff --git a/src/common/platform_result.cc b/src/common/platform_result.cc index ec3a50de..554a6d0e 100644 --- a/src/common/platform_result.cc +++ b/src/common/platform_result.cc @@ -21,7 +21,7 @@ namespace common { PlatformResult::PlatformResult(const ErrorCode& error_code, const std::string& message) : error_code_(error_code), message_(message) { - LoggerD("Enter"); + ScopeLogger(); if (ErrorCode::NO_ERROR != error_code) { LoggerE("PlatformResult: %d, message: %s", error_code, message.c_str()); @@ -29,7 +29,7 @@ PlatformResult::PlatformResult(const ErrorCode& error_code, const std::string& m } picojson::value PlatformResult::ToJSON() const { - LoggerD("Enter"); + ScopeLogger(); picojson::value::object obj; obj["code"] = picojson::value(static_cast(error_code_)); if (!message_.empty()) obj["message"] = picojson::value(message_); diff --git a/src/common/tools.cc b/src/common/tools.cc index 588663f4..6aa28968 100644 --- a/src/common/tools.cc +++ b/src/common/tools.cc @@ -40,12 +40,12 @@ namespace common { namespace tools { void ReportSuccess(picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); out.insert(std::make_pair("status", picojson::value("success"))); } void ReportSuccess(const picojson::value& result, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); out.insert(std::make_pair("status", picojson::value("success"))); out.insert(std::make_pair("result", result)); } @@ -74,7 +74,7 @@ namespace { class AccessControlImpl { public: AccessControlImpl() : initialized_(false) { - LoggerD("Privilege access checked using DB."); + ScopeLogger("Privilege access checked using DB."); const char* kWrtDBPath = "/opt/dbspace/.wrt.db"; sqlite3* db = nullptr; @@ -118,7 +118,7 @@ class AccessControlImpl { } bool CheckAccess(const std::vector& privileges) { - LoggerD("Enter"); + ScopeLogger(); if (!initialized_) { return false; } @@ -150,7 +150,7 @@ class AccessControlImpl { } bool CheckAccess(const std::vector& privileges) { - LoggerD("Enter"); + ScopeLogger(); return true; } @@ -161,7 +161,7 @@ class AccessControlImpl { class AccessControlImpl { public: AccessControlImpl() : cynara_(nullptr) { - LoggerD("Privilege access checked using Cynara."); + ScopeLogger("Privilege access checked using Cynara."); char* smack_label = nullptr; int len = smack_new_label_from_self(&smack_label); @@ -267,7 +267,7 @@ PlatformResult CheckAccess(const std::string& privilege) { } PlatformResult CheckAccess(const std::vector& privileges) { - LoggerD("Enter"); + ScopeLogger(); // Local cache of mapped privilege strings. This routine can be called many times, especially // during application launch, generating a high overhead of retrieving mapped privileges from @@ -339,7 +339,7 @@ PlatformResult CheckAccess(const std::vector& privileges) { } PlatformResult GetPkgApiVersion(std::string* api_version) { - LoggerD("Entered"); + ScopeLogger(); // Local cache of API version string. This can be expensive to retrieve from // underlying databases and this routine can be called many times during @@ -420,7 +420,7 @@ std::vector SplitString(const std::string& str, const std::string& } bool IsAppVersionEarlierThan(const std::string& ver) { - LoggerD("Enter"); + ScopeLogger(); std::string app_ver; auto res = GetPkgApiVersion(&app_ver); if (!res) { @@ -480,7 +480,7 @@ char* BinToHex(const unsigned char* bin, int size, char* hex, int hex_size) { } bool IsPathValid(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); /* * Directory dot-referencing is not allowed @@ -491,7 +491,7 @@ bool IsPathValid(const std::string& path) { } PlatformResult CheckFileStatus(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); struct stat buf; @@ -521,7 +521,7 @@ PlatformResult CheckFileStatus(const std::string& path) { } PlatformResult CheckFileAvailability(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); if (!IsPathValid(path)) { return PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid path: " + path); diff --git a/src/contact/addressbook.cc b/src/contact/addressbook.cc index 755a8579..447b171d 100644 --- a/src/contact/addressbook.cc +++ b/src/contact/addressbook.cc @@ -53,7 +53,7 @@ inline bool IsUnified(long id) { } // anonymous namespace PlatformResult AddressBookGet(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -79,7 +79,7 @@ PlatformResult AddressBookGet(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookAdd(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -135,7 +135,7 @@ PlatformResult AddressBookAdd(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookUpdate(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -177,7 +177,7 @@ PlatformResult AddressBookUpdate(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookRemove(const JsonObject& args, JsonObject&) { - LoggerE("entered"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -198,7 +198,7 @@ PlatformResult AddressBookRemove(const JsonObject& args, JsonObject&) { } PlatformResult AddressBookAddBatch(const JsonObject& args, JsonArray& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -275,7 +275,7 @@ PlatformResult AddressBookAddBatch(const JsonObject& args, JsonArray& out) { } PlatformResult AddressBookUpdateBatch(const JsonObject& args, JsonArray& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -333,7 +333,7 @@ PlatformResult AddressBookUpdateBatch(const JsonObject& args, JsonArray& out) { } PlatformResult AddressBookRemoveBatch(const JsonObject& args) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -358,7 +358,7 @@ PlatformResult AddressBookRemoveBatch(const JsonObject& args) { } PlatformResult AddressBookFind(const JsonObject& args, JsonArray& array) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (!status) return status; @@ -387,7 +387,7 @@ PlatformResult AddressBookFind(const JsonObject& args, JsonArray& array) { } PlatformResult AddressBookAddGroup(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -424,7 +424,7 @@ PlatformResult AddressBookAddGroup(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookGetGroup(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -460,7 +460,7 @@ PlatformResult AddressBookGetGroup(const JsonObject& args, JsonObject& out) { } PlatformResult AddressBookUpdateGroup(const JsonObject& args, JsonObject&) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -509,7 +509,7 @@ PlatformResult AddressBookUpdateGroup(const JsonObject& args, JsonObject&) { } PlatformResult AddressBookRemoveGroup(const JsonObject& args, JsonObject&) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -549,7 +549,7 @@ PlatformResult AddressBookRemoveGroup(const JsonObject& args, JsonObject&) { } PlatformResult AddressBookGetGroups(const JsonObject& args, JsonArray& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -640,7 +640,7 @@ PlatformResult AddressBookGetGroups(const JsonObject& args, JsonArray& out) { namespace { void AddressBookListenerCallback(const char* view_uri, void* user_data) { - LoggerD("entered"); + ScopeLogger(); (void)view_uri; PlatformResult status = ContactUtil::CheckDBConnection(); @@ -787,7 +787,7 @@ void AddressBookListenerCallback(const char* view_uri, void* user_data) { PlatformResult AddressBookStartListening(ContactInstance& instance, const JsonObject&, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; int current_state = 0; @@ -816,7 +816,7 @@ PlatformResult AddressBookStartListening(ContactInstance& instance, const JsonOb } PlatformResult AddressBookStopListening(ContactInstance& instance) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; diff --git a/src/contact/contact_instance.cc b/src/contact/contact_instance.cc index 252bef07..0b58bd8e 100644 --- a/src/contact/contact_instance.cc +++ b/src/contact/contact_instance.cc @@ -37,6 +37,7 @@ const std::string kPrivilegeContactWrite = "http://tizen.org/privilege/contact.w using namespace common; ContactInstance::ContactInstance() : current_state_(0), is_listening_(false) { + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -87,6 +88,7 @@ ContactInstance::ContactInstance() : current_state_(0), is_listening_(false) { } ContactInstance::~ContactInstance() { + ScopeLogger(); if (is_listening_) { AddressBook::AddressBookStopListening(*this); set_is_listening(false); @@ -94,6 +96,7 @@ ContactInstance::~ContactInstance() { } void ContactInstance::AddressBookGet(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -105,6 +108,7 @@ void ContactInstance::AddressBookGet(const JsonValue& args, JsonObject& out) { } void ContactInstance::AddressBookAdd(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -116,12 +120,13 @@ void ContactInstance::AddressBookAdd(const JsonValue& args, JsonObject& out) { } void ContactInstance::AddressBookAddBatch(const JsonValue& args, JsonObject& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); JsonValue result = JsonValue(JsonArray()); PlatformResult status = AddressBook::AddressBookAddBatch(common::JsonCast(args), result.get()); @@ -132,6 +137,7 @@ void ContactInstance::AddressBookAddBatch(const JsonValue& args, JsonObject& out }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -143,12 +149,13 @@ void ContactInstance::AddressBookAddBatch(const JsonValue& args, JsonObject& out } void ContactInstance::AddressBookRemoveBatch(const JsonValue& args, JsonObject& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); PlatformResult status = AddressBook::AddressBookRemoveBatch(common::JsonCast(args)); if (status.IsSuccess()) @@ -158,6 +165,7 @@ void ContactInstance::AddressBookRemoveBatch(const JsonValue& args, JsonObject& }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -169,12 +177,13 @@ void ContactInstance::AddressBookRemoveBatch(const JsonValue& args, JsonObject& } void ContactInstance::AddressBookUpdateBatch(const JsonValue& args, JsonObject& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); JsonValue result = JsonValue(JsonArray()); PlatformResult status = AddressBook::AddressBookUpdateBatch(common::JsonCast(args), result.get()); @@ -185,6 +194,7 @@ void ContactInstance::AddressBookUpdateBatch(const JsonValue& args, JsonObject& }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -196,6 +206,7 @@ void ContactInstance::AddressBookUpdateBatch(const JsonValue& args, JsonObject& } void ContactInstance::AddressBookUpdate(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -207,6 +218,7 @@ void ContactInstance::AddressBookUpdate(const JsonValue& args, JsonObject& out) } void ContactInstance::AddressBookRemove(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -218,11 +230,12 @@ void ContactInstance::AddressBookRemove(const JsonValue& args, JsonObject& out) } void ContactInstance::AddressBookFind(const JsonValue& args, JsonObject& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); JsonValue result = JsonValue(JsonArray()); PlatformResult status = AddressBook::AddressBookFind(JsonCast(args), result.get()); @@ -233,6 +246,7 @@ void ContactInstance::AddressBookFind(const JsonValue& args, JsonObject& out) { }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -244,6 +258,7 @@ void ContactInstance::AddressBookFind(const JsonValue& args, JsonObject& out) { } void ContactInstance::AddressBookAddGroup(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -255,6 +270,7 @@ void ContactInstance::AddressBookAddGroup(const JsonValue& args, JsonObject& out } void ContactInstance::AddressBookGetGroup(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -266,6 +282,7 @@ void ContactInstance::AddressBookGetGroup(const JsonValue& args, JsonObject& out } void ContactInstance::AddressBookUpdateGroup(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = AddressBook::AddressBookUpdateGroup(common::JsonCast(args), @@ -277,6 +294,7 @@ void ContactInstance::AddressBookUpdateGroup(const JsonValue& args, JsonObject& } void ContactInstance::AddressBookRemoveGroup(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = AddressBook::AddressBookRemoveGroup(common::JsonCast(args), @@ -288,6 +306,7 @@ void ContactInstance::AddressBookRemoveGroup(const JsonValue& args, JsonObject& } void ContactInstance::AddressBookGetGroups(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonArray{}}; PlatformResult status = @@ -299,11 +318,13 @@ void ContactInstance::AddressBookGetGroups(const JsonValue& args, JsonObject& ou } void ContactInstance::ContactManagerGetAddressBooks(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); JsonValue result = JsonValue(JsonArray()); PlatformResult status = ContactManager::ContactManagerGetAddressBooks( common::JsonCast(args), result.get()); @@ -315,6 +336,7 @@ void ContactInstance::ContactManagerGetAddressBooks(const JsonValue& args, JsonO }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -326,6 +348,7 @@ void ContactInstance::ContactManagerGetAddressBooks(const JsonValue& args, JsonO } void ContactInstance::ContactManagerGetAddressBook(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonObject{}}; PlatformResult status = ContactManager::ContactManagerGetAddressBook( @@ -337,6 +360,7 @@ void ContactInstance::ContactManagerGetAddressBook(const JsonValue& args, JsonOb } void ContactInstance::ContactManagerAddAddressBook(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = ContactManager::ContactManagerAddAddressBook( @@ -348,6 +372,7 @@ void ContactInstance::ContactManagerAddAddressBook(const JsonValue& args, JsonOb } void ContactInstance::ContactManagerRemoveAddressBook(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = ContactManager::ContactManagerRemoveAddressBook( @@ -359,6 +384,7 @@ void ContactInstance::ContactManagerRemoveAddressBook(const JsonValue& args, Jso } void ContactInstance::AddressBookStartListening(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonObject{}}; PlatformResult status = AddressBook::AddressBookStartListening( @@ -370,6 +396,7 @@ void ContactInstance::AddressBookStartListening(const JsonValue& args, JsonObjec } void ContactInstance::AddressBookStopListening(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonObject{}}; PlatformResult status = AddressBook::AddressBookStopListening(*this); @@ -380,6 +407,7 @@ void ContactInstance::AddressBookStopListening(const JsonValue& args, JsonObject } void ContactInstance::ContactManagerGet(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -391,6 +419,7 @@ void ContactInstance::ContactManagerGet(const JsonValue& args, JsonObject& out) } void ContactInstance::ContactManagerUpdate(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = ContactManager::ContactManagerUpdate(common::JsonCast(args), @@ -402,12 +431,13 @@ void ContactInstance::ContactManagerUpdate(const JsonValue& args, JsonObject& ou } void ContactInstance::ContactManagerUpdateBatch(const JsonValue& args, JsonObject& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); PlatformResult status = ContactManager::ContactManagerUpdateBatch(common::JsonCast(args)); @@ -418,6 +448,7 @@ void ContactInstance::ContactManagerUpdateBatch(const JsonValue& args, JsonObjec }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -429,6 +460,7 @@ void ContactInstance::ContactManagerUpdateBatch(const JsonValue& args, JsonObjec } void ContactInstance::ContactManagerRemove(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = ContactManager::ContactManagerRemove(common::JsonCast(args), @@ -440,12 +472,13 @@ void ContactInstance::ContactManagerRemove(const JsonValue& args, JsonObject& ou } void ContactInstance::ContactManagerRemoveBatch(const JsonValue& args, JsonObject& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); PlatformResult status = ContactManager::ContactManagerRemoveBatch(common::JsonCast(args)); @@ -456,6 +489,7 @@ void ContactInstance::ContactManagerRemoveBatch(const JsonValue& args, JsonObjec }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -467,10 +501,12 @@ void ContactInstance::ContactManagerRemoveBatch(const JsonValue& args, JsonObjec } void ContactInstance::ContactManagerFind(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); const double callback_id = args.get("callbackId").get(); auto get = [this, args](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); JsonValue result = JsonValue(JsonArray()); PlatformResult status = ContactManager::ContactManagerFind(common::JsonCast(args), @@ -483,6 +519,7 @@ void ContactInstance::ContactManagerFind(const JsonValue& args, JsonObject& out) }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -494,11 +531,12 @@ void ContactInstance::ContactManagerFind(const JsonValue& args, JsonObject& out) } void ContactInstance::ContactManagerFindByUsageCount(const JsonValue& args, JsonObject& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); const double callback_id = args.get("callbackId").get(); auto get = [this, args](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); JsonValue result = JsonValue(JsonArray()); PlatformResult status = ContactManager::ContactManagerFindByUsageCount( @@ -511,6 +549,7 @@ void ContactInstance::ContactManagerFindByUsageCount(const JsonValue& args, Json }; auto get_response = [this, callback_id](const std::shared_ptr& response) { + ScopeLogger("Entered into asynchronous function, get_response"); JsonObject& obj = response->get(); obj["callbackId"] = picojson::value(static_cast(callback_id)); Instance::PostMessage(this, response->serialize().c_str()); @@ -522,6 +561,7 @@ void ContactInstance::ContactManagerFindByUsageCount(const JsonValue& args, Json } void ContactInstance::ContactManagerImportFromVCard(const JsonValue& args, JsonObject& out) { + ScopeLogger(); JsonValue val{JsonObject{}}; PlatformResult status = ContactManager::ContactManagerImportFromVCard( common::JsonCast(args), val.get()); @@ -532,6 +572,7 @@ void ContactInstance::ContactManagerImportFromVCard(const JsonValue& args, JsonO } void ContactInstance::ContactManagerStartListening(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonObject{}}; PlatformResult status = ContactManager::ContactManagerStartListening( @@ -543,6 +584,7 @@ void ContactInstance::ContactManagerStartListening(const JsonValue& args, JsonOb } void ContactInstance::ContactManagerStopListening(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactRead, &out); JsonValue val{JsonObject{}}; PlatformResult status = ContactManager::ContactManagerStopListening( @@ -554,6 +596,7 @@ void ContactInstance::ContactManagerStopListening(const JsonValue& args, JsonObj } void ContactInstance::PersonLink(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -565,6 +608,7 @@ void ContactInstance::PersonLink(const JsonValue& args, JsonObject& out) { } void ContactInstance::PersonUnlink(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); JsonValue val{JsonObject{}}; PlatformResult status = @@ -588,6 +632,7 @@ void ContactInstance::PersonGetUsageCount(const JsonValue& args, JsonObject& out } void ContactInstance::PersonResetUsageCount(const JsonValue& args, JsonObject& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContactWrite, &out); PlatformResult status = Person::PersonResetUsageCount(common::JsonCast(args)); if (status.IsSuccess()) { diff --git a/src/contact/contact_manager.cc b/src/contact/contact_manager.cc index e6c519a8..6fe6b982 100644 --- a/src/contact/contact_manager.cc +++ b/src/contact/contact_manager.cc @@ -42,7 +42,7 @@ const char* kTokenDelimiter = " ,:"; using namespace common; PlatformResult ContactManagerGetAddressBooks(const JsonObject& args, JsonArray& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -113,7 +113,7 @@ PlatformResult ContactManagerGetAddressBooks(const JsonObject& args, JsonArray& } PlatformResult ContactManagerGetAddressBook(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -152,7 +152,7 @@ PlatformResult ContactManagerGetAddressBook(const JsonObject& args, JsonObject& namespace { PlatformResult ContactManagerGetInternal(int person_id, JsonObject* out) { - LoggerD("Enter"); + ScopeLogger(); contacts_record_h contacts_record = nullptr; int error_code = contacts_db_get_record(_contacts_person._uri, person_id, &contacts_record); @@ -179,7 +179,7 @@ PlatformResult ContactManagerGetInternal(int person_id, JsonObject* out) { } PlatformResult ContactManagerAddAddressBook(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -227,7 +227,7 @@ PlatformResult ContactManagerAddAddressBook(const JsonObject& args, JsonObject& } PlatformResult ContactManagerRemoveAddressBook(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -252,7 +252,7 @@ PlatformResult ContactManagerRemoveAddressBook(const JsonObject& args, JsonObjec } PlatformResult ContactManagerGet(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -262,7 +262,7 @@ PlatformResult ContactManagerGet(const JsonObject& args, JsonObject& out) { } PlatformResult ContactManagerUpdate(const JsonObject& args, JsonObject&) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -292,7 +292,7 @@ PlatformResult ContactManagerUpdate(const JsonObject& args, JsonObject&) { } PlatformResult ContactManagerUpdateBatch(const JsonObject& args) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -340,7 +340,7 @@ PlatformResult ContactManagerUpdateBatch(const JsonObject& args) { } PlatformResult ContactManagerRemove(const JsonObject& args, JsonObject&) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -360,7 +360,7 @@ PlatformResult ContactManagerRemove(const JsonObject& args, JsonObject&) { } PlatformResult ContactManagerRemoveBatch(const JsonObject& args) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -387,7 +387,7 @@ PlatformResult ContactManagerRemoveBatch(const JsonObject& args) { } PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -778,7 +778,7 @@ PlatformResult ContactManagerFind(const JsonObject& args, JsonArray& out) { } PlatformResult ContactManagerFindByUsageCount(const JsonObject& args, JsonArray& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; contacts_query_h contacts_query = nullptr; @@ -961,7 +961,7 @@ PlatformResult ContactManagerFindByUsageCount(const JsonObject& args, JsonArray& } PlatformResult ContactManagerImportFromVCard(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); // I'm not sure how to call it. Should it be 'Contact', 'vCard' or what? PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -1011,7 +1011,7 @@ bool IsNumeric(const char* s) { } void ContactManagerListenerCallback(const char* view_uri, char* changes, void* user_data) { - LoggerD("ContactManagerListenerCallback"); + ScopeLogger("ContactManagerListenerCallback"); (void)view_uri; @@ -1111,7 +1111,7 @@ void ContactManagerListenerCallback(const char* view_uri, char* changes, void* u PlatformResult ContactManagerStartListening(ContactInstance& instance, const JsonObject& /*args*/, JsonObject& /*out*/) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -1129,7 +1129,7 @@ PlatformResult ContactManagerStartListening(ContactInstance& instance, const Jso PlatformResult ContactManagerStopListening(ContactInstance& instance, const JsonObject& /*args*/, JsonObject& /*out*/) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; diff --git a/src/contact/contact_search_engine.cc b/src/contact/contact_search_engine.cc index 5bc09e6a..2769e2cf 100644 --- a/src/contact/contact_search_engine.cc +++ b/src/contact/contact_search_engine.cc @@ -217,17 +217,17 @@ ContactSearchEngine::ContactSearchEngine() is_filter_set_(false), is_sort_mode_set_(false), is_sort_mode_asc_(false) { - LoggerD("Entered"); + ScopeLogger(); } void ContactSearchEngine::SetAddressBookId(long id) { - LoggerD("Entered"); + ScopeLogger(); addressbook_id_ = id; is_addressbook_id_is_set_ = true; } common::PlatformResult ContactSearchEngine::ApplyFilter(const picojson::value& filter, int depth) { - LoggerD("Entered"); + ScopeLogger(); if (!filter.is()) { return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "Failed to set filter"); @@ -287,7 +287,7 @@ common::PlatformResult ContactSearchEngine::ApplyFilter(const picojson::value& f } PlatformResult ContactSearchEngine::SetSortMode(const picojson::value& sort_mode) { - LoggerD("Entered"); + ScopeLogger(); if (!sort_mode.is()) { return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "Failed to set sort mode"); @@ -309,7 +309,7 @@ PlatformResult ContactSearchEngine::SetSortMode(const picojson::value& sort_mode } common::PlatformResult ContactSearchEngine::Find(picojson::array* out) { - LoggerD("Entered"); + ScopeLogger(); if (is_filter_set_) { if (is_sort_mode_set_) { @@ -347,7 +347,7 @@ PlatformResult ContactSearchEngine::ApplyAttributeFilter(const std::string& name common::AttributeMatchFlag match_flag, const picojson::value& match_value, int depth) { - LoggerD("Entered"); + ScopeLogger(); LongSetPtr id_set = LongSetPtr(new LongSet()); @@ -465,7 +465,7 @@ PlatformResult ContactSearchEngine::ApplyAttributeRangeFilter(const std::string& const picojson::value& initial_value, const picojson::value& end_value, int depth) { - LoggerD("Entered"); + ScopeLogger(); bool initial_value_set = (!IsNull(initial_value)); bool end_value_set = (!IsNull(end_value)); @@ -570,7 +570,7 @@ PlatformResult ContactSearchEngine::ApplyAttributeRangeFilter(const std::string& PlatformResult ContactSearchEngine::GetAllContactsSorted( const FilterPropertyStruct& attribute_properties, bool is_ascending, picojson::array* out) { - LoggerD("Entered"); + ScopeLogger(); LongVectorPtr sorted_ids = LongVectorPtr(new LongVector()); SortContacts(attribute_properties, sorted_ids, is_ascending); @@ -579,7 +579,7 @@ PlatformResult ContactSearchEngine::GetAllContactsSorted( } PlatformResult ContactSearchEngine::GetAllContacts(picojson::array* out) { - LoggerD("Entered"); + ScopeLogger(); contacts_list_h list = nullptr; int error_code = 0; @@ -663,7 +663,7 @@ PlatformResult ContactSearchEngine::GetAllContacts(picojson::array* out) { template PlatformResult ContactSearchEngine::GetContacts(Iterator begin, Iterator end, picojson::array* out) { - LoggerD("Entered"); + ScopeLogger(); for (auto iter = begin; iter != end; ++iter) { const auto id = *iter; @@ -715,7 +715,7 @@ common::PlatformResult ContactSearchEngine::GetQueryResults(contacts_query_h que contacts_filter_h filter, unsigned int property_id, LongSetPtr result) { - LoggerD("Entered"); + ScopeLogger(); int error_code = contacts_query_set_filter(query, filter); auto status = ContactUtil::ErrorChecker(error_code, "Failed contacts_query_set_filter"); @@ -757,7 +757,7 @@ common::PlatformResult ContactSearchEngine::GetQueryResults(contacts_query_h que PlatformResult ContactSearchEngine::QueryAttributeBool( const FilterPropertyStruct& attribute_properties, LongSetPtr result, bool match_value) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -788,7 +788,7 @@ PlatformResult ContactSearchEngine::QueryAttributeBool( PlatformResult ContactSearchEngine::QueryAttributeInt( const FilterPropertyStruct& attribute_properties, LongSetPtr result, contacts_match_int_flag_e match, int match_value) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -819,7 +819,7 @@ PlatformResult ContactSearchEngine::QueryAttributeInt( PlatformResult ContactSearchEngine::QueryAttributeString( const FilterPropertyStruct& attribute_properties, LongSetPtr result, contacts_match_str_flag_e match, const char* match_value) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -854,7 +854,7 @@ PlatformResult ContactSearchEngine::QueryAttributeString( PlatformResult ContactSearchEngine::QueryAttributeDate( const std::string& attr_name, const FilterPropertyStruct& attribute_properties, LongSetPtr result, contacts_match_int_flag_e match, int match_value) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -905,7 +905,7 @@ PlatformResult ContactSearchEngine::QueryAttributeDate( PlatformResult ContactSearchEngine::QueryAttributeRangeBool( const FilterPropertyStruct& attribute_properties, LongSetPtr result, bool initial_value_is_set, bool initial_value, bool end_value_is_set, bool end_value) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -958,7 +958,7 @@ PlatformResult ContactSearchEngine::QueryAttributeRangeBool( PlatformResult ContactSearchEngine::QueryAttributeRangeInt( const FilterPropertyStruct& attribute_properties, LongSetPtr result, bool initial_value_is_set, int initial_value, bool end_value_is_set, int end_value) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -1023,7 +1023,7 @@ PlatformResult ContactSearchEngine::QueryAttributeRangeInt( PlatformResult ContactSearchEngine::QueryAttributeRangeString( const FilterPropertyStruct& attribute_properties, LongSetPtr result, const char* initial_value, const char* end_value) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -1088,7 +1088,7 @@ PlatformResult ContactSearchEngine::QueryAttributeRangeDate( const std::string& attr_name, const FilterPropertyStruct& attribute_properties, LongSetPtr result, bool initial_value_is_set, int initial_value, bool end_value_is_set, int end_value) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -1161,7 +1161,7 @@ PlatformResult ContactSearchEngine::QueryAttributeRangeDate( PlatformResult ContactSearchEngine::SortContacts(const FilterPropertyStruct& attribute_properties, LongVectorPtr result, bool is_ascending, LongSetPtr ids) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; @@ -1253,7 +1253,7 @@ PlatformResult ContactSearchEngine::SortContacts(const FilterPropertyStruct& att PlatformResult ContactSearchEngine::SortContacts(const FilterPropertyStruct& attribute_properties, LongVectorPtr result, bool is_ascending) { - LoggerD("Entered"); + ScopeLogger(); const char* view_uri = attribute_properties.view_uri; unsigned int property_contact_id = attribute_properties.property_contact_id; diff --git a/src/contact/contact_util.cc b/src/contact/contact_util.cc index 6dd2c1ca..52b6aa08 100644 --- a/src/contact/contact_util.cc +++ b/src/contact/contact_util.cc @@ -151,7 +151,7 @@ static const char kContactInstantMessageTypeCustom[] = "CUSTOM"; } PlatformResult ErrorChecker(int err, const char* message) { - LoggerD("Enter"); + ScopeLogger(); if (CONTACTS_ERROR_NONE != err) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, message); } @@ -160,7 +160,7 @@ PlatformResult ErrorChecker(int err, const char* message) { } PlatformResult GetStrFromRecord(contacts_record_h record, unsigned int property_id, char** value) { - LoggerD("Enter"); + ScopeLogger(); int err = contacts_record_get_str_p(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error during getting contact record", @@ -171,7 +171,7 @@ PlatformResult GetStrFromRecord(contacts_record_h record, unsigned int property_ } PlatformResult GetIntFromRecord(contacts_record_h record, unsigned int property_id, int* value) { - LoggerD("Enter"); + ScopeLogger(); int err = contacts_record_get_int(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error during getting contact record", @@ -182,7 +182,7 @@ PlatformResult GetIntFromRecord(contacts_record_h record, unsigned int property_ } PlatformResult GetBoolFromRecord(contacts_record_h record, unsigned int property_id, bool* value) { - LoggerD("Enter"); + ScopeLogger(); int err = contacts_record_get_bool(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error during getting contact record", @@ -194,7 +194,7 @@ PlatformResult GetBoolFromRecord(contacts_record_h record, unsigned int property PlatformResult SetStrInRecord(contacts_record_h record, unsigned int property_id, const char* value) { - LoggerD("Enter"); + ScopeLogger(); int err = contacts_record_set_str(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { return LogAndCreateResult( @@ -206,7 +206,7 @@ PlatformResult SetStrInRecord(contacts_record_h record, unsigned int property_id } PlatformResult SetIntInRecord(contacts_record_h record, unsigned int property_id, int value) { - LoggerD("Enter"); + ScopeLogger(); int err = contacts_record_set_int(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error during setting contact record", @@ -217,7 +217,7 @@ PlatformResult SetIntInRecord(contacts_record_h record, unsigned int property_id } PlatformResult SetBoolInRecord(contacts_record_h record, unsigned int property_id, bool value) { - LoggerD("Enter"); + ScopeLogger(); int err = contacts_record_set_bool(record, property_id, value); if (CONTACTS_ERROR_NONE != err) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error during setting contact record", @@ -228,7 +228,7 @@ PlatformResult SetBoolInRecord(contacts_record_h record, unsigned int property_i } PlatformResult ClearAllContactRecord(contacts_record_h contacts_record, unsigned int property_id) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -266,7 +266,7 @@ PlatformResult ClearAllContactRecord(contacts_record_h contacts_record, unsigned PlatformResult GetNumberOfChildRecord(contacts_record_h contacts_record, unsigned int property_id, int* child_count) { - LoggerD("Enter"); + ScopeLogger(); Assert(child_count); int err = contacts_record_get_child_record_count(contacts_record, property_id, child_count); @@ -279,7 +279,7 @@ PlatformResult GetNumberOfChildRecord(contacts_record_h contacts_record, unsigne PlatformResult ImportContactNameFromContactsRecord(contacts_record_h contacts_record, JsonObject* out_ptr, bool* is_contact_name) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; if (!contacts_record) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Contacts record is null"); @@ -418,7 +418,7 @@ PlatformResult ImportContactNameFromContactsRecord(contacts_record_h contacts_re PlatformResult ExportContactNameToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -563,7 +563,7 @@ PlatformResult ExportContactNameToContactsRecord(contacts_record_h contacts_reco PlatformResult ImportContactEmailAddressFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -641,7 +641,7 @@ PlatformResult ImportContactEmailAddressFromContactsRecord(contacts_record_h con PlatformResult ExportContactEmailAddressToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); contacts_record_h c_email_record_h = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -719,7 +719,7 @@ PlatformResult ExportContactEmailAddressToContactsRecord(contacts_record_h conta PlatformResult ImportContactPhoneNumberFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; contacts_record_h child_record = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed @@ -827,7 +827,7 @@ PlatformResult ImportContactPhoneNumberFromContactsRecord(contacts_record_h cont PlatformResult ExportContactPhoneNumberToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); contacts_record_h phone_record = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -930,7 +930,7 @@ PlatformResult ExportContactPhoneNumberToContactsRecord(contacts_record_h contac PlatformResult ImportContactOrganizationFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -993,7 +993,7 @@ PlatformResult ImportContactOrganizationFromContactsRecord(contacts_record_h con PlatformResult ExportContactOrganizationToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1068,7 +1068,7 @@ PlatformResult ExportContactOrganizationToContactsRecord(contacts_record_h conta PlatformResult ImportContactWebSiteFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1109,7 +1109,7 @@ PlatformResult ImportContactWebSiteFromContactsRecord(contacts_record_h contacts PlatformResult ExportContactWebSiteToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1170,7 +1170,7 @@ PlatformResult ExportContactWebSiteToContactsRecord(contacts_record_h contacts_r PlatformResult ImportContactAnniversariesFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr, bool* ret) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1223,7 +1223,7 @@ PlatformResult ImportContactAnniversariesFromContactsRecord(contacts_record_h co PlatformResult ExportContactAnniversariesToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1285,7 +1285,7 @@ PlatformResult ExportContactAnniversariesToContactsRecord(contacts_record_h cont PlatformResult ImportContactRelationshipFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1408,7 +1408,7 @@ PlatformResult ImportContactRelationshipFromContactsRecord(contacts_record_h con PlatformResult ExportContactRelationshipToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1498,7 +1498,7 @@ PlatformResult ExportContactRelationshipToContactsRecord(contacts_record_h conta PlatformResult ImportContactExtensionFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1524,6 +1524,7 @@ PlatformResult ImportContactExtensionFromContactsRecord(contacts_record_h contac picojson::value(data1 ? JsonValue{static_cast(data1)} : JsonValue{}))); auto insert_data = [&](unsigned int id, const std::string& label) { + ScopeLogger("Entered into asynchronous function, insert_data"); char* data = nullptr; status = ContactUtil::GetStrFromRecord(child_record, id, &data); if (status && data) { @@ -1602,7 +1603,7 @@ PlatformResult ImportContactExtensionFromContactsRecord(contacts_record_h contac PlatformResult ExportContactExtensionToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1628,6 +1629,8 @@ PlatformResult ExportContactExtensionToContactsRecord(contacts_record_h contacts } auto set_data = [&](int id, const char* label) { + ScopeLogger("Entered into asynchronous function, set_data"); + if (!IsNull(in, label)) { status = ContactUtil::SetStrInRecord(child_record, id, FromJson(in, label).c_str()); @@ -1716,7 +1719,7 @@ PlatformResult ExportContactExtensionToContactsRecord(contacts_record_h contacts PlatformResult ImportContactInstantMessengerFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1809,7 +1812,7 @@ PlatformResult ImportContactInstantMessengerFromContactsRecord(contacts_record_h PlatformResult ExportContactInstantMessengerToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -1891,7 +1894,7 @@ PlatformResult ExportContactInstantMessengerToContactsRecord(contacts_record_h c PlatformResult ImportContactAddressFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -1998,7 +2001,7 @@ PlatformResult ImportContactAddressFromContactsRecord(contacts_record_h contacts PlatformResult ExportContactAddressToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -2117,7 +2120,7 @@ PlatformResult ExportContactAddressToContactsRecord(contacts_record_h contacts_r PlatformResult ImportContactNotesFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonValue* val) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -2147,7 +2150,7 @@ PlatformResult ImportContactNotesFromContactsRecord(contacts_record_h contacts_r PlatformResult ExportNotesToContactsRecord(contacts_record_h contacts_record, const std::string& value) { - LoggerD("Enter"); + ScopeLogger(); contacts_record_h notes_record = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -2185,7 +2188,7 @@ PlatformResult ExportNotesToContactsRecord(contacts_record_h contacts_record, PlatformResult ImportGroupIdsFromContactsRecord(contacts_record_h contacts_record, unsigned int index, JsonValue* val) { - LoggerD("Enter"); + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -2219,7 +2222,7 @@ PlatformResult ImportGroupIdsFromContactsRecord(contacts_record_h contacts_recor } PlatformResult ExportGroupIdsToContactsRecord(contacts_record_h contacts_record, int value) { - LoggerD("Enter"); + ScopeLogger(); contacts_record_h notes_record = nullptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -2259,7 +2262,7 @@ PlatformResult ExportGroupIdsToContactsRecord(contacts_record_h contacts_record, PlatformResult ImportContactFromContactsRecord(contacts_record_h contacts_record, JsonObject* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); JsonObject& out = *out_ptr; // contacts_record is protected by unique_ptr and its ownership is not passed // here @@ -2490,6 +2493,7 @@ PlatformResult ImportContactFromContactsRecord(contacts_record_h contacts_record PlatformResult ExportContactToContactsRecord(contacts_record_h contacts_record, const JsonObject& in) { + ScopeLogger(); // contacts_record is protected by unique_ptr and its ownership is not passed // here if (!contacts_record) { @@ -2898,6 +2902,7 @@ PlatformResult ImportPersonFromContactsRecord(contacts_record_h record, JsonObje * @param[out] contacts_record_h Record which is updated */ PlatformResult ExportPersonToContactsRecord(contacts_record_h record, const JsonObject& args) { + ScopeLogger(); if (nullptr == record) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Platform person object did not set"); } @@ -2951,6 +2956,7 @@ PlatformResult ExportPersonToContactsRecord(contacts_record_h record, const Json PlatformResult UpdateAdditionalInformation(const contacts_record_h contacts_record, JsonObject* out_ptr) { + ScopeLogger(); JsonObject& out = *out_ptr; int int_value = -1; PlatformResult status = @@ -2991,6 +2997,7 @@ PlatformResult UpdateAdditionalInformation(const contacts_record_h contacts_reco } PlatformResult CheckDBConnection() { + ScopeLogger(); static bool _connected = false; if (_connected) return PlatformResult(ErrorCode::NO_ERROR); diff --git a/src/contact/person.cc b/src/contact/person.cc index f407a344..909d221a 100644 --- a/src/contact/person.cc +++ b/src/contact/person.cc @@ -67,7 +67,7 @@ const char* kGetUsageCountResultUsageCount = "usageCount"; }; PlatformResult PersonLink(const JsonObject& args, JsonObject&) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -94,7 +94,7 @@ PlatformResult PersonLink(const JsonObject& args, JsonObject&) { } PlatformResult PersonUnlink(const JsonObject& args, JsonObject& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -151,7 +151,7 @@ PlatformResult PersonUnlink(const JsonObject& args, JsonObject& out) { } PlatformResult GetUsageCount(const JsonObject& args, JsonObject& out) { - LoggerD("Entered"); + ScopeLogger(); // Retrieve person_id long person_id = common::stol(FromJson(args, kGetUsageCountArgPersonId)); @@ -274,7 +274,7 @@ PlatformResult ResetUsageCount(const long& person_id, const std::string& type) { } PlatformResult PersonResetUsageCount(const JsonObject& args) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = ContactUtil::CheckDBConnection(); if (status.IsError()) return status; @@ -291,7 +291,7 @@ PlatformResult PersonResetUsageCount(const JsonObject& args) { } PlatformResult PersonPropertyFromString(const std::string& name, PersonProperty* person_prop) { - LoggerD("Enter"); + ScopeLogger(); auto iter = personPropertyMap.find(name); if (iter == personPropertyMap.end()) { return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Invalid property name", diff --git a/src/content/content_filter.cc b/src/content/content_filter.cc index 130b0d50..cb693109 100644 --- a/src/content/content_filter.cc +++ b/src/content/content_filter.cc @@ -57,7 +57,7 @@ std::map const attributeNameMap = { }; std::string escapeValueString(const std::string& data) { - LoggerD("Enter"); + ScopeLogger(); std::string out; // If string won't be resized, then it will be faster out.reserve(data.size()); @@ -81,7 +81,7 @@ std::string escapeValueString(const std::string& data) { } // namespace PlatformResult ContentFilter::MapField(const std::string& name, std::string* result) { - LoggerD("Enter"); + ScopeLogger(); auto it = attributeNameMap.find(name); if (it != attributeNameMap.end()) { *result = it->second; @@ -93,13 +93,13 @@ PlatformResult ContentFilter::MapField(const std::string& name, std::string* res PlatformResult ContentFilter::BuildQuery(const picojson::object& jsFilter, std::string* queryToCall) { - LoggerD("Enter"); + ScopeLogger(); std::vector> partialqueries; partialqueries.push_back(std::vector()); visitor.SetOnAttributeFilter([&](const std::string& name, AttributeMatchFlag match_flag, const picojson::value& match_value) { - LoggerD("entered OnAttributeFilter"); + ScopeLogger("Entered into asynchronous function, visitor.SetOnAttributeFilter's argument"); std::string query; std::string matchValue; @@ -162,13 +162,13 @@ PlatformResult ContentFilter::BuildQuery(const picojson::object& jsFilter, }); visitor.SetOnCompositeFilterBegin([&](CompositeFilterType type) { - LoggerD("entered OnCompositeFilterBegin"); + ScopeLogger("Entered into asynchronous function, visitor.SetOnCompositeFilterBegin's argument"); partialqueries.push_back(std::vector()); return PlatformResult(ErrorCode::NO_ERROR); }); visitor.SetOnCompositeFilterEnd([&](CompositeFilterType calType) { - LoggerD("entered OnCompositeFilterEnd"); + ScopeLogger("Entered into asynchronous function, visitor.SetOnCompositeFilterEnd's argument"); std::string finalQuery; std::string separator; @@ -200,7 +200,7 @@ PlatformResult ContentFilter::BuildQuery(const picojson::object& jsFilter, visitor.SetOnAttributeRangeFilter([&](const std::string& name, const picojson::value& initial_value, const picojson::value& end_value) { - LoggerD("entered OnAttributeFilter"); + ScopeLogger("Entered into asynchronous function, visitor.SetOnAttributeRangeFilter's argument"); std::string query = ""; std::string paramName; diff --git a/src/content/content_instance.cc b/src/content/content_instance.cc index 587bca64..6722aa5e 100644 --- a/src/content/content_instance.cc +++ b/src/content/content_instance.cc @@ -52,6 +52,7 @@ ContentInstance::ContentInstance() listener_handle_(nullptr), listener_data_(nullptr), callback_data_(nullptr) { + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -92,7 +93,7 @@ ContentInstance::ContentInstance() } ContentInstance::~ContentInstance() { - LoggerD("entered"); + ScopeLogger(); if (noti_handle_) { media_content_remove_db_updated_cb(noti_handle_); @@ -118,7 +119,7 @@ ContentInstance::~ContentInstance() { } static gboolean CompletedCallback(const std::shared_ptr& user_data) { - LoggerD("entered"); + ScopeLogger(); picojson::object out; out["callbackId"] = picojson::value(user_data->callbackId); @@ -135,7 +136,7 @@ static gboolean CompletedCallback(const std::shared_ptr& user } static void* WorkThread(const std::shared_ptr& user_data) { - LoggerD("entered"); + ScopeLogger(); int ret = MEDIA_CONTENT_ERROR_NONE; ContentCallbacks cbType = user_data->cbType; @@ -224,7 +225,7 @@ static void* WorkThread(const std::shared_ptr& user_data) { } static void ScanDirectoryCallback(media_content_error_e error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); ReplyCallbackData* cbData = (ReplyCallbackData*)user_data; @@ -247,7 +248,7 @@ static void changedContentV1Callback(media_content_error_e error, int pid, media_content_db_update_type_e update_type, media_content_type_e media_type, char* uuid, char* path, char* mime_type, void* user_data) { - LoggerD("Entered file change callback"); + ScopeLogger("File change callback"); if (error != MEDIA_CONTENT_ERROR_NONE) { LOGGER(ERROR) << "Media content changed callback error: " << error; @@ -302,7 +303,7 @@ static void changedContentV2Callback(media_content_error_e error, int pid, media_content_db_update_type_e update_type, media_content_type_e media_type, char* uuid, char* path, char* mime_type, void* user_data) { - LoggerD("Entered directory change callback"); + ScopeLogger("Directory change callback"); if (error != MEDIA_CONTENT_ERROR_NONE) { LOGGER(ERROR) << "Media content changed v2 callback error: " << error; @@ -353,7 +354,7 @@ static void changedContentV2Callback(media_content_error_e error, int pid, static PlatformResult prepareDirectoryChangeResponse(media_content_db_update_type_e update_type, char* uuid, picojson::object& obj) { - LoggerD("Media item is a directory"); + ScopeLogger("Media item is a directory"); if (MEDIA_CONTENT_DELETE == update_type) { ReportSuccess(picojson::value(std::string(uuid)), obj); @@ -392,7 +393,7 @@ static PlatformResult prepareDirectoryChangeResponse(media_content_db_update_typ static PlatformResult prepareFileChangeResponse(media_content_db_update_type_e update_type, char* uuid, picojson::object& obj) { - LoggerD("Media item is a file"); + ScopeLogger("Media item is a file"); if (MEDIA_CONTENT_DELETE == update_type) { ReportSuccess(picojson::value(std::string(uuid)), obj); @@ -434,7 +435,7 @@ static void contentChangeCallback(media_content_error_e error, int pid, media_content_db_update_type_e update_type, media_content_type_e media_type, char* uuid, char* path, char* mime_type, void* user_data) { - LoggerD("Entered directory and file change callback"); + ScopeLogger("directory and file change callback"); if (MEDIA_CONTENT_ERROR_NONE != error) { LoggerE("Failed to perform contentChangeCallback: %d", error); @@ -485,7 +486,7 @@ static void contentChangeCallback(media_content_error_e error, int pid, } void ContentInstance::ContentManagerUpdate(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); if (ContentManager::getInstance()->isConnected()) { @@ -501,8 +502,7 @@ void ContentInstance::ContentManagerUpdate(const picojson::value& args, picojson void ContentInstance::ContentManagerUpdatebatch(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); - LoggerE("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); double callbackId = args.get("callbackId").get(); @@ -520,7 +520,7 @@ void ContentInstance::ContentManagerUpdatebatch(const picojson::value& args, } void ContentInstance::ContentManagerGetdirectories(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out) double callbackId = args.get("callbackId").get(); @@ -538,7 +538,7 @@ void ContentInstance::ContentManagerGetdirectories(const picojson::value& args, common::TaskQueue::GetInstance().Queue(WorkThread, CompletedCallback, cbData); } void ContentInstance::ContentManagerFind(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); // CHECK_PRIVILEGE_ACCESS(kPrivilegeContentRead, &out); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); @@ -560,7 +560,7 @@ void ContentInstance::ContentManagerFind(const picojson::value& args, picojson:: } void ContentInstance::ContentManagerScanfile(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); CHECK_EXIST(args, "callbackId", out) @@ -581,7 +581,7 @@ void ContentInstance::ContentManagerScanfile(const picojson::value& args, picojs void ContentInstance::ContentManagerScanDirectory(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); CHECK_EXIST(args, "callbackId", out) @@ -602,7 +602,7 @@ void ContentInstance::ContentManagerScanDirectory(const picojson::value& args, void ContentInstance::ContentManagerCancelScanDirectory(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); CHECK_EXIST(args, "contentDirURI", out) @@ -617,7 +617,7 @@ void ContentInstance::ContentManagerCancelScanDirectory(const picojson::value& a void ContentInstance::ContentManagerAddChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); callback_data_ = new ReplyCallbackData(); callback_data_->instance = this; @@ -641,7 +641,7 @@ void ContentInstance::ContentManagerAddChangeListener(const picojson::value& arg void ContentInstance::ContentManagerRemoveChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = ContentManager::getInstance()->removeChangeListener(listener_handle_); @@ -656,7 +656,7 @@ void ContentInstance::ContentManagerRemoveChangeListener(const picojson::value& void ContentInstance::ContentManagerSetchangelistener(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: setChangeListener() is deprecated and will be removed from next " "release. " @@ -700,7 +700,7 @@ void ContentInstance::ContentManagerSetchangelistener(const picojson::value& arg void ContentInstance::ContentManagerUnsetchangelistener(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: unsetChangeListener() is deprecated and will be removed from next " "release. " @@ -720,7 +720,7 @@ void ContentInstance::ContentManagerUnsetchangelistener(const picojson::value& a void ContentInstance::ContentManagerGetplaylists(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); // CHECK_PRIVILEGE_ACCESS(kPrivilegeContentRead, &out); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); @@ -744,7 +744,7 @@ void ContentInstance::ContentManagerGetplaylists(const picojson::value& args, } void ContentInstance::ContentManagerCreateplaylist(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); CHECK_EXIST(args, "callbackId", out) @@ -767,7 +767,7 @@ void ContentInstance::ContentManagerCreateplaylist(const picojson::value& args, } void ContentInstance::ContentManagerRemoveplaylist(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); double callbackId = args.get("callbackId").get(); @@ -789,7 +789,7 @@ void ContentInstance::ContentManagerRemoveplaylist(const picojson::value& args, void ContentInstance::ContentManagerCreateThumbnail(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); common::PlatformResult result = common::PlatformResult(common::ErrorCode::NO_ERROR); @@ -806,7 +806,7 @@ void ContentInstance::ContentManagerCreateThumbnail(const picojson::value& args, void ContentInstance::ContentManagerPlaylistAdd(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); if (ContentManager::getInstance()->isConnected()) { @@ -824,7 +824,7 @@ void ContentInstance::ContentManagerPlaylistAdd(const picojson::value& args, void ContentInstance::ContentManagerPlaylistAddbatch(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); double callbackId = args.get("callbackId").get(); @@ -844,7 +844,7 @@ void ContentInstance::ContentManagerPlaylistAddbatch(const picojson::value& args void ContentInstance::ContentManagerPlaylistGet(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); // CHECK_PRIVILEGE_ACCESS(kPrivilegeContentRead, &out); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); @@ -865,7 +865,7 @@ void ContentInstance::ContentManagerPlaylistGet(const picojson::value& args, void ContentInstance::ContentManagerPlaylistRemove(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); if (ContentManager::getInstance()->isConnected()) { @@ -883,7 +883,7 @@ void ContentInstance::ContentManagerPlaylistRemove(const picojson::value& args, void ContentInstance::ContentManagerPlaylistRemovebatch(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); double callbackId = args.get("callbackId").get(); @@ -903,7 +903,7 @@ void ContentInstance::ContentManagerPlaylistRemovebatch(const picojson::value& a void ContentInstance::ContentManagerPlaylistSetorder(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); double callbackId = args.get("callbackId").get(); @@ -923,7 +923,7 @@ void ContentInstance::ContentManagerPlaylistSetorder(const picojson::value& args void ContentInstance::ContentManagerPlaylistMove(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); double callbackId = args.get("callbackId").get(); @@ -943,8 +943,7 @@ void ContentInstance::ContentManagerPlaylistMove(const picojson::value& args, void ContentInstance::ContentManagerAudioGetLyrics(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); - LOGGER(DEBUG) << "entered"; + ScopeLogger(); picojson::object lyrics; if (ContentManager::getInstance()->isConnected()) { @@ -961,7 +960,7 @@ void ContentInstance::ContentManagerAudioGetLyrics(const picojson::value& args, } void ContentInstance::PlaylistGetName(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); int ret; CHECK_EXIST(args, "id", out) int id = static_cast(args.get("id").get()); @@ -975,7 +974,7 @@ void ContentInstance::PlaylistGetName(const picojson::value& args, picojson::obj } void ContentInstance::PlaylistSetName(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); int ret; @@ -992,7 +991,7 @@ void ContentInstance::PlaylistSetName(const picojson::value& args, picojson::obj } void ContentInstance::PlaylistGetThumbnailUri(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); int ret; CHECK_EXIST(args, "id", out) int id = static_cast(args.get("id").get()); @@ -1006,7 +1005,7 @@ void ContentInstance::PlaylistGetThumbnailUri(const picojson::value& args, picoj } void ContentInstance::PlaylistSetThumbnailUri(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeContentWrite, &out); int ret; @@ -1024,7 +1023,7 @@ void ContentInstance::PlaylistSetThumbnailUri(const picojson::value& args, picoj void ContentInstance::PlaylistGetNumberOfTracks(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_EXIST(args, "id", out) int id = static_cast(args.get("id").get()); int count = 0; diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc index 3895e3e7..c12e3db4 100644 --- a/src/content/content_manager.cc +++ b/src/content/content_manager.cc @@ -59,7 +59,7 @@ const std::map orientationMap = { }; std::string get_date(char* tmpStr) { - LoggerD("Enter"); + ScopeLogger(); if (tmpStr) { struct tm* result = (struct tm*)calloc(1, sizeof(struct tm)); if (nullptr != result) { @@ -79,7 +79,7 @@ std::string get_date(char* tmpStr) { } void ContentToJson(media_info_h info, picojson::object& o) { - LoggerD("Enter"); + ScopeLogger(); int ret; int tmpInt = 0; bool tmpBool = false; @@ -356,7 +356,7 @@ void ContentToJson(media_info_h info, picojson::object& o) { } void ContentDirToJson(media_folder_h folder, picojson::object& o) { - LoggerD("Enter"); + ScopeLogger(); int ret; char* tmpStr = NULL; media_content_storage_e storage_type; @@ -412,7 +412,7 @@ void ContentDirToJson(media_folder_h folder, picojson::object& o) { } static int setContent(media_info_h media, const picojson::value& content) { - LoggerD("Enter"); + ScopeLogger(); int ret; std::string name = content.get("name").to_str(); @@ -496,7 +496,7 @@ static int setContent(media_info_h media, const picojson::value& content) { } static void FolderToJson(media_folder_h folder, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); char* name = NULL; char* id = NULL; @@ -565,7 +565,7 @@ static void FolderToJson(media_folder_h folder, picojson::object* out) { } static bool media_foreach_directory_cb(media_folder_h folder, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array* array = static_cast(user_data); picojson::object json; FolderToJson(folder, &json); @@ -574,7 +574,7 @@ static bool media_foreach_directory_cb(media_folder_h folder, void* user_data) { } static bool media_foreach_content_cb(media_info_h media, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::value::array* contents = static_cast(user_data); picojson::value::object o; ContentToJson(media, o); @@ -583,7 +583,7 @@ static bool media_foreach_content_cb(media_info_h media, void* user_data) { } static bool playlist_foreach_cb(media_playlist_h playlist, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::value::array* playlists = static_cast(user_data); picojson::value::object o; if (playlist != NULL) { @@ -634,7 +634,7 @@ static bool playlist_foreach_cb(media_playlist_h playlist, void* user_data) { static bool playlist_content_member_cb(int playlist_member_id, media_info_h media, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::value::array* contents = static_cast(user_data); picojson::value::object o; @@ -645,7 +645,7 @@ static bool playlist_content_member_cb(int playlist_member_id, media_info_h medi } void CreateThumbnailCallback(media_content_error_e err, const char* path, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); unsigned int* callbackId = (unsigned int*)user_data; if (nullptr == callbackId) { @@ -678,7 +678,7 @@ void CreateThumbnailCallback(media_content_error_e err, const char* path, void* } ContentManager::ContentManager() { - LoggerD("ContentManager called"); + ScopeLogger("ContentManager called"); if (media_content_connect() == MEDIA_CONTENT_ERROR_NONE) { m_dbConnected = true; } else { @@ -688,7 +688,7 @@ ContentManager::ContentManager() { } ContentManager::~ContentManager() { - LoggerD("Enter"); + ScopeLogger(); if (m_dbConnected) { if (media_content_disconnect() == MEDIA_CONTENT_ERROR_NONE) { m_dbConnected = false; @@ -697,28 +697,28 @@ ContentManager::~ContentManager() { } ContentManager* ContentManager::getInstance() { - LoggerD("Enter"); + ScopeLogger(); static ContentManager instance; return &instance; } ContentInstance* ContentManager::getContentInstance() { - LoggerD("Enter"); + ScopeLogger(); return m_contentInstance; } void ContentManager::setContentInstance(ContentInstance* const content_instance) { - LoggerD("Enter"); + ScopeLogger(); m_contentInstance = content_instance; } bool ContentManager::isConnected() { - LoggerD("Enter"); + ScopeLogger(); return m_dbConnected; } void ContentManager::getDirectories(const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); int ret; filter_h filter = NULL; ret = media_filter_create(&filter); @@ -748,7 +748,7 @@ void ContentManager::getDirectories(const std::shared_ptr& us } void ContentManager::find(const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); int ret; int count, offset; @@ -837,13 +837,13 @@ void ContentManager::find(const std::shared_ptr& user_data) { } int ContentManager::scanFile(std::string& uri) { - LoggerD("Enter"); + ScopeLogger(); return media_content_scan_file(uri.c_str()); } PlatformResult ContentManager::scanDirectory(media_scan_completed_cb callback, ReplyCallbackData* cbData) { - LoggerD("Enter"); + ScopeLogger(); const std::string& contentDirURI = cbData->args.get("contentDirURI").get(); std::string real_path = common::FilesystemProvider::Create().GetRealPath(contentDirURI); const bool recursive = cbData->args.get("recursive").get(); @@ -866,7 +866,7 @@ PlatformResult ContentManager::scanDirectory(media_scan_completed_cb callback, } PlatformResult ContentManager::cancelScanDirectory(const std::string& content_dir_uri) { - LoggerD("Enter"); + ScopeLogger(); int ret = media_content_cancel_scan_folder(content_dir_uri.c_str()); if (ret != MEDIA_CONTENT_ERROR_NONE) { @@ -880,7 +880,7 @@ PlatformResult ContentManager::cancelScanDirectory(const std::string& content_di PlatformResult ContentManager::addChangeListener(media_content_noti_h* noti_handle, media_content_db_update_cb callback, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); int ret = media_content_add_db_updated_cb(callback, user_data, noti_handle); @@ -893,7 +893,7 @@ PlatformResult ContentManager::addChangeListener(media_content_noti_h* noti_hand } PlatformResult ContentManager::removeChangeListener(media_content_noti_h noti_handle) { - LoggerD("Enter"); + ScopeLogger(); int ret = media_content_remove_db_updated_cb(noti_handle); @@ -913,7 +913,7 @@ PlatformResult ContentManager::removeChangeListener(media_content_noti_h noti_ha PlatformResult ContentManager::setChangeListener(media_content_db_update_cb callback, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); int ret = media_content_set_db_updated_cb(callback, user_data); if (ret != MEDIA_CONTENT_ERROR_NONE) { @@ -925,7 +925,7 @@ PlatformResult ContentManager::setChangeListener(media_content_db_update_cb call } PlatformResult ContentManager::unSetChangeListener() { - LoggerD("Enter"); + ScopeLogger(); int ret = media_content_unset_db_updated_cb(); if (ret != MEDIA_CONTENT_ERROR_NONE) { @@ -938,7 +938,7 @@ PlatformResult ContentManager::unSetChangeListener() { void ContentManager::createPlaylist(std::string name, const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); media_playlist_h playlist = NULL; int ret = media_playlist_insert_to_db(name.c_str(), &playlist); @@ -1000,7 +1000,7 @@ void ContentManager::createPlaylist(std::string name, } void ContentManager::getPlaylists(const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); int ret; filter_h filter = nullptr; media_filter_create(&filter); @@ -1023,7 +1023,7 @@ void ContentManager::getPlaylists(const std::shared_ptr& user void ContentManager::removePlaylist(std::string playlistId, const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); int id = std::atoi(playlistId.c_str()); if (id == 0) { PlatformResult err = LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "PlaylistId is wrong."); @@ -1040,7 +1040,7 @@ void ContentManager::removePlaylist(std::string playlistId, } int ContentManager::update(picojson::value args) { - LoggerD("Enter"); + ScopeLogger(); int ret; picojson::value content = args.get("content"); @@ -1058,7 +1058,7 @@ int ContentManager::update(picojson::value args) { } int ContentManager::updateBatch(picojson::value args) { - LoggerD("Enter"); + ScopeLogger(); int ret = 0; std::vector contents = args.get("contents").get(); @@ -1087,7 +1087,7 @@ int ContentManager::updateBatch(picojson::value args) { } int ContentManager::playlistAdd(std::string playlist_id, std::string content_id) { - LoggerD("Enter"); + ScopeLogger(); media_playlist_h playlist = NULL; int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist); @@ -1111,7 +1111,7 @@ int ContentManager::playlistAdd(std::string playlist_id, std::string content_id) } int ContentManager::playlistRemove(std::string playlist_id, int member_id) { - LoggerD("Enter"); + ScopeLogger(); media_playlist_h playlist = NULL; int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist); @@ -1134,7 +1134,7 @@ int ContentManager::playlistRemove(std::string playlist_id, int member_id) { } void ContentManager::playlistAddbatch(const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); std::string playlist_id = user_data->args.get("playlistId").get(); media_playlist_h playlist = NULL; @@ -1169,7 +1169,7 @@ void ContentManager::playlistAddbatch(const std::shared_ptr& } void ContentManager::playlistGet(const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); media_playlist_h playlist = NULL; media_content_order_e order = MEDIA_CONTENT_ORDER_ASC; const std::string playOrder("play_order"); @@ -1228,7 +1228,7 @@ void ContentManager::playlistGet(const std::shared_ptr& user_ } void ContentManager::playlistRemovebatch(const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); media_playlist_h playlist = NULL; SCOPE_EXIT { @@ -1268,7 +1268,7 @@ void ContentManager::playlistRemovebatch(const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); media_playlist_h playlist = NULL; SCOPE_EXIT { @@ -1326,7 +1326,7 @@ void ContentManager::playlistSetOrder(const std::shared_ptr& } void ContentManager::playlistMove(const std::shared_ptr& user_data) { - LoggerD("Enter"); + ScopeLogger(); media_playlist_h playlist = NULL; SCOPE_EXIT { @@ -1374,7 +1374,7 @@ void ContentManager::playlistMove(const std::shared_ptr& user } int ContentManager::getLyrics(const picojson::value& args, picojson::object& result) { - LoggerD("Enter"); + ScopeLogger(); int ret = METADATA_EXTRACTOR_ERROR_NONE; const std::string& contentURI = args.get("contentURI").to_str(); @@ -1442,7 +1442,7 @@ int ContentManager::getLyrics(const picojson::value& args, picojson::object& res } media_playlist_h getPlaylistHandle(int id) { - LoggerD("Entered"); + ScopeLogger(); media_playlist_h playlist_handle = nullptr; int ret_code = media_playlist_get_playlist_from_db(id, &playlist_handle); if (MEDIA_CONTENT_ERROR_NONE != ret_code || playlist_handle == nullptr) { @@ -1454,7 +1454,7 @@ media_playlist_h getPlaylistHandle(int id) { } void destroyMediaPlaylistHandle(media_playlist_h& playlist_handle) { - LoggerD("Entered"); + ScopeLogger(); if (playlist_handle) { int ret_code = media_playlist_destroy(playlist_handle); playlist_handle = nullptr; @@ -1466,7 +1466,7 @@ void destroyMediaPlaylistHandle(media_playlist_h& playlist_handle) { } int ContentManager::getPlaylistName(int id, std::string* result) { - LoggerD("Entered"); + ScopeLogger(); media_playlist_h playlist_handle = getPlaylistHandle(id); PlaylistUniquePtr playlist_ptr(playlist_handle, destroyMediaPlaylistHandle); @@ -1490,7 +1490,7 @@ int ContentManager::getPlaylistName(int id, std::string* result) { } int updatePlaylistInDB(media_playlist_h playlist_handle) { - LoggerD("Entered"); + ScopeLogger(); int ret_code = media_playlist_update_to_db(playlist_handle); if (MEDIA_CONTENT_ERROR_NONE != ret_code) { LoggerE("media_playlist_update_to_db failed"); @@ -1500,7 +1500,7 @@ int updatePlaylistInDB(media_playlist_h playlist_handle) { } int ContentManager::setPlaylistName(int id, const std::string& name) { - LoggerD("Entered"); + ScopeLogger(); if (name.empty()) { LoggerE("Cannot set empty playlist name!"); return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; @@ -1532,7 +1532,7 @@ int ContentManager::setPlaylistName(int id, const std::string& name) { } int ContentManager::getThumbnailUri(int id, std::string* result) { - LoggerD("Entered"); + ScopeLogger(); media_playlist_h playlist_handle = getPlaylistHandle(id); PlaylistUniquePtr playlist_ptr(playlist_handle, destroyMediaPlaylistHandle); @@ -1560,7 +1560,7 @@ int ContentManager::getThumbnailUri(int id, std::string* result) { } int ContentManager::setThumbnailUri(int id, const std::string& thb_uri) { - LoggerD("Entered"); + ScopeLogger(); // Allow setting empty URI, unfortunately Core API does not allow to set empty // path so we need to set one empty space. This is probably issue of Core API. @@ -1586,7 +1586,7 @@ int ContentManager::setThumbnailUri(int id, const std::string& thb_uri) { } int ContentManager::getNumberOfTracks(int id, int* result) { - LoggerD("Entered"); + ScopeLogger(); int count = 0; const int ret_code = media_playlist_get_media_count_from_db(id, nullptr, &count); @@ -1601,7 +1601,7 @@ int ContentManager::getNumberOfTracks(int id, int* result) { } common::PlatformResult ContentManager::createThumbnail(const picojson::value& args) { - LoggerD("Enter"); + ScopeLogger(); unsigned int* callbackId = new unsigned int(static_cast(args.get("callbackId").get())); diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc index 216d3919..97c3720e 100644 --- a/src/datacontrol/datacontrol_instance.cc +++ b/src/datacontrol/datacontrol_instance.cc @@ -60,6 +60,7 @@ struct DatacontrolInformation { static std::map IdMap; DatacontrolInstance::DatacontrolInstance() { + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_SYNC(c, x) \ @@ -78,11 +79,12 @@ DatacontrolInstance::DatacontrolInstance() { } DatacontrolInstance::~DatacontrolInstance() { + ScopeLogger(); } static void ReplyAsync(DatacontrolInstance* instance, int callbackId, bool isSuccess, picojson::object* param) { - LoggerD("Enter"); + ScopeLogger(); (*param)["callbackId"] = picojson::value(static_cast(callbackId)); (*param)["status"] = picojson::value(isSuccess ? "success" : "error"); @@ -92,7 +94,7 @@ static void ReplyAsync(DatacontrolInstance* instance, int callbackId, bool isSuc } static bool SQLColumnName(result_set_cursor cursor, int columnIndex, picojson::value& name) { - LoggerD("Enter"); + ScopeLogger(); char buffer[4096]; int result = data_control_sql_get_column_name(cursor, columnIndex, buffer); if (result != DATA_CONTROL_ERROR_NONE) { @@ -104,7 +106,7 @@ static bool SQLColumnName(result_set_cursor cursor, int columnIndex, picojson::v } static bool SQLColumnValue(result_set_cursor cursor, int columnIndex, picojson::value& val) { - LoggerD("Enter"); + ScopeLogger(); data_control_sql_column_type_e type = DATA_CONTROL_SQL_COLUMN_TYPE_UNDEFINED; int result = data_control_sql_get_column_item_type(cursor, columnIndex, &type); if (result != DATA_CONTROL_ERROR_NONE) { @@ -178,7 +180,7 @@ static bool SQLColumnValue(result_set_cursor cursor, int columnIndex, picojson:: static void MAPAddResponseCallback(int requestId, data_control_h handle, bool providerResult, const char* error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); DatacontrolInformation* info = IdMap[requestId]; if (info == NULL) { LoggerE("Invalid context"); @@ -198,7 +200,7 @@ static void MAPAddResponseCallback(int requestId, data_control_h handle, bool pr static void MAPSetResponseCallback(int requestId, data_control_h handle, bool providerResult, const char* error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); DatacontrolInformation* info = IdMap[requestId]; if (info == NULL) { LoggerE("Invalid context"); @@ -219,7 +221,7 @@ static void MAPSetResponseCallback(int requestId, data_control_h handle, bool pr static void MAPGetResponseCallback(int requestId, data_control_h handle, char** result_value_list, int result_value_count, bool providerResult, const char* error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); DatacontrolInformation* info = IdMap[requestId]; if (info == NULL) { LoggerE("Invalid context"); @@ -245,7 +247,7 @@ static void MAPGetResponseCallback(int requestId, data_control_h handle, char** static void MAPRemoveReponseCallback(int requestId, data_control_h handle, bool providerResult, const char* error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); DatacontrolInformation* info = IdMap[requestId]; if (info == NULL) { LoggerE("Invalid context"); @@ -266,7 +268,7 @@ static void MAPRemoveReponseCallback(int requestId, data_control_h handle, bool static void SQLSelectResponseCallback(int requestId, data_control_h handle, result_set_cursor cursor, bool providerResult, const char* error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); DatacontrolInformation* info = IdMap[requestId]; if (info == NULL) { LoggerE("Invalid context"); @@ -307,7 +309,7 @@ static void SQLSelectResponseCallback(int requestId, data_control_h handle, static void SQLInsertResponseCallback(int requestId, data_control_h handle, long long inserted_row_id, bool providerResult, const char* error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); DatacontrolInformation* info = IdMap[requestId]; if (info == NULL) { LoggerE("Invalid context"); @@ -329,7 +331,7 @@ static void SQLInsertResponseCallback(int requestId, data_control_h handle, static void SQLUpdateResponseCallback(int requestId, data_control_h handle, bool providerResult, const char* error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); DatacontrolInformation* info = IdMap[requestId]; if (info == NULL) { LoggerE("Invalid context"); @@ -349,7 +351,7 @@ static void SQLUpdateResponseCallback(int requestId, data_control_h handle, bool static void SQLDeleteResponseCallback(int requestId, data_control_h handle, bool providerResult, const char* error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); DatacontrolInformation* info = IdMap[requestId]; if (info == NULL) { LoggerE("Invalid context"); @@ -385,7 +387,7 @@ static data_control_map_response_cb mapResponseCallback = { int DatacontrolInstance::RunMAPDataControlJob(const std::string& providerId, const std::string& dataId, int callbackId, int userRequestId, DataControlJob job) { - LoggerD("Enter"); + ScopeLogger(); int result = DATA_CONTROL_ERROR_NONE; std::unique_ptr info{new DatacontrolInformation()}; info->callbackId = callbackId; @@ -420,7 +422,7 @@ int DatacontrolInstance::RunMAPDataControlJob(const std::string& providerId, int DatacontrolInstance::RunSQLDataControlJob(const std::string& providerId, const std::string& dataId, int callbackId, int userRequestId, DataControlJob job) { - LoggerD("Enter"); + ScopeLogger(); int result = DATA_CONTROL_ERROR_NONE; std::unique_ptr info{new DatacontrolInformation()}; info->callbackId = callbackId; @@ -461,7 +463,7 @@ int DatacontrolInstance::RunSQLDataControlJob(const std::string& providerId, void DatacontrolInstance::DataControlManagerGetdatacontrolconsumer(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "providerId", out) @@ -469,7 +471,7 @@ void DatacontrolInstance::DataControlManagerGetdatacontrolconsumer(const picojso } void DatacontrolInstance::SQLDataControlConsumerInsert(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "reqId", out) @@ -546,7 +548,7 @@ void DatacontrolInstance::SQLDataControlConsumerInsert(const picojson::value& ar } void DatacontrolInstance::SQLDataControlConsumerUpdate(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "reqId", out) @@ -576,7 +578,7 @@ void DatacontrolInstance::SQLDataControlConsumerUpdate(const picojson::value& ar int result = RunSQLDataControlJob( providerId, dataId, callbackId, reqId, [&updateData, &where](data_control_h& handle, int* requestId) -> int { - LoggerD("Enter"); + ScopeLogger(); picojson::array columns = updateData["columns"].get(); picojson::array values = updateData["values"].get(); @@ -624,7 +626,7 @@ void DatacontrolInstance::SQLDataControlConsumerUpdate(const picojson::value& ar void DatacontrolInstance::SQLDataControlConsumerRemove(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "reqId", out) @@ -661,7 +663,7 @@ void DatacontrolInstance::SQLDataControlConsumerRemove(const picojson::value& ar void DatacontrolInstance::SQLDataControlConsumerSelect(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "reqId", out) @@ -695,7 +697,7 @@ void DatacontrolInstance::SQLDataControlConsumerSelect(const picojson::value& ar int result = RunSQLDataControlJob( providerId, dataId, callbackId, reqId, [&columns, &where, order, page, maxNumberPerPage]( data_control_h& handle, int* requestId) -> int { - LoggerD("Enter"); + ScopeLogger(); std::vector temp; for (auto& s : columns) temp.push_back(s.get().c_str()); int columnCount = static_cast(temp.size()); @@ -727,7 +729,7 @@ void DatacontrolInstance::SQLDataControlConsumerSelect(const picojson::value& ar } void DatacontrolInstance::MappedDataControlConsumerAddvalue(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "reqId", out) @@ -767,7 +769,7 @@ void DatacontrolInstance::MappedDataControlConsumerAddvalue(const picojson::valu } void DatacontrolInstance::MappedDataControlConsumerRemovevalue(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "reqId", out) @@ -806,7 +808,7 @@ void DatacontrolInstance::MappedDataControlConsumerRemovevalue(const picojson::v } void DatacontrolInstance::MappedDataControlConsumerGetvalue(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "reqId", out) @@ -842,7 +844,7 @@ void DatacontrolInstance::MappedDataControlConsumerGetvalue(const picojson::valu } void DatacontrolInstance::MappedDataControlConsumerUpdatevalue(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDatacontrol, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "reqId", out) diff --git a/src/download/download_instance.cc b/src/download/download_instance.cc index 208caae3..5a1dd70a 100644 --- a/src/download/download_instance.cc +++ b/src/download/download_instance.cc @@ -40,7 +40,7 @@ const std::string kPrivilegeDownload = "http://tizen.org/privilege/download"; } // namespace DownloadInstance::DownloadInstance() { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&DownloadInstance::x, this, _1, _2)); @@ -59,7 +59,7 @@ DownloadInstance::DownloadInstance() { } DownloadInstance::~DownloadInstance() { - LoggerD("Entered"); + ScopeLogger(); int ret; for (DownloadCallbackMap::iterator it = download_callbacks.begin(); it != download_callbacks.end(); ++it) { @@ -99,7 +99,7 @@ DownloadInstance::~DownloadInstance() { } bool DownloadInstance::CheckInstance(DownloadInstance* instance) { - LoggerD("Entered"); + ScopeLogger(); for (auto vec_instance : instances_) { if (vec_instance == instance) { return true; @@ -184,7 +184,7 @@ common::PlatformResult DownloadInstance::convertError(int err, const std::string } void DownloadInstance::OnStateChanged(int download_id, download_state_e state, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); CallbackPtr downCbPtr = static_cast(user_data); downCbPtr->state = state; @@ -217,7 +217,7 @@ void DownloadInstance::OnStateChanged(int download_id, download_state_e state, v } gboolean DownloadInstance::OnProgressChanged(void* user_data) { - LoggerD("Entered"); + ScopeLogger(); CallbackPtr downCbPtr = static_cast(user_data); std::lock_guard lock(instances_mutex_); if (!CheckInstance(downCbPtr->instance)) { @@ -246,7 +246,7 @@ gboolean DownloadInstance::OnProgressChanged(void* user_data) { } void DownloadInstance::OnStart(int download_id, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); unsigned long long totalSize; CallbackPtr downCbPtr = static_cast(user_data); @@ -269,7 +269,7 @@ void DownloadInstance::OnStart(int download_id, void* user_data) { } gboolean DownloadInstance::OnFinished(void* user_data) { - LoggerD("Entered"); + ScopeLogger(); char* fullPath = NULL; CallbackPtr downCbPtr = static_cast(user_data); @@ -323,7 +323,7 @@ gboolean DownloadInstance::OnFinished(void* user_data) { } gboolean DownloadInstance::OnPaused(void* user_data) { - LoggerD("Entered"); + ScopeLogger(); CallbackPtr downCbPtr = static_cast(user_data); std::lock_guard lock(instances_mutex_); if (!CheckInstance(downCbPtr->instance)) { @@ -348,7 +348,7 @@ gboolean DownloadInstance::OnPaused(void* user_data) { } gboolean DownloadInstance::OnCanceled(void* user_data) { - LoggerD("Entered"); + ScopeLogger(); CallbackPtr downCbPtr = static_cast(user_data); std::lock_guard lock(instances_mutex_); if (!CheckInstance(downCbPtr->instance)) { @@ -391,7 +391,7 @@ gboolean DownloadInstance::OnCanceled(void* user_data) { } gboolean DownloadInstance::OnFailed(void* user_data) { - LoggerD("Entered"); + ScopeLogger(); download_error_e error; picojson::object out; @@ -451,7 +451,7 @@ gboolean DownloadInstance::OnFailed(void* user_data) { void DownloadInstance::progress_changed_cb(int download_id, long long unsigned received, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); CallbackPtr downCbPtr = static_cast(user_data); downCbPtr->received = received; downCbPtr->downloadId = download_id; @@ -460,7 +460,7 @@ void DownloadInstance::progress_changed_cb(int download_id, long long unsigned r } void DownloadInstance::DownloadManagerStart(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeDownload, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "url", out) @@ -643,7 +643,7 @@ void DownloadInstance::DownloadManagerStart(const picojson::value& args, picojso } void DownloadInstance::DownloadManagerCancel(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "downloadId", out) int downloadId, ret; @@ -668,7 +668,7 @@ void DownloadInstance::DownloadManagerCancel(const picojson::value& args, picojs } void DownloadInstance::DownloadManagerPause(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "downloadId", out) int downloadId, ret; @@ -693,7 +693,7 @@ void DownloadInstance::DownloadManagerPause(const picojson::value& args, picojso } void DownloadInstance::DownloadManagerResume(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "downloadId", out) int downloadId, ret; @@ -718,7 +718,7 @@ void DownloadInstance::DownloadManagerResume(const picojson::value& args, picojs } void DownloadInstance::DownloadManagerGetstate(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "downloadId", out) int downloadId, ret; std::string stateValue; @@ -772,7 +772,7 @@ void DownloadInstance::DownloadManagerGetstate(const picojson::value& args, pico void DownloadInstance::DownloadManagerGetmimetype(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "downloadId", out) int downloadId, ret; @@ -800,7 +800,7 @@ void DownloadInstance::DownloadManagerGetmimetype(const picojson::value& args, } bool DownloadInstance::GetDownloadID(const int callback_id, int& download_id) { - LoggerD("Entered"); + ScopeLogger(); if (diMap.find(callback_id) != diMap.end()) { download_id = diMap.find(callback_id)->second->download_id; } else { @@ -811,13 +811,13 @@ bool DownloadInstance::GetDownloadID(const int callback_id, int& download_id) { void DownloadInstance::DownloadManagerGetdownloadrequest(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); // Nothing to do } void DownloadInstance::DownloadManagerSetlistener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); // Nothing to do } diff --git a/src/exif/exif_gps_location.cc b/src/exif/exif_gps_location.cc index 2426cb05..23da8c5a 100644 --- a/src/exif/exif_gps_location.cc +++ b/src/exif/exif_gps_location.cc @@ -27,16 +27,16 @@ namespace extension { namespace exif { GCSPosition::GCSPosition() { - LoggerD("Enter"); + ScopeLogger(); } GCSPosition::GCSPosition(Rational _degrees, Rational _minutes, Rational _seconds) : degrees(_degrees), minutes(_minutes), seconds(_seconds) { - LoggerD("Enter"); + ScopeLogger(); } bool GCSPosition::isValid() const { - LoggerD("Enter"); + ScopeLogger(); if (!(degrees.isValid() && minutes.isValid() && seconds.isValid())) { return false; } @@ -50,7 +50,7 @@ bool GCSPosition::isValid() const { } double GCSPosition::toDouble() const { - LoggerD("Enter"); + ScopeLogger(); const double degrees_value = degrees.toDouble(); const double minutes_value = minutes.toDouble(); const double seconds_value = seconds.toDouble(); @@ -58,7 +58,7 @@ double GCSPosition::toDouble() const { } Rationals GCSPosition::toRationalsVector() const { - LoggerD("Enter"); + ScopeLogger(); Rationals vec; vec.push_back(degrees); vec.push_back(minutes); @@ -67,7 +67,7 @@ Rationals GCSPosition::toRationalsVector() const { } std::string GCSPosition::toDebugString() const { - LoggerD("Enter"); + ScopeLogger(); std::stringstream ss; ss << degrees.toString() << "d "; ss << minutes.toString() << "m "; @@ -76,7 +76,7 @@ std::string GCSPosition::toDebugString() const { } GCSPosition GCSPosition::createFromDouble(double value) { - LoggerD("Entered value:%f"); + ScopeLogger("value: %f", value); if (value < 0) { LoggerW("Trying to create GCSPosition with double < 0: %f", value); return GCSPosition(); @@ -120,14 +120,14 @@ GCSPosition GCSPosition::createFromDouble(double value) { ExifGPSLocation::ExifGPSLocation() : m_longitude_ref(GPS_LOCATION_WEST), m_latitude_ref(GPS_LOCATION_NORTH) { for (int i = 0; i < EXIF_GPS_LOCATION_ATTRIBUTE_NUMBER_OF_ATTRIBUTES; ++i) { - LoggerD("Enter"); + ScopeLogger(); m_is_set[i] = false; } LoggerE("ExifGPSLocation::ExifGPSLocation()"); } ExifGPSLocation::ExifGPSLocation(double longitude, double latitude) { - LoggerD("Enter"); + ScopeLogger(); for (int i = 0; i < EXIF_GPS_LOCATION_ATTRIBUTE_NUMBER_OF_ATTRIBUTES; ++i) { m_is_set[i] = false; } @@ -149,7 +149,7 @@ ExifGPSLocation::ExifGPSLocation(double longitude, double latitude) { } void ExifGPSLocation::setLongitude(const GCSPosition& longitude) { - LoggerD("Enter"); + ScopeLogger(); if (!longitude.isValid()) { LoggerW("longitude is not valid!"); return; @@ -160,23 +160,23 @@ void ExifGPSLocation::setLongitude(const GCSPosition& longitude) { } const GCSPosition& ExifGPSLocation::getLongitude() const { - LoggerD("Enter"); + ScopeLogger(); return m_longitude; } void ExifGPSLocation::setLongitudeRef(GPSLocationDirectionLongitude ref) { - LoggerD("Enter"); + ScopeLogger(); m_is_set[EXIF_GPS_LOCATION_ATTRIBUTE_LONGITUDE_REF] = true; m_longitude_ref = ref; } GPSLocationDirectionLongitude ExifGPSLocation::getLongitudeRef() const { - LoggerD("Enter"); + ScopeLogger(); return m_longitude_ref; } void ExifGPSLocation::setLatitude(const GCSPosition& latitude) { - LoggerD("Enter"); + ScopeLogger(); if (!latitude.isValid()) { LoggerW("latitude is not valid!"); return; @@ -187,33 +187,33 @@ void ExifGPSLocation::setLatitude(const GCSPosition& latitude) { } const GCSPosition& ExifGPSLocation::getLatitude() const { - LoggerD("Enter"); + ScopeLogger(); return m_latitude; } void ExifGPSLocation::setLatitudeRef(GPSLocationDirectionLatitude ref) { - LoggerD("Enter"); + ScopeLogger(); m_is_set[EXIF_GPS_LOCATION_ATTRIBUTE_LATITUDE_REF] = true; m_latitude_ref = ref; } GPSLocationDirectionLatitude ExifGPSLocation::getLatitudeRef() const { - LoggerD("Enter"); + ScopeLogger(); return m_latitude_ref; } bool ExifGPSLocation::isSet(ExifGPSLocationAttributes attribute) const { - LoggerD("Enter"); + ScopeLogger(); return m_is_set[attribute]; } void ExifGPSLocation::unset(ExifGPSLocationAttributes attribute) { - LoggerD("Enter"); + ScopeLogger(); m_is_set[attribute] = false; } void ExifGPSLocation::unsetAll() { - LoggerD("Enter"); + ScopeLogger(); m_is_set[EXIF_GPS_LOCATION_ATTRIBUTE_LONGITUDE] = false; m_is_set[EXIF_GPS_LOCATION_ATTRIBUTE_LONGITUDE_REF] = false; m_longitude = GCSPosition(); @@ -224,7 +224,7 @@ void ExifGPSLocation::unsetAll() { } bool ExifGPSLocation::isComplete() const { - LoggerD("Enter"); + ScopeLogger(); return m_is_set[EXIF_GPS_LOCATION_ATTRIBUTE_LONGITUDE] && m_is_set[EXIF_GPS_LOCATION_ATTRIBUTE_LONGITUDE_REF] && m_is_set[EXIF_GPS_LOCATION_ATTRIBUTE_LATITUDE] && @@ -232,19 +232,19 @@ bool ExifGPSLocation::isComplete() const { } bool ExifGPSLocation::isValid() const { - LoggerD("Enter"); + ScopeLogger(); return isComplete() && m_latitude.isValid() && m_longitude.isValid(); } double ExifGPSLocation::getLongitudeValue() const { - LoggerD("Enter"); + ScopeLogger(); const double longitude_dir = (m_longitude_ref == GPS_LOCATION_WEST) ? -1.0f : 1.0f; const double longitude = m_longitude.toDouble() * longitude_dir; return longitude; } double ExifGPSLocation::getLatitudeValue() const { - LoggerD("Enter"); + ScopeLogger(); const double latitude_dir = (m_latitude_ref == GPS_LOCATION_SOUTH) ? -1.0f : 1.0f; const double latitude = m_latitude.toDouble() * latitude_dir; return latitude; diff --git a/src/exif/exif_information.cc b/src/exif/exif_information.cc index 08f7ed95..90cdb1ab 100644 --- a/src/exif/exif_information.cc +++ b/src/exif/exif_information.cc @@ -50,7 +50,7 @@ constexpr unsigned int str2int(const char* str, int h = 0) { } IsoSpeedRatingsVector jsonArray2vector(const picojson::value& a) { - LoggerD("Enter"); + ScopeLogger(); if (!a.is()) { return IsoSpeedRatingsVector(); } @@ -68,14 +68,14 @@ IsoSpeedRatingsVector jsonArray2vector(const picojson::value& a) { } // namespace ExifInformation::ExifInformation() { - LoggerD("Enter"); + ScopeLogger(); for (int attr = 0; attr < EXIF_INFORMATION_ATTRIBUTE_NUMBER_OF_ATTRIBUTES; attr++) { unset(static_cast(attr)); } } ExifInformation::ExifInformation(const picojson::value& args) { - LoggerD("Enter"); + ScopeLogger(); for (int attr = 0; attr < EXIF_INFORMATION_ATTRIBUTE_NUMBER_OF_ATTRIBUTES; attr++) { unset(static_cast(attr)); } @@ -91,104 +91,87 @@ ExifInformation::ExifInformation(const picojson::value& args) { } ExifInformation::~ExifInformation() { - LoggerD("Enter"); + ScopeLogger(); } const std::string& ExifInformation::getUri() { - LoggerD("Entered"); return m_uri; } void ExifInformation::setUri(const std::string& uri) { - LoggerD("Entered"); - LoggerD("URI: %s", uri.c_str()); m_is_set[EXIF_INFORMATION_ATTRIBUTE_URI] = true; m_uri = uri; + LoggerD("URI: %s", uri.c_str()); } unsigned long ExifInformation::getWidth() const { - LoggerD("Entered"); return m_width; } void ExifInformation::setWidth(unsigned long width) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_WIDTH] = true; m_width = width; } unsigned long ExifInformation::getHeight() const { - LoggerD("Entered"); return m_height; } void ExifInformation::setHeight(unsigned long height) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_HEIGHT] = true; m_height = height; } const std::string& ExifInformation::getDeviceMaker() { - LoggerD("Entered"); return m_device_maker; } void ExifInformation::setDeviceMaker(const std::string& device_maker) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_DEVICE_MAKER] = true; m_device_maker = device_maker; } const std::string& ExifInformation::getDeviceModel() { - LoggerD("Entered"); return m_device_model; } void ExifInformation::setDeviceModel(const std::string& device_model) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_DEVICE_MODEL] = true; m_device_model = device_model; } time_t ExifInformation::getOriginalTime() const { - LoggerD("Entered"); return m_original_time; } void ExifInformation::setOriginalTime(time_t original_time) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_ORIGINAL_TIME] = true; m_original_time = original_time; } const std::string& ExifInformation::getOrientationString() { - LoggerD("Entered"); return ExifUtil::orientationToString(m_orientation); } ImageOrientation ExifInformation::getOrientation() { - LoggerD("Entered"); return m_orientation; } void ExifInformation::setOrientation(const std::string& orientation) { - LoggerD("Entered"); + ScopeLogger(); setOrientation(ExifUtil::stringToOrientation(orientation)); } void ExifInformation::setOrientation(ImageOrientation orientation) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_ORIENTATION] = true; m_orientation = orientation; } const Rational& ExifInformation::getFNumber() const { - LoggerD("Entered"); return m_f_number; } void ExifInformation::setFNumber(Rational f_number) { - LoggerD("Entered"); if (!f_number.isValid()) { LoggerW("Trying to set invalid F-Number: %s", f_number.toString().c_str()); return; @@ -199,23 +182,19 @@ void ExifInformation::setFNumber(Rational f_number) { } const std::vector& ExifInformation::getIsoSpeedRatings() { - LoggerD("Entered"); return m_iso_speed_ratings; } void ExifInformation::setIsoSpeedRatings(const std::vector& iso_speed_ratings) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_ISO_SPEED_RATINGS] = true; m_iso_speed_ratings = iso_speed_ratings; } const Rational& ExifInformation::getExposureTime() { - LoggerD("Entered"); return m_exposure_time; } void ExifInformation::setExposureTime(const Rational& exposure_time) { - LoggerD("Entered"); if (!exposure_time.isValid() || 0 == exposure_time.nominator) { LoggerW("Trying to set invalid exposure time: [%s]", exposure_time.toString().c_str()); return; @@ -226,45 +205,39 @@ void ExifInformation::setExposureTime(const Rational& exposure_time) { } const std::string& ExifInformation::getExposureProgramString() { - LoggerD("Entered"); + ScopeLogger(); return ExifUtil::exposureProgramToString(m_exposure_program); ; } ExposureProgram ExifInformation::getExposureProgram() { - LoggerD("Entered"); return m_exposure_program; } void ExifInformation::setExposureProgram(const std::string& exposure_program) { - LoggerD("Entered"); + ScopeLogger(); setExposureProgram(ExifUtil::stringToExposureProgram(exposure_program)); } void ExifInformation::setExposureProgram(ExposureProgram exposure_program) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_EXPOSURE_PROGRAM] = true; m_exposure_program = exposure_program; } bool ExifInformation::getFlash() const { - LoggerD("Entered"); return m_flash; } void ExifInformation::setFlash(bool flash) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_FLASH] = true; m_flash = flash; } const Rational& ExifInformation::getFocalLength() const { - LoggerD("Entered"); return m_focal_length; } void ExifInformation::setFocalLength(Rational focal_length) { - LoggerD("Entered"); if (!focal_length.isValid()) { LoggerW("Trying to set invalid focal length: %s", focal_length.toString().c_str()); return; @@ -275,50 +248,42 @@ void ExifInformation::setFocalLength(Rational focal_length) { } const std::string& ExifInformation::getWhiteBalanceModeString() { - LoggerD("Entered"); return ExifUtil::whiteBalanceToString(m_white_balance); } WhiteBalanceMode ExifInformation::getWhiteBalanceMode() { - LoggerD("Entered"); return m_white_balance; } void ExifInformation::setWhiteBalanceMode(const std::string& white_balance) { - LoggerD("Entered"); + ScopeLogger(); setWhiteBalanceMode(ExifUtil::stringToWhiteBalance(white_balance)); } void ExifInformation::setWhiteBalanceMode(WhiteBalanceMode white_balance) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_WHITE_BALANCE] = true; m_white_balance = white_balance; } ExifGPSLocation& ExifInformation::getGPSExifLocation() { - LoggerD("Entered"); return m_gps_location; } void ExifInformation::setGPSLocation(ExifGPSLocation gps_location) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_GPS_LOCATION] = true; m_gps_location = gps_location; } void ExifInformation::unsetGPSLocation() { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_GPS_LOCATION] = false; m_gps_location.unsetAll(); } const Rational& ExifInformation::getGpsAltitude() const { - LoggerD("Entered"); return m_gps_altitude; } void ExifInformation::setGpsAltitude(Rational gps_altitude) { - LoggerD("Entered"); if (!gps_altitude.isValid()) { LoggerW("Trying to set invalid gps altitude: %s", gps_altitude.toString().c_str()); return; @@ -329,18 +294,16 @@ void ExifInformation::setGpsAltitude(Rational gps_altitude) { } GpsAltitudeRef ExifInformation::getGpsAltitudeRef() const { - LoggerD("Entered"); return m_gps_altitude_ref; } void ExifInformation::setGpsAltitudeRef(const GpsAltitudeRef ref) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_GPS_ALTITUDE_REF] = true; m_gps_altitude_ref = ref; } void ExifInformation::setGpsAltitudeWithRef(double gps_altitude) { - LoggerD("Entered"); + ScopeLogger(); setGpsAltitude(Rational::createFromDouble(fabs(gps_altitude))); if (gps_altitude >= 0.0) { @@ -351,8 +314,6 @@ void ExifInformation::setGpsAltitudeWithRef(double gps_altitude) { } double ExifInformation::getGpsAltitudeWithRef() const { - LoggerD("Entered"); - if (!m_is_set[EXIF_INFORMATION_ATTRIBUTE_GPS_ALTITUDE_REF] || GPS_ALTITUDE_REF_ABOVE_SEA == m_gps_altitude_ref) { return m_gps_altitude.toDouble(); @@ -362,18 +323,15 @@ double ExifInformation::getGpsAltitudeWithRef() const { } const std::string& ExifInformation::getGpsProcessingMethod() const { - LoggerD("Entered"); return m_gps_processing_method; } const std::string& ExifInformation::getGpsProcessingMethodType() const { - LoggerD("Entered"); return m_gps_processing_method_type; } void ExifInformation::setGpsProcessingMethod(const std::string& type, const std::string& processing_method) { - LoggerD("Entered"); if (type != EXIF_UNDEFINED_TYPE_ASCII && type != EXIF_UNDEFINED_TYPE_JIS && type != EXIF_UNDEFINED_TYPE_UNICODE && type != EXIF_UNDEFINED_TYPE_UNDEFINED) { LoggerW("Trying to set invalid GPSProcessingMethod type: [%s] len:%d", type.c_str(), @@ -387,34 +345,28 @@ void ExifInformation::setGpsProcessingMethod(const std::string& type, } void ExifInformation::setGpsTime(time_t time) { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_GPS_TIME] = true; m_gps_time = time; } time_t ExifInformation::getGpsTime() { - LoggerD("Entered"); return m_gps_time; } void ExifInformation::unsetGPStime() { - LoggerD("Entered"); m_is_set[EXIF_INFORMATION_ATTRIBUTE_GPS_TIME] = false; m_gps_time = 0; } const std::string& ExifInformation::getUserComment() { - LoggerD("Entered"); return m_user_comment; } const std::string& ExifInformation::getUserCommentType() { - LoggerD("Entered"); return m_user_comment_type; } void ExifInformation::setUserComment(const std::string& type, const std::string& user_comment) { - LoggerD("Entered"); if (type != EXIF_UNDEFINED_TYPE_ASCII && type != EXIF_UNDEFINED_TYPE_JIS && type != EXIF_UNDEFINED_TYPE_UNICODE && type != EXIF_UNDEFINED_TYPE_UNDEFINED) { LoggerW("Trying to set invalid user comment type: [%s] len:%d", type.c_str(), type.length()); @@ -427,12 +379,10 @@ void ExifInformation::setUserComment(const std::string& type, const std::string& } bool ExifInformation::isSet(ExifInformationAttribute attribute) const { - LoggerD("Entered"); return m_is_set[attribute]; } void ExifInformation::unset(ExifInformationAttribute attribute) { - LoggerD("Entered"); if (attribute >= EXIF_INFORMATION_ATTRIBUTE_NUMBER_OF_ATTRIBUTES) { return; } @@ -507,7 +457,7 @@ void ExifInformation::unset(ExifInformationAttribute attribute) { } void ExifInformation::set(std::string attributeName, const picojson::value& v) { - LoggerD("Entered | name: %s", attributeName.c_str()); + ScopeLogger(attributeName); switch (str2int(attributeName.c_str())) { case str2int(EI_URI): { @@ -593,7 +543,7 @@ void ExifInformation::set(std::string attributeName, const picojson::value& v) { } void ExifInformation::removeNulledAttributesFromExifData(ExifData* exif_data) { - LoggerD("Entered"); + ScopeLogger(); AssertMsg(exif_data, "exif_data is NULL"); if (!isSet(EXIF_INFORMATION_ATTRIBUTE_WIDTH)) { @@ -691,7 +641,7 @@ void ExifInformation::removeNulledAttributesFromExifData(ExifData* exif_data) { } PlatformResult ExifInformation::updateAttributesInExifData(ExifData* exif_data) { - LoggerD("Entered"); + ScopeLogger(); common::PlatformResult ret(common::ErrorCode::NO_ERROR); @@ -882,8 +832,7 @@ PlatformResult ExifInformation::updateAttributesInExifData(ExifData* exif_data) } PlatformResult ExifInformation::saveToFile(const std::string& file_path) { - LoggerD("Entered"); - LoggerD("Using JpegFile to read: [%s] and Exif if present", file_path.c_str()); + ScopeLogger("Using JpegFile to read: [%s] and Exif if present", file_path.c_str()); JpegFilePtr jpg_file; PlatformResult result = JpegFile::loadFile(file_path, &jpg_file); diff --git a/src/exif/exif_instance.cc b/src/exif/exif_instance.cc index ced91297..121390c1 100644 --- a/src/exif/exif_instance.cc +++ b/src/exif/exif_instance.cc @@ -40,6 +40,7 @@ using common::PlatformResult; using common::ErrorCode; ExifInstance::ExifInstance() { + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -51,15 +52,17 @@ ExifInstance::ExifInstance() { } ExifInstance::~ExifInstance() { + ScopeLogger(); } void ExifInstance::ExifManagerGetExifInfo(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); const std::string& uri = args.get("uri").get(); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); JsonValue result = JsonValue(JsonObject()); PlatformResult status(ErrorCode::NO_ERROR); @@ -81,6 +84,7 @@ void ExifInstance::ExifManagerGetExifInfo(const picojson::value& args, picojson: }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(this, response->serialize().c_str()); @@ -89,15 +93,14 @@ void ExifInstance::ExifManagerGetExifInfo(const picojson::value& args, picojson: auto data = std::shared_ptr(new JsonValue(JsonObject())); common::TaskQueue::GetInstance().Queue(get, get_response, data); - - LoggerD("exit"); } void ExifInstance::ExifManagerSaveExifInfo(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); JsonValue result = JsonValue(JsonObject()); PlatformResult status(ErrorCode::NO_ERROR); @@ -113,6 +116,7 @@ void ExifInstance::ExifManagerSaveExifInfo(const picojson::value& args, picojson }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(this, response->serialize().c_str()); @@ -124,11 +128,12 @@ void ExifInstance::ExifManagerSaveExifInfo(const picojson::value& args, picojson } void ExifInstance::ExifManagerGetThumbnail(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string& uri = args.get("uri").get(); const double callback_id = args.get("callbackId").get(); auto get = [=](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get"); PlatformResult status(ErrorCode::NO_ERROR); const std::string& file_path = ExifUtil::convertUriToPath(uri); @@ -188,6 +193,7 @@ void ExifInstance::ExifManagerGetThumbnail(const picojson::value& args, picojson }; auto get_response = [callback_id, this](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, get_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(this, response->serialize().c_str()); diff --git a/src/exif/exif_tag_saver.cc b/src/exif/exif_tag_saver.cc index 11bab292..7ead3905 100644 --- a/src/exif/exif_tag_saver.cc +++ b/src/exif/exif_tag_saver.cc @@ -28,7 +28,7 @@ namespace extension { namespace exif { void ExifTagSaver::removeExifEntryWithTag(const ExifTag tag, ExifData* exif_data) { - LoggerD("Entered tag:%d (0x%x)", tag, tag); + ScopeLogger("tag:%d (0x%x)", tag, exif_data); ExifEntry* exif_entry = exif_data_get_entry(exif_data, tag); if (!exif_entry) { LoggerE("Exif entry with tag:%d (0x%x) is not present", tag, tag); @@ -39,7 +39,7 @@ void ExifTagSaver::removeExifEntryWithTag(const ExifTag tag, ExifData* exif_data } common::PlatformResult ExifTagSaver::saveToExif(long int value, ExifTag tag, ExifData* exif_data) { - LoggerD("Entered"); + ScopeLogger(); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { @@ -79,7 +79,7 @@ common::PlatformResult ExifTagSaver::saveToExif(long int value, ExifTag tag, Exi common::PlatformResult ExifTagSaver::saveToExif(const std::string& value, ExifTag tag, ExifData* exif_data, ExifFormat format, bool add_zero_character) { - LoggerD("Entered"); + ScopeLogger(); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); @@ -115,7 +115,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const std::string& value, ExifTa common::PlatformResult ExifTagSaver::saveToExif(const Rational& value, ExifTag tag, ExifData* exif_data) { - LoggerD("Entered"); + ScopeLogger(); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); @@ -149,7 +149,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const Rational& value, ExifTag t common::PlatformResult ExifTagSaver::saveToExif(const Rationals& value, ExifTag tag, ExifData* exif_data) { - LoggerD("Entered"); + ScopeLogger(); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); @@ -186,7 +186,7 @@ common::PlatformResult ExifTagSaver::saveToExif(const Rationals& value, ExifTag common::PlatformResult ExifTagSaver::saveToExif(std::vector& value, ExifFormat store_as, ExifTag tag, ExifData* exif_data) { - LoggerD("Entered"); + ScopeLogger(); ExifEntry* entry = prepareEntry(exif_data, tag); if (!entry) { return LogAndCreateResult(common::ErrorCode::UNKNOWN_ERR, "Exif entry is null"); @@ -274,7 +274,7 @@ common::PlatformResult ExifTagSaver::saveGpsLocationToExif(const ExifGPSLocation ExifData* exif_data) { common::PlatformResult ret(common::ErrorCode::NO_ERROR); - LoggerD("Entered"); + ScopeLogger(); if (gps_info.isSet(EXIF_GPS_LOCATION_ATTRIBUTE_LATITUDE)) { auto latitude = gps_info.getLatitude(); LoggerD("Saving latitude: %s", latitude.toDebugString().c_str()); @@ -319,7 +319,7 @@ common::PlatformResult ExifTagSaver::saveGpsLocationToExif(const ExifGPSLocation } ExifEntry* ExifTagSaver::prepareEntry(ExifData* exif_data, ExifTag tag) { - LoggerD("Entered m_tag:%d", tag); + ScopeLogger("tag:%d (0x%x)", tag, exif_data); ExifEntry* exif_entry = exif_data_get_entry(exif_data, tag); if (!exif_entry) { @@ -351,7 +351,7 @@ ExifEntry* ExifTagSaver::prepareEntry(ExifData* exif_data, ExifTag tag) { ExifEntry* ExifTagSaver::createNewTag(ExifData* exif_data, ExifIfd ifd, ExifFormat format, ExifTag tag) { - LoggerD("Creating new tag: %d", tag); + ScopeLogger("Creating new tag: %d", tag); ExifEntry* new_entry = exif_entry_new(); if (new_entry == nullptr) { @@ -366,7 +366,7 @@ ExifEntry* ExifTagSaver::createNewTag(ExifData* exif_data, ExifIfd ifd, ExifForm } common::PlatformResult ExifTagSaver::deduceIfdSection(ExifTag tag, ExifIfd* exif_ifd) { - LoggerD("Entered"); + ScopeLogger(); switch (static_cast(tag)) { // Tags in IFD_0 Section @@ -414,7 +414,7 @@ common::PlatformResult ExifTagSaver::deduceIfdSection(ExifTag tag, ExifIfd* exif } common::PlatformResult ExifTagSaver::deduceDataFormat(ExifTag tag, ExifFormat* exif_format) { - LoggerD("Entered"); + ScopeLogger(); switch (static_cast(tag)) { // Tags with byte type: diff --git a/src/exif/exif_util.cc b/src/exif/exif_util.cc index 9f9bc90e..6b130046 100644 --- a/src/exif/exif_util.cc +++ b/src/exif/exif_util.cc @@ -72,13 +72,15 @@ const ExifByte ExifTypeInfo::SLongId = 9; const ExifByte ExifTypeInfo::SRationalId = 10; ExifUtil::ExifUtil() { + ScopeLogger(); } ExifUtil::~ExifUtil() { + ScopeLogger(); } ImageOrientation ExifUtil::stringToOrientation(const std::string& orientation) { - LoggerD("Entered"); + ScopeLogger(); if (ORIENTATION_NORMAL == orientation) { return ImageOrientation::EXIF_ORIENTATION_NORMAL; } @@ -107,7 +109,7 @@ ImageOrientation ExifUtil::stringToOrientation(const std::string& orientation) { } const std::string& ExifUtil::orientationToString(ImageOrientation orientation) { - LoggerD("Entered"); + ScopeLogger(); switch (orientation) { case ImageOrientation::EXIF_ORIENTATION_NORMAL: return ORIENTATION_NORMAL; @@ -131,7 +133,7 @@ const std::string& ExifUtil::orientationToString(ImageOrientation orientation) { } WhiteBalanceMode ExifUtil::stringToWhiteBalance(const std::string& white_balance) { - LoggerD("Entered"); + ScopeLogger(); if (WHITE_BALANCE_MODE_AUTO == white_balance) { return WhiteBalanceMode::EXIF_WHITE_BALANCE_MODE_AUTO; } @@ -142,7 +144,7 @@ WhiteBalanceMode ExifUtil::stringToWhiteBalance(const std::string& white_balance } const std::string& ExifUtil::whiteBalanceToString(WhiteBalanceMode value) { - LoggerD("Entered"); + ScopeLogger(); switch (value) { case WhiteBalanceMode::EXIF_WHITE_BALANCE_MODE_AUTO: return WHITE_BALANCE_MODE_AUTO; @@ -154,7 +156,7 @@ const std::string& ExifUtil::whiteBalanceToString(WhiteBalanceMode value) { } ExposureProgram ExifUtil::stringToExposureProgram(const std::string& exposure_program) { - LoggerD("Entered"); + ScopeLogger(); if (EXPOSURE_PROGRAM_NOT_DEFINED == exposure_program) { return EXIF_EXPOSURE_PROGRAM_NOT_DEFINED; } @@ -186,7 +188,7 @@ ExposureProgram ExifUtil::stringToExposureProgram(const std::string& exposure_pr } const std::string& ExifUtil::exposureProgramToString(ExposureProgram value) { - LoggerD("Entered"); + ScopeLogger(); switch (value) { case ExposureProgram::EXIF_EXPOSURE_PROGRAM_NOT_DEFINED: return EXPOSURE_PROGRAM_NOT_DEFINED; @@ -215,6 +217,7 @@ const std::string& ExifUtil::exposureProgramToString(ExposureProgram value) { // in: uri = file://TZ_USER_IMAGES/exif.jpg // out: path = TZ_USER_IMAGES/exif.jpg std::string ExifUtil::convertUriToPath(const std::string& str) { + ScopeLogger(); std::string path = ltrim(str); std::string prefix = path.substr(0, URI_PREFIX.size()); @@ -226,6 +229,7 @@ std::string ExifUtil::convertUriToPath(const std::string& str) { } std::string ExifUtil::ltrim(const std::string& s) { + ScopeLogger(); std::string str = s; std::string::iterator i; for (i = str.begin(); i != str.end(); ++i) { @@ -243,6 +247,7 @@ std::string ExifUtil::ltrim(const std::string& s) { } time_t ExifUtil::exifDateTimeOriginalToTimeT(const char* string) { + ScopeLogger(); int year, month, day, hour, min, sec; if (sscanf(string, "%5d:%5d:%5d %5d:%5d:%5d", &year, &month, &day, &hour, &min, &sec) >= 6) { return convertToTimeT(year, month, day, hour, min, sec); @@ -252,6 +257,7 @@ time_t ExifUtil::exifDateTimeOriginalToTimeT(const char* string) { } std::string ExifUtil::timeTToExifDateTimeOriginal(time_t time) { + ScopeLogger(); int year, month, day, hour, min, sec; extractFromTimeT(time, year, month, day, hour, min, sec); @@ -267,6 +273,7 @@ std::string ExifUtil::timeTToExifDateTimeOriginal(time_t time) { } const Rationals ExifUtil::timeTToExifGpsTimeStamp(time_t time) { + ScopeLogger(); int year, month, day, hour, min, sec; extractFromTimeT(time, year, month, day, hour, min, sec); @@ -283,6 +290,7 @@ const Rationals ExifUtil::timeTToExifGpsTimeStamp(time_t time) { } std::string ExifUtil::timeTToExifGpsDateStamp(time_t time) { + ScopeLogger(); int year, month, day, hour, min, sec; extractFromTimeT(time, year, month, day, hour, min, sec); @@ -301,6 +309,7 @@ std::string ExifUtil::timeTToExifGpsDateStamp(time_t time) { } size_t ExifUtil::getSizeOfExifFormatType(ExifFormat format) { + ScopeLogger(); std::size_t size_per_member = 0; switch (format) { case EXIF_FORMAT_BYTE: @@ -331,6 +340,7 @@ size_t ExifUtil::getSizeOfExifFormatType(ExifFormat format) { } void ExifUtil::printExifEntryInfo(ExifEntry* entry, ExifData* exif_data) { + ScopeLogger(); char buf[2000]; std::stringstream ss; @@ -372,6 +382,7 @@ void ExifUtil::printExifEntryInfo(ExifEntry* entry, ExifData* exif_data) { void ExifUtil::extractFromTimeT(const time_t time, int& out_year, int& out_month, int& out_day, int& out_hour, int& out_min, int& out_sec) { + ScopeLogger(); struct tm utc; gmtime_r(&time, &utc); @@ -384,6 +395,7 @@ void ExifUtil::extractFromTimeT(const time_t time, int& out_year, int& out_month } time_t ExifUtil::convertToTimeT(int year, int month, int day, int hour, int min, int sec) { + ScopeLogger(); struct tm timeinfo = {0}; time_t tmp_time = 0; tzset(); diff --git a/src/exif/get_exif_info.cc b/src/exif/get_exif_info.cc index 0c2efe07..e80f8f09 100644 --- a/src/exif/get_exif_info.cc +++ b/src/exif/get_exif_info.cc @@ -38,7 +38,7 @@ struct ExifDataHolder { }; Rational GetRationalFromEntry(ExifEntry* entry, ExifData* exif_data) { - LoggerD("Entered"); + ScopeLogger(); if (EXIF_FORMAT_RATIONAL == entry->format && entry->components >= 1 && entry->data) { const ExifByteOrder order = exif_data_get_byte_order(exif_data); return Rational(exif_get_rational(entry->data, order)); @@ -49,7 +49,7 @@ Rational GetRationalFromEntry(ExifEntry* entry, ExifData* exif_data) { bool GetRationalsFromEntry(ExifEntry* entry, ExifData* exif_data, unsigned long required_count, Rationals& out_rationals) { - LoggerD("Entered"); + ScopeLogger(); if (EXIF_FORMAT_RATIONAL == entry->format && entry->components >= required_count && entry->data) { const ExifByteOrder order = exif_data_get_byte_order(exif_data); unsigned char* ptr = entry->data; @@ -67,7 +67,7 @@ bool GetRationalsFromEntry(ExifEntry* entry, ExifData* exif_data, unsigned long bool GetGCSPositionFromEntry(ExifEntry* entry, ExifData* exif_data, GCSPosition& out_pos) { // RATIONAL - 3 - LoggerD("Entered"); + ScopeLogger(); if (EXIF_FORMAT_RATIONAL == entry->format && entry->components >= 3 && entry->data) { const ExifByteOrder order = exif_data_get_byte_order(exif_data); out_pos.degrees = Rational(exif_get_rational(entry->data, order)); @@ -81,7 +81,7 @@ bool GetGCSPositionFromEntry(ExifEntry* entry, ExifData* exif_data, GCSPosition& } bool DecomposeExifUndefined(ExifEntry* entry, std::string& type, std::string& value) { - LoggerD("Entered"); + ScopeLogger(); if (!entry || !entry->data) { LoggerW("exif entry is NULL/empty"); return false; @@ -101,7 +101,7 @@ bool DecomposeExifUndefined(ExifEntry* entry, std::string& type, std::string& va PlatformResult GetExifInfo::ProcessEntry(ExifEntry* entry, ExifData* exif_data, JsonObject* result_obj) { - LoggerD("Entered"); + ScopeLogger(); char buf[2000]; exif_entry_get_value(entry, buf, sizeof(buf)); ExifUtil::printExifEntryInfo(entry, exif_data); @@ -444,7 +444,7 @@ PlatformResult GetExifInfo::ProcessEntry(ExifEntry* entry, ExifData* exif_data, } void GetExifInfo::ContentForeachFunctionProxy(ExifEntry* entry, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); ExifDataHolder* holder = static_cast(user_data); if (!holder) { LoggerE("holder is NULL"); @@ -465,11 +465,12 @@ void GetExifInfo::ContentForeachFunctionProxy(ExifEntry* entry, void* user_data) } void GetExifInfo::DataForeachFunction(ExifContent* content, void* user_data) { + ScopeLogger(); exif_content_foreach_entry(content, ContentForeachFunctionProxy, user_data); } PlatformResult GetExifInfo::LoadFromURI(const std::string& uri, JsonValue* result) { - LoggerD("Entered"); + ScopeLogger(); const std::string& file_path = ExifUtil::convertUriToPath(uri); ExifData* ed = exif_data_new_from_file(file_path.c_str()); if (!ed) { diff --git a/src/exif/jpeg_file.cc b/src/exif/jpeg_file.cc index b46ed6e2..e0640e1a 100644 --- a/src/exif/jpeg_file.cc +++ b/src/exif/jpeg_file.cc @@ -80,9 +80,11 @@ JpegFile::JpegFile() m_padding_data_size(0), m_in_file(NULL), m_out_file(NULL) { + ScopeLogger(); } JpegFile::~JpegFile() { + ScopeLogger(); delete[] m_in_data; m_in_data = NULL; m_in_data_size = 0; @@ -118,7 +120,7 @@ JpegFile::~JpegFile() { } PlatformResult JpegFile::loadFile(const std::string& path, JpegFilePtr* jpg_ptr) { - LoggerD("Entered"); + ScopeLogger(); JpegFile* new_jpg = new (std::nothrow) JpegFile(); if (!new_jpg) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Memory allocation failed", @@ -136,7 +138,7 @@ PlatformResult JpegFile::loadFile(const std::string& path, JpegFilePtr* jpg_ptr) } PlatformResult JpegFile::load(const std::string& path) { - LoggerD("Entered file: %s", path.c_str()); + ScopeLogger("file: %s", path.c_str()); m_source_file_path = path; @@ -187,7 +189,7 @@ PlatformResult JpegFile::load(const std::string& path) { std::string JpegFile::getPartOfFile(const std::size_t offset, const std::size_t num_bytes_before, const std::size_t num_bytes_after) { - LoggerD("Entered"); + ScopeLogger(); auto start = offset - num_bytes_before; if (offset < num_bytes_before) { start = 0; @@ -207,7 +209,7 @@ std::string JpegFile::getPartOfFile(const std::size_t offset, const std::size_t } common::PlatformResult JpegFile::generateListOfSections() { - LoggerD("Entered"); + ScopeLogger(); // JPEG starts with: // FFD8 (2 bytes) - SOI Marker @@ -407,7 +409,7 @@ common::PlatformResult JpegFile::generateListOfSections() { bool JpegFile::searchForTagInBuffer(const unsigned char* buffer_start, const unsigned char* buffer_end, const JpegMarker marker, std::size_t& out_index) { - LoggerD("Entered start:%p end:%p marker:0x%x", buffer_start, buffer_end, marker); + ScopeLogger("start:%p end:%p marker:0x%x", buffer_start, buffer_end, marker); if (!buffer_start) { LoggerE("buffer_start is NULL"); @@ -441,7 +443,7 @@ bool JpegFile::searchForTagInBuffer(const unsigned char* buffer_start, } PlatformResult JpegFile::setNewExifData(ExifData* new_exif_data) { - LoggerD("Entered"); + ScopeLogger(); AssertMsg(new_exif_data, "Trying to set NULL exif_data!"); JpegFileSectionPtr exif = getExifSection(); @@ -496,7 +498,7 @@ PlatformResult JpegFile::setNewExifData(ExifData* new_exif_data) { } ExifData* JpegFile::getExifData() { - LoggerD("Entered"); + ScopeLogger(); JpegFileSectionPtr exif = getExifSection(); if (!exif) { return NULL; @@ -507,7 +509,7 @@ ExifData* JpegFile::getExifData() { } PlatformResult JpegFile::saveToFile(const std::string& out_path) { - LoggerD("Entered out_path:%s", out_path.c_str()); + ScopeLogger("out_path:%s", out_path.c_str()); PlatformResult status = saveToFilePriv(out_path); if (status) return status; @@ -550,7 +552,7 @@ PlatformResult JpegFile::saveToFile(const std::string& out_path) { } PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { - LoggerD("Entered out_path:%s", out_path.c_str()); + ScopeLogger("out_path:%s", out_path.c_str()); m_out_file = fopen(out_path.c_str(), "wb"); if (!m_out_file) { @@ -691,7 +693,7 @@ PlatformResult JpegFile::saveToFilePriv(const std::string& out_path) { } JpegFileSectionPtr JpegFile::getExifSection() { - LoggerD("Entered"); + ScopeLogger(); std::size_t num_exif_sections = 0; JpegFileSectionPtr first_exif_section; diff --git a/src/exif/rational.cc b/src/exif/rational.cc index 2df69705..fb0e4466 100644 --- a/src/exif/rational.cc +++ b/src/exif/rational.cc @@ -31,17 +31,20 @@ const double DOUBLE_ERROR_REPRESENTATION = static_cast(0x7FFFFFFF); } // namespace Rational::Rational() : nominator(0), denominator(0) { + ScopeLogger(); } Rational::Rational(ExifLong nom, ExifLong denom) : nominator(nom), denominator(denom) { + ScopeLogger(); } Rational::Rational(const ExifRational& exif_rational) : nominator(exif_rational.numerator), denominator(exif_rational.denominator) { + ScopeLogger(); } Rational Rational::createFromDouble(const double value, const long precision) { - LoggerD("Entered value:%f precision:%d", value, precision); + ScopeLogger("value:%f precision:%d", value, precision); if (value < 0.0) { LoggerW("Trying to create negative Rational: %f!", value); return Rational(); @@ -149,7 +152,7 @@ double Rational::toDouble() const { } Rational Rational::createFromExposureTimeString(const std::string& exp_time) { - LoggerD("Entered"); + ScopeLogger(); if (exp_time.length() == 0) { return Rational::createInvalid(); // lets assume that empty string means 0, // however exposure time = 0 is @@ -219,7 +222,7 @@ std::string Rational::toString() const { } std::string Rational::toExposureTimeString() const { - LoggerD("Entered"); + ScopeLogger(); if (!isValid() || 0 == nominator) { return std::string(); } diff --git a/src/feedback/feedback_instance.cc b/src/feedback/feedback_instance.cc index fe5719bd..ac06ef55 100644 --- a/src/feedback/feedback_instance.cc +++ b/src/feedback/feedback_instance.cc @@ -45,7 +45,7 @@ const std::string kPrivilegeHaptic = "http://tizen.org/privilege/haptic"; FeedbackInstance::FeedbackInstance() : m_feedbackMapsPtr(new FeedbackMaps), m_feedbackManagerPtr(new FeedbackManager(this->m_feedbackMapsPtr)) { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&FeedbackInstance::x, this, _1, _2)); @@ -56,11 +56,11 @@ FeedbackInstance::FeedbackInstance() } FeedbackInstance::~FeedbackInstance() { - LoggerD("Enter"); + ScopeLogger(); } void FeedbackInstance::IsPatternSupported(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const auto pattern = args.get("pattern").get(); const auto type = args.get("type").get(); @@ -75,7 +75,7 @@ void FeedbackInstance::IsPatternSupported(const picojson::value& args, picojson: } void FeedbackInstance::Play(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeHaptic, &out); @@ -91,7 +91,7 @@ void FeedbackInstance::Play(const picojson::value& args, picojson::object& out) } void FeedbackInstance::Stop(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeHaptic, &out); diff --git a/src/feedback/feedback_manager.cc b/src/feedback/feedback_manager.cc index cc5da3d2..3aba534a 100644 --- a/src/feedback/feedback_manager.cc +++ b/src/feedback/feedback_manager.cc @@ -73,9 +73,12 @@ FeedbackMaps::FeedbackMaps() {"BT_DISCONNECTED", FEEDBACK_PATTERN_BT_DISCONNECTED}, {"LIST_REORDER", FEEDBACK_PATTERN_LIST_REORDER}, {"LIST_SLIDER", FEEDBACK_PATTERN_LIST_SLIDER}, - {"VOLUME_KEY", FEEDBACK_PATTERN_VOLUME_KEY}} {}; + {"VOLUME_KEY", FEEDBACK_PATTERN_VOLUME_KEY}} { + ScopeLogger(); +}; FeedbackMaps::~FeedbackMaps() { + ScopeLogger(); } feedback_pattern_e const &FeedbackMaps::getPatternFromMap(const std::string &pattern) { @@ -102,7 +105,7 @@ void FeedbackMaps::setPatternSupport(const feedback_pattern_e pattern, const fee } FeedbackManager::FeedbackManager(std::shared_ptr maps) : m_feedbackMapsPtr(maps) { - LoggerD("Entered"); + ScopeLogger(); // feedback API initialization int ret = feedback_initialize(); if (ret != FEEDBACK_ERROR_NONE) { @@ -111,7 +114,7 @@ FeedbackManager::FeedbackManager(std::shared_ptr maps) : m_feedbac } FeedbackManager::~FeedbackManager() { - LoggerD("Entered"); + ScopeLogger(); // feedback library deinitialization int ret = feedback_deinitialize(); @@ -123,7 +126,7 @@ FeedbackManager::~FeedbackManager() { common::PlatformResult FeedbackManager::isPatternSupported(const std::string &pattern, const std::string &type, bool *patternStatus) { - LoggerD("Entered"); + ScopeLogger(); auto &pattern_e = m_feedbackMapsPtr->getPatternFromMap(pattern); auto &type_e = m_feedbackMapsPtr->getTypeFromMap(type); @@ -145,7 +148,7 @@ common::PlatformResult FeedbackManager::isPatternSupported(const std::string &pa } common::PlatformResult FeedbackManager::play(const std::string &pattern, const std::string &type) { - LoggerD("Entered"); + ScopeLogger(); int ret = 0; if (type == "any") { ret = feedback_play(m_feedbackMapsPtr->getPatternFromMap(pattern)); @@ -174,7 +177,7 @@ common::PlatformResult FeedbackManager::play(const std::string &pattern, const s } common::PlatformResult FeedbackManager::stop() { - LoggerD("Entered"); + ScopeLogger(); int ret = feedback_stop(); if (ret != FEEDBACK_ERROR_NONE && ret != FEEDBACK_ERROR_NOT_SUPPORTED) { @@ -186,7 +189,7 @@ common::PlatformResult FeedbackManager::stop() { } PlatformResult FeedbackManager::CodeToResult(const int errorCode, const std::string &message) { - LoggerD("Entered"); + ScopeLogger(); switch (errorCode) { case FEEDBACK_ERROR_NOT_SUPPORTED: @@ -200,7 +203,7 @@ PlatformResult FeedbackManager::CodeToResult(const int errorCode, const std::str } const std::string FeedbackManager::getFeedbackErrorMessage(const int error_code) { - LoggerD("Error code : %d", error_code); + ScopeLogger("Error code : %d", error_code); switch (error_code) { case FEEDBACK_ERROR_OPERATION_FAILED: diff --git a/src/filesystem/filesystem_file.cc b/src/filesystem/filesystem_file.cc index bc0734cd..904b6094 100644 --- a/src/filesystem/filesystem_file.cc +++ b/src/filesystem/filesystem_file.cc @@ -76,7 +76,7 @@ bool validateCharacter(char c) { */ bool FilesystemBuffer::DecodeData(const std::string& data) { - LoggerD("Enter"); + ScopeLogger(); if (data.length() % 4) { LoggerE("Buffer has invalid length"); return false; @@ -132,7 +132,7 @@ bool FilesystemBuffer::DecodeData(const std::string& data) { } std::string FilesystemBuffer::EncodeData() const { - LoggerD("Enter"); + ScopeLogger(); std::string out; for (size_t i = 0; i < size(); i += 3) { @@ -159,10 +159,11 @@ std::string FilesystemBuffer::EncodeData() const { } FilesystemFile::FilesystemFile(const std::string& path_) : path(path_) { + ScopeLogger(); } bool FilesystemFile::Read(FilesystemBuffer* data, size_t offset, size_t length) { - LoggerD("Enter"); + ScopeLogger(); if (!data) { LoggerE("Missing output buffer"); return false; @@ -215,7 +216,7 @@ bool FilesystemFile::Read(FilesystemBuffer* data, size_t offset, size_t length) } bool FilesystemFile::Write(const FilesystemBuffer& data, size_t offset, bool rewrite) { - LoggerD("Enter"); + ScopeLogger(); FILE* file = nullptr; if (rewrite) { diff --git a/src/filesystem/filesystem_instance.cc b/src/filesystem/filesystem_instance.cc index 3c948258..7a6e3f01 100644 --- a/src/filesystem/filesystem_instance.cc +++ b/src/filesystem/filesystem_instance.cc @@ -38,7 +38,7 @@ using namespace common; using namespace extension::filesystem; FilesystemInstance::FilesystemInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -71,7 +71,7 @@ FilesystemInstance::FilesystemInstance() { } FilesystemInstance::~FilesystemInstance() { - LoggerD("enter"); + ScopeLogger(); FilesystemManager::GetInstance().StopListening(); FilesystemManager::GetInstance().RemoveListener(); } @@ -83,19 +83,19 @@ FilesystemInstance::~FilesystemInstance() { } void FilesystemInstance::FileCreateSync(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "location", out) const std::string& location = args.get("location").get(); auto onSuccess = [&](const FilesystemStat& data) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); ReportSuccess(data.toJSON(), out); }; auto onError = [&](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); PrepareError(e, out); }; @@ -103,7 +103,7 @@ void FilesystemInstance::FileCreateSync(const picojson::value& args, picojson::o } void FilesystemInstance::FileRename(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "oldPath", out) @@ -114,7 +114,7 @@ void FilesystemInstance::FileRename(const picojson::value& args, picojson::objec const std::string& newPath = args.get("newPath").get(); auto onSuccess = [this, callback_id](const FilesystemStat& data) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -123,7 +123,7 @@ void FilesystemInstance::FileRename(const picojson::value& args, picojson::objec }; auto onError = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -137,7 +137,7 @@ void FilesystemInstance::FileRename(const picojson::value& args, picojson::objec } void FilesystemInstance::FileRead(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "offset", out) @@ -149,7 +149,7 @@ void FilesystemInstance::FileRead(const picojson::value& args, picojson::object& size_t length = static_cast(args.get("length").get()); auto onSuccess = [this, callback_id](const std::string& data) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -158,7 +158,7 @@ void FilesystemInstance::FileRead(const picojson::value& args, picojson::object& }; auto onError = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -172,7 +172,7 @@ void FilesystemInstance::FileRead(const picojson::value& args, picojson::object& } void FilesystemInstance::FileReadSync(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "offset", out) @@ -183,12 +183,12 @@ void FilesystemInstance::FileReadSync(const picojson::value& args, picojson::obj size_t length = static_cast(args.get("length").get()); auto onSuccess = [this, &out](const std::string& data) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); ReportSuccess(picojson::value(data), out); }; auto onError = [this, &out](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); PrepareError(e, out); }; @@ -196,7 +196,7 @@ void FilesystemInstance::FileReadSync(const picojson::value& args, picojson::obj } void FilesystemInstance::FileWrite(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "data", out) @@ -210,7 +210,7 @@ void FilesystemInstance::FileWrite(const picojson::value& args, picojson::object bool rewrite = static_cast(args.get("rewrite").get()); auto onSuccess = [this, callback_id]() { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -219,7 +219,7 @@ void FilesystemInstance::FileWrite(const picojson::value& args, picojson::object }; auto onError = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -233,7 +233,7 @@ void FilesystemInstance::FileWrite(const picojson::value& args, picojson::object } void FilesystemInstance::FileWriteSync(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "data", out) @@ -246,12 +246,12 @@ void FilesystemInstance::FileWriteSync(const picojson::value& args, picojson::ob bool rewrite = static_cast(args.get("rewrite").get()); auto onSuccess = [this, &out]() { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); ReportSuccess(out); }; auto onError = [this, &out](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); PrepareError(e, out); }; @@ -259,7 +259,7 @@ void FilesystemInstance::FileWriteSync(const picojson::value& args, picojson::ob } void FilesystemInstance::FileStat(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "location", out) @@ -268,7 +268,7 @@ void FilesystemInstance::FileStat(const picojson::value& args, picojson::object& const std::string& location = args.get("location").get(); auto onSuccess = [this, callback_id](const FilesystemStat& data) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -277,7 +277,7 @@ void FilesystemInstance::FileStat(const picojson::value& args, picojson::object& }; auto onError = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -291,19 +291,19 @@ void FilesystemInstance::FileStat(const picojson::value& args, picojson::object& } void FilesystemInstance::FileStatSync(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); CHECK_EXIST(args, "location", out) const std::string& location = args.get("location").get(); auto onSuccess = [&](const FilesystemStat& data) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); ReportSuccess(data.toJSON(), out); }; auto onError = [&](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); PrepareError(e, out); }; @@ -312,10 +312,10 @@ void FilesystemInstance::FileStatSync(const picojson::value& args, picojson::obj void FilesystemInstance::FilesystemFetchVirtualRoots(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); auto onSuccess = [&](const std::vector& result) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::array roots; for (const auto& root : result) { roots.push_back(root.ToJson()); @@ -324,7 +324,7 @@ void FilesystemInstance::FilesystemFetchVirtualRoots(const picojson::value& args }; auto onError = [&](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); PrepareError(e, out); }; @@ -333,10 +333,10 @@ void FilesystemInstance::FilesystemFetchVirtualRoots(const picojson::value& args void FilesystemInstance::FileSystemManagerFetchStorages(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); auto onSuccess = [&](const common::Storages& result) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::array storages; storages.reserve(result.size()); for (const auto storage : result) { @@ -346,28 +346,28 @@ void FilesystemInstance::FileSystemManagerFetchStorages(const picojson::value& a }; auto onError = [&](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); PrepareError(e, out); }; FilesystemManager::GetInstance().FetchStorages(onSuccess, onError); } void FilesystemInstance::StartListening(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); FilesystemManager::GetInstance().StartListening(); ReportSuccess(out); } void FilesystemInstance::StopListening(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); FilesystemManager::GetInstance().StopListening(); ReportSuccess(out); } void FilesystemInstance::onFilesystemStateChangeSuccessCallback(const common::Storage& storage) { - LoggerD("entered"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); @@ -379,7 +379,7 @@ void FilesystemInstance::onFilesystemStateChangeSuccessCallback(const common::St } void FilesystemInstance::onFilesystemStateChangeErrorCallback() { - LoggerD("enter"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); LogAndReportError(UnknownException(std::string("Failed to registerd listener")), obj); @@ -390,7 +390,7 @@ void FilesystemInstance::onFilesystemStateChangeErrorCallback() { void FilesystemInstance::FileSystemManagerMakeDirectory(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "location", out) @@ -398,7 +398,7 @@ void FilesystemInstance::FileSystemManagerMakeDirectory(const picojson::value& a const std::string& location = args.get("location").get(); auto onResult = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onResult"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -410,6 +410,7 @@ void FilesystemInstance::FileSystemManagerMakeDirectory(const picojson::value& a }; auto onAction = [location, onResult]() { + ScopeLogger("Entered into asynchronous function, onAction"); FilesystemManager::GetInstance().MakeDirectory(location, onResult); }; @@ -418,14 +419,14 @@ void FilesystemInstance::FileSystemManagerMakeDirectory(const picojson::value& a void FilesystemInstance::FileSystemManagerMakeDirectorySync(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "location", out) const std::string& location = args.get("location").get(); auto onResult = [&](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onResult"); if (e == FilesystemError::DirectoryExists) ReportSuccess(out); else @@ -436,7 +437,7 @@ void FilesystemInstance::FileSystemManagerMakeDirectorySync(const picojson::valu } void FilesystemInstance::ReadDir(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); CHECK_EXIST(args, "pathToDir", out) CHECK_EXIST(args, "callbackId", out) @@ -445,7 +446,7 @@ void FilesystemInstance::ReadDir(const picojson::value& args, picojson::object& const std::string& pathToDir = args.get("pathToDir").get(); auto onSuccess = [this, callback_id](const std::vector& paths) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::value result = picojson::value(picojson::array()); ; picojson::array& statPaths = result.get(); @@ -461,7 +462,7 @@ void FilesystemInstance::ReadDir(const picojson::value& args, picojson::object& }; auto onError = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -475,7 +476,7 @@ void FilesystemInstance::ReadDir(const picojson::value& args, picojson::object& } void FilesystemInstance::UnlinkFile(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "pathToFile", out) @@ -483,7 +484,7 @@ void FilesystemInstance::UnlinkFile(const picojson::value& args, picojson::objec const std::string& pathToFile = args.get("pathToFile").get(); auto onSuccess = [this, callback_id]() { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::value result = picojson::value(); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); @@ -493,7 +494,7 @@ void FilesystemInstance::UnlinkFile(const picojson::value& args, picojson::objec }; auto onError = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -507,7 +508,7 @@ void FilesystemInstance::UnlinkFile(const picojson::value& args, picojson::objec } void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "pathToDelete", out) @@ -515,7 +516,7 @@ void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson:: const std::string& pathToDelete = args.get("pathToDelete").get(); auto onSuccess = [this, callback_id]() { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::value result = picojson::value(); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); @@ -525,7 +526,7 @@ void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson:: }; auto onError = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -539,7 +540,7 @@ void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson:: } void FilesystemInstance::CopyTo(const picojson::value& args, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "originFilePath", out) @@ -552,7 +553,7 @@ void FilesystemInstance::CopyTo(const picojson::value& args, picojson::object& o const bool& overwrite = args.get("overwrite").get(); auto onSuccess = [this, callback_id]() { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); picojson::value result = picojson::value(); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); @@ -562,7 +563,7 @@ void FilesystemInstance::CopyTo(const picojson::value& args, picojson::object& o }; auto onError = [this, callback_id](FilesystemError e) { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, onError"); picojson::value response = picojson::value(picojson::object()); picojson::object& obj = response.get(); obj["callbackId"] = picojson::value(callback_id); @@ -576,7 +577,7 @@ void FilesystemInstance::CopyTo(const picojson::value& args, picojson::object& o } void FilesystemInstance::PrepareError(const FilesystemError& error, picojson::object& out) { - LoggerD("enter"); + ScopeLogger(); switch (error) { case FilesystemError::None: LogAndReportError(UnknownException("PLATFORM ERROR"), out); @@ -616,19 +617,19 @@ void FilesystemInstance::PrepareError(const FilesystemError& error, picojson::ob void FilesystemInstance::FileSystemManagerGetCanonicalPath(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); // TODO: any privilege needed? CHECK_EXIST(args, "path", out); const std::string& path = args.get("path").get(); auto onSuccess = [&](const std::string& canonicalPath) { - LoggerD("Enter"); + ScopeLogger("Entered into asynchronous function, onSuccess"); ReportSuccess(picojson::value(canonicalPath), out); }; auto onError = [&](FilesystemError e) { - LoggerD("Enter"); + ScopeLogger("Entered into asynchronous function, onError"); PrepareError(e, out); }; diff --git a/src/filesystem/filesystem_manager.cc b/src/filesystem/filesystem_manager.cc index d4c7b7e4..7407aa03 100644 --- a/src/filesystem/filesystem_manager.cc +++ b/src/filesystem/filesystem_manager.cc @@ -62,7 +62,7 @@ int unlink_with_base_dir_cb(const char* fpath, const struct stat* sb, int typefl } FilesystemError copyFile(const std::string& originPath, const std::string& destPath) { - LoggerD("enter src %s dst %s", originPath.c_str(), destPath.c_str()); + ScopeLogger("src %s dst %s", originPath.c_str(), destPath.c_str()); std::ifstream src(originPath, std::ios::in | std::ios::binary); std::ofstream dst(destPath, std::ios::out | std::ios::binary); @@ -80,7 +80,7 @@ FilesystemError copyFile(const std::string& originPath, const std::string& destP } FilesystemError copyDirectory(const std::string& originPath, const std::string& destPath) { - LoggerD("enter src %s dst %s", originPath.c_str(), destPath.c_str()); + ScopeLogger("src %s dst %s", originPath.c_str(), destPath.c_str()); FilesystemStat destStat = FilesystemStat::getStat(destPath); int status; @@ -127,7 +127,7 @@ FilesystemError copyDirectory(const std::string& originPath, const std::string& FilesystemError perform_deep_copy(const std::string& originPath, const std::string& destPath, bool overwrite) { - LoggerD("enter src %s dst %s", originPath.c_str(), destPath.c_str()); + ScopeLogger("rc %s dst %s", originPath.c_str(), destPath.c_str()); FilesystemStat originStat = FilesystemStat::getStat(originPath); FilesystemStat destStat = FilesystemStat::getStat(destPath); int status; @@ -184,7 +184,7 @@ FilesystemError perform_deep_copy(const std::string& originPath, const std::stri } FilesystemError make_directory_worker(const std::string& path) { - LoggerD("enter: %s", path.c_str()); + ScopeLogger("path %s", path.c_str()); auto fsstat = FilesystemStat::getStat(path); if (fsstat.valid) { if (fsstat.isDirectory) { @@ -216,22 +216,22 @@ FilesystemError make_directory_worker(const std::string& path) { void FilesystemManager::FetchStorages( const std::function& success_cb, const std::function& error_cb) { - LoggerD("Entered"); + ScopeLogger(); success_cb(fs_provider_.GetStorages()); } FilesystemManager::FilesystemManager() : listener_(nullptr), fs_provider_(common::FilesystemProvider::Create()) { - LoggerD("enter"); + ScopeLogger(); } FilesystemManager::~FilesystemManager() { - LoggerD("enter"); + ScopeLogger(); } FilesystemManager& FilesystemManager::GetInstance() { - LoggerD("enter"); + ScopeLogger(); static FilesystemManager instance; return instance; } @@ -239,7 +239,7 @@ FilesystemManager& FilesystemManager::GetInstance() { void FilesystemManager::StatPath(const std::string& path, const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); FilesystemStat statData = FilesystemStat::getStat(path); if (!statData.valid) { error_cb(statData.error); @@ -252,14 +252,14 @@ void FilesystemManager::StatPath(const std::string& path, void FilesystemManager::GetVirtualRoots( const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); success_cb(fs_provider_.GetVirtualPaths()); } void FilesystemManager::CreateFile(const std::string& path, const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); const mode_t create_mode = S_IRWXU | S_IRWXG | S_IRWXO; int status; status = TEMP_FAILURE_RETRY(open(path.c_str(), O_RDWR | O_CREAT, create_mode)); @@ -285,14 +285,14 @@ void FilesystemManager::CreateFile(const std::string& path, void FilesystemManager::MakeDirectory(const std::string& path, const std::function& result_cb) { - LoggerD("enter"); + ScopeLogger(); result_cb(make_directory_worker(path)); } void FilesystemManager::Rename(const std::string& oldPath, const std::string& newPath, const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); int status = rename(oldPath.c_str(), newPath.c_str()); if (0 != status) { @@ -345,7 +345,7 @@ void FilesystemManager::Rename(const std::string& oldPath, const std::string& ne void FilesystemManager::ReadDir( const std::string& path, const std::function&)>& success_cb, const std::function& error_cb) { - LoggerD("entered"); + ScopeLogger(); std::vector fileList; DIR* dp = nullptr; @@ -375,7 +375,7 @@ void FilesystemManager::ReadDir( void FilesystemManager::UnlinkFile(const std::string& path, const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); if (unlink(path.c_str()) != 0) { LoggerE("Error occured while deleting file"); error_cb(FilesystemError::Other); @@ -387,7 +387,7 @@ void FilesystemManager::UnlinkFile(const std::string& path, const std::function< void FilesystemManager::RemoveDirectory(const std::string& path, const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); const int maxDirOpened = 64; if (nftw(path.c_str(), unlink_with_base_dir_cb, maxDirOpened, FTW_DEPTH | FTW_PHYS) != 0) { LoggerE("Error occured"); @@ -400,7 +400,7 @@ void FilesystemManager::RemoveDirectory(const std::string& path, void FilesystemManager::FileRead(const std::string& path, size_t offset, size_t length, const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); FilesystemFile file(path); FilesystemBuffer buffer; if (!file.Read(&buffer, offset, length)) { @@ -416,7 +416,7 @@ void FilesystemManager::FileRead(const std::string& path, size_t offset, size_t void FilesystemManager::FileWrite(const std::string& path, const std::string& data, size_t offset, bool rewrite, const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); FilesystemFile file(path); FilesystemBuffer buffer; // Decode buffer data @@ -435,7 +435,7 @@ void FilesystemManager::FileWrite(const std::string& path, const std::string& da } void FilesystemManager::StartListening() { - LoggerD("Entered"); + ScopeLogger(); auto set = std::bind(&FilesystemManager::OnStorageDeviceChanged, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3); @@ -443,7 +443,7 @@ void FilesystemManager::StartListening() { } void FilesystemManager::StopListening() { - LoggerD("Entered"); + ScopeLogger(); fs_provider_.UnregisterDeviceChangeState(); } @@ -451,7 +451,7 @@ void FilesystemManager::StopListening() { void FilesystemManager::OnStorageDeviceChanged(common::Storage const& _storage, common::StorageState _old, common::StorageState _new) { - LoggerD("Entered"); + ScopeLogger(); if (listener_) { listener_->onFilesystemStateChangeSuccessCallback(_storage); } @@ -461,7 +461,7 @@ void FilesystemManager::CopyTo(const std::string& originFilePath, const std::string& destinationFilePath, const bool overwrite, const std::function& success_cb, const std::function& error_cb) { - LoggerD("enter"); + ScopeLogger(); FilesystemError retval = perform_deep_copy(originFilePath, destinationFilePath, overwrite); if (FilesystemError::None == retval) { success_cb(); @@ -472,19 +472,19 @@ void FilesystemManager::CopyTo(const std::string& originFilePath, } void FilesystemManager::AddListener(FilesystemStateChangeListener* listener) { - LoggerD("enter"); + ScopeLogger(); listener_ = listener; } void FilesystemManager::RemoveListener() { - LoggerD("enter"); + ScopeLogger(); listener_ = NULL; } void FilesystemManager::GetCanonicalPath(const std::string& path, const std::function& success_cb, const std::function& error_cb) { - LoggerD("Enter"); + ScopeLogger(); char* canonicalPath = nullptr; SCOPE_EXIT { diff --git a/src/filesystem/filesystem_stat.cc b/src/filesystem/filesystem_stat.cc index 889a808c..84646a87 100644 --- a/src/filesystem/filesystem_stat.cc +++ b/src/filesystem/filesystem_stat.cc @@ -39,10 +39,11 @@ FilesystemStat::FilesystemStat() mtime(0), size(0), nlink(0) { + ScopeLogger(); } picojson::value FilesystemStat::toJSON() const { - LoggerD("Enter"); + ScopeLogger(); picojson::value retval = picojson::value(picojson::object()); picojson::object& obj = retval.get(); @@ -59,12 +60,10 @@ picojson::value FilesystemStat::toJSON() const { } FilesystemStat FilesystemStat::getStat(const std::string& path) { - LoggerD("Enter"); + ScopeLogger(); struct stat aStatObj; FilesystemStat _result; - LoggerD("enter"); - if (0 != stat(path.c_str(), &aStatObj)) { if (ENOENT == errno) { LoggerI("File/directory: %s not found", path.c_str()); diff --git a/src/filesystem/filesystem_utils.cc b/src/filesystem/filesystem_utils.cc old mode 100755 new mode 100644 index c437b318..c6d04e5a --- a/src/filesystem/filesystem_utils.cc +++ b/src/filesystem/filesystem_utils.cc @@ -21,7 +21,7 @@ namespace FilesystemUtils { std::string get_storage_dir_path(int id, storage_directory_e typeToCheck) { - LoggerD("Enter"); + ScopeLogger(); char* platformPath = NULL; int result = storage_get_directory(id, typeToCheck, &platformPath); if (STORAGE_ERROR_NONE != result) { @@ -35,6 +35,7 @@ std::string get_storage_dir_path(int id, storage_directory_e typeToCheck) { } std::string get_dirname(const std::string& path) { + ScopeLogger(); char* dir = g_path_get_dirname(path.c_str()); if (dir) { std::string dir_result(dir); @@ -46,6 +47,7 @@ std::string get_dirname(const std::string& path) { } std::string get_basename(const std::string& path) { + ScopeLogger(); // basename will modify content: pass a copy std::string buf = path.c_str(); return std::string(basename(const_cast(buf.c_str()))); diff --git a/src/humanactivitymonitor/humanactivitymonitor_instance.cc b/src/humanactivitymonitor/humanactivitymonitor_instance.cc index efa07abe..8deedb49 100644 --- a/src/humanactivitymonitor/humanactivitymonitor_instance.cc +++ b/src/humanactivitymonitor/humanactivitymonitor_instance.cc @@ -44,7 +44,7 @@ using common::ErrorCode; using common::TaskQueue; HumanActivityMonitorInstance::HumanActivityMonitorInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -68,11 +68,11 @@ HumanActivityMonitorInstance::HumanActivityMonitorInstance() { } HumanActivityMonitorInstance::~HumanActivityMonitorInstance() { - LoggerD("Enter"); + ScopeLogger(); } PlatformResult HumanActivityMonitorInstance::Init() { - LoggerD("Enter"); + ScopeLogger(); if (!manager_) { manager_ = std::make_shared(); const PlatformResult& result = manager_->Init(); @@ -95,7 +95,7 @@ PlatformResult HumanActivityMonitorInstance::Init() { void HumanActivityMonitorInstance::HumanActivityMonitorManagerGetHumanActivityData( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "type", out) CHECK_PRIVILEGE_ACCESS(kPrivilegeHealthInfo, &out); @@ -115,6 +115,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerGetHumanActivityDa const auto callback_id = args.get("callbackId").get(); auto get = [this, type, callback_id]() -> void { + ScopeLogger("Entered into asynchronous function, get"); picojson::value response = picojson::value(picojson::object()); picojson::object& response_obj = response.get(); response_obj["callbackId"] = picojson::value(callback_id); @@ -138,7 +139,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerGetHumanActivityDa void HumanActivityMonitorInstance::HumanActivityMonitorManagerStart(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "type", out) CHECK_PRIVILEGE_ACCESS(kPrivilegeHealthInfo, &out); @@ -158,6 +159,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerStart(const picojs const auto listener_id = args.get("listenerId").get(); JsonCallback cb = [this, listener_id](picojson::value* data) -> void { + ScopeLogger("Entered into asynchronous function, cb"); if (!data) { LOGGER(ERROR) << "No data passed to json callback"; return; @@ -179,7 +181,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerStart(const picojs void HumanActivityMonitorInstance::HumanActivityMonitorManagerStop(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "type", out) CHECK_PRIVILEGE_ACCESS(kPrivilegeHealthInfo, &out); @@ -206,7 +208,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerStop(const picojso void HumanActivityMonitorInstance::HumanActivityMonitorManagerAddActivityRecognitionListener( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeHealthInfo, &out); CHECK_EXIST(args, "type", out) @@ -221,6 +223,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerAddActivityRecogni const auto& listener_id = args.get("listenerId").get(); JsonCallback cb = [this, listener_id](picojson::value* data) -> void { + ScopeLogger("Entered into asynchronous function, cb"); if (!data) { LOGGER(ERROR) << "No data passed to json callback"; return; @@ -245,7 +248,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerAddActivityRecogni void HumanActivityMonitorInstance::HumanActivityMonitorManagerRemoveActivityRecognitionListener( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeHealthInfo, &out); CHECK_EXIST(args, "watchId", out) @@ -267,7 +270,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerRemoveActivityReco void HumanActivityMonitorInstance::HumanActivityMonitorManagerStartRecorder( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeHealthInfo, &out); CHECK_EXIST(args, "type", out) @@ -309,7 +312,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerStartRecorder( void HumanActivityMonitorInstance::HumanActivityMonitorManagerStopRecorder( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "type", out) const auto& type = args.get("type").get(); @@ -330,7 +333,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerStopRecorder( void HumanActivityMonitorInstance::HumanActivityMonitorManagerReadRecorderData( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeHealthInfo, &out); CHECK_EXIST(args, "type", out) CHECK_EXIST(args, "query", out) @@ -353,6 +356,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerReadRecorderData( const auto callback_id = args.get("callbackId").get(); auto get = [this, type, query, callback_id]() -> void { + ScopeLogger("Entered into asynchronous function, get"); picojson::value response = picojson::value(picojson::object()); picojson::object& response_obj = response.get(); response_obj["callbackId"] = picojson::value(callback_id); diff --git a/src/humanactivitymonitor/humanactivitymonitor_manager.cc b/src/humanactivitymonitor/humanactivitymonitor_manager.cc index a7417833..269f308e 100644 --- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc +++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc @@ -152,7 +152,7 @@ struct PedometerDataWrapper : public sensor_pedometer_data_t { }; static int64_t getCurrentTimeStamp(unsigned long long evTime) { - LoggerD("Enter"); + ScopeLogger(); struct timespec t; unsigned long long systemCurrentTime = 0; unsigned long long realCurrentTime = 0; @@ -283,7 +283,6 @@ class HumanActivityMonitorManager::Monitor { } JsonCallback& event_callback() { - ScopeLogger(type()); return event_callback_; } @@ -1296,7 +1295,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() ScopeLogger(); auto convert_pedometer = [](sensor_event_s* event, picojson::object* data) -> PlatformResult { - ScopeLogger("convert_pedometer"); + ScopeLogger("Entered into asynchronous function, convert_pedometer"); const auto pedometer_data = (PedometerDataWrapper*)event; @@ -1356,7 +1355,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() }; auto convert_hrm = [](sensor_event_s* event, picojson::object* data) -> PlatformResult { - ScopeLogger("convert_hrm"); + ScopeLogger("Entered into asynchronous function, convert_hrm"); LOGGER(DEBUG) << "Sensor event:"; LOGGER(DEBUG) << " |- accuracy: " << event->accuracy; @@ -1384,7 +1383,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() }; auto convert_sleep = [](sensor_event_s* event, picojson::object* data) -> PlatformResult { - ScopeLogger("convert_sleep"); + ScopeLogger("Entered into asynchronous function, convert_sleep"); if (event->value_count < 1) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "To few values of SLEEP event"); @@ -1419,7 +1418,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() }; auto convert_recorded_pedometer = [](void* data, picojson::object* obj) -> PlatformResult { - ScopeLogger("convert_recorded_pedometer"); + ScopeLogger("Entered into asynchronous function, convert_recorded_pedometer"); SensorRecorderDataMap map_int{{SENSOR_RECORDER_DATA_STEPS, kRecordedTotalStepCount}, {SENSOR_RECORDER_DATA_WALK_STEPS, kRecordedWalkStepCount}, @@ -1442,7 +1441,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() }; auto convert_recorded_hrm = [](void* data, picojson::object* obj) -> PlatformResult { - ScopeLogger("convert_recorded_hrm"); + ScopeLogger("Entered into asynchronous function, convert_recorded_hrm"); SensorRecorderDataMap map_int{ {SENSOR_RECORDER_DATA_HEART_RATE, kRecordedHeartRate}, @@ -1457,7 +1456,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() }; auto convert_recorded_sleep_monitor = [](void* data, picojson::object* obj) -> PlatformResult { - ScopeLogger("convert_recorded_sleep_monitor"); + ScopeLogger("Entered into asynchronous function, convert_recorded_sleep_monitor"); SensorRecorderDataMap map_int{{SENSOR_RECORDER_DATA_SLEEP_STATE, kStatus}}; @@ -1470,7 +1469,7 @@ HumanActivityMonitorManager::HumanActivityMonitorManager() }; auto convert_recorded_pressure = [](void* data, picojson::object* obj) -> PlatformResult { - ScopeLogger("convert_recorded_pressure"); + ScopeLogger("Entered into asynchronous function, convert_recorded_pressure"); SensorRecorderDataMap map_double{{SENSOR_RECORDER_DATA_MAX_PRESSURE, kRecordedMax}, {SENSOR_RECORDER_DATA_MIN_PRESSURE, kRecordedMin}, diff --git a/src/inputdevice/inputdevice_instance.cc b/src/inputdevice/inputdevice_instance.cc index 91d30840..9ec8fd04 100644 --- a/src/inputdevice/inputdevice_instance.cc +++ b/src/inputdevice/inputdevice_instance.cc @@ -21,11 +21,11 @@ namespace extension { namespace inputdevice { InputDeviceInstance::InputDeviceInstance() { - LoggerD("Enter"); + ScopeLogger(); } InputDeviceInstance::~InputDeviceInstance() { - LoggerD("Enter"); + ScopeLogger(); } } // namespace inputdevice diff --git a/src/iotcon/iotcon_instance.cc b/src/iotcon/iotcon_instance.cc index 4996f1e6..c71deebb 100644 --- a/src/iotcon/iotcon_instance.cc +++ b/src/iotcon/iotcon_instance.cc @@ -64,12 +64,12 @@ class CallbackDataManager { bool IfExists(CallbackData* data); private: - CallbackDataManager() {}; - CallbackDataManager(const CallbackDataManager &) = delete; - CallbackDataManager(const CallbackDataManager &&) = delete; - CallbackDataManager& operator=(const CallbackDataManager &) = delete; - CallbackDataManager& operator=(const CallbackDataManager &&) = delete; - ~CallbackDataManager() {}; + CallbackDataManager(){}; + CallbackDataManager(const CallbackDataManager&) = delete; + CallbackDataManager(const CallbackDataManager&&) = delete; + CallbackDataManager& operator=(const CallbackDataManager&) = delete; + CallbackDataManager& operator=(const CallbackDataManager&&) = delete; + ~CallbackDataManager(){}; std::vector callback_; std::mutex callback_mtx_; }; @@ -484,6 +484,7 @@ common::TizenResult IotconInstance::ResourceSetRequestListener(const picojson::o if (!resource->request_listener) { resource->request_listener = [this, id](const common::TizenResult&, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, resource->request_listener"); picojson::value request{picojson::object{}}; auto& obj = request.get(); @@ -983,6 +984,7 @@ common::TizenResult IotconInstance::RemoteResourceStartObserving(const picojson: IotconUtils::ToObservePolicy(args.find(kObservePolicy)->second.get().c_str()); ptr->observe_listener = [this, ptr](const common::TizenResult& res, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, ptr->observe_listener"); picojson::value response{picojson::object{}}; auto& obj = response.get(); @@ -1109,6 +1111,7 @@ common::TizenResult IotconInstance::RemoteResourceStartCaching(const picojson::o ptr->cache_change_listener = [this, ptr](const common::TizenResult& res, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, ptr->cache_change_listener"); picojson::value response{picojson::object{}}; auto& obj = response.get(); @@ -1188,6 +1191,7 @@ common::TizenResult IotconInstance::RemoteResourceSetResourceStateChangeListener } ptr->state_listener = [this, ptr](const common::TizenResult& res, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, ptr->state_listener"); picojson::value response{picojson::object{}}; auto& obj = response.get(); @@ -1352,6 +1356,7 @@ common::TizenResult IotconInstance::ClientFindResource(const picojson::object& a long long id = GetId(args); auto response = [this, id](const common::TizenResult& res, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, response"); picojson::value response{picojson::object{}}; auto& obj = response.get(); @@ -1417,6 +1422,7 @@ common::TizenResult IotconInstance::ClientAddPresenceEventListener(const picojso long long id = presence->id; presence->presence_listener = [this, id](const common::TizenResult&, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, presence->presence_listener"); picojson::value response{picojson::object{}}; auto& obj = response.get(); @@ -1514,6 +1520,7 @@ common::TizenResult IotconInstance::ClientFindDeviceInfo(const picojson::object& long long id = GetId(args); auto response = [this, id](const common::TizenResult& res, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, response"); picojson::value response{picojson::object{}}; auto& obj = response.get(); @@ -1611,6 +1618,7 @@ common::TizenResult IotconInstance::ClientFindPlatformInfo(const picojson::objec long long id = GetId(args); auto response = [this, id](const common::TizenResult& res, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, response"); picojson::value response{picojson::object{}}; auto& obj = response.get(); @@ -1814,6 +1822,7 @@ common::TizenResult IotconInstance::AddGeneratedPinListener(const picojson::obje ScopeLogger(); auto listener = [this](const char* pin, long watchId) { + ScopeLogger("Entered into asynchronous function, listener"); picojson::object obj; obj[kId] = picojson::value{(double)watchId}; obj["pin"] = picojson::value{pin}; @@ -1837,6 +1846,7 @@ common::PostCallback IotconInstance::PostForMethodCall(const common::AsyncToken& ScopeLogger(); return [this, token, resource](const common::TizenResult& result, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, returned value"); auto value = IotconClientManager::GetInstance().RemoveRemoteResource(resource); auto& obj = value.get(); diff --git a/src/iotcon/iotcon_manager.cc b/src/iotcon/iotcon_manager.cc index 037b9b61..6db23ede 100644 --- a/src/iotcon/iotcon_manager.cc +++ b/src/iotcon/iotcon_manager.cc @@ -26,9 +26,11 @@ namespace extension { namespace iotcon { IotconManager::IotconManager() : nextWatchId(1) { + ScopeLogger(); } IotconManager& IotconManager::GetInstance() { + ScopeLogger(); static IotconManager instance; return instance; } diff --git a/src/iotcon/iotcon_server_manager.cc b/src/iotcon/iotcon_server_manager.cc index 84c78add..40883f4a 100644 --- a/src/iotcon/iotcon_server_manager.cc +++ b/src/iotcon/iotcon_server_manager.cc @@ -225,10 +225,12 @@ common::TizenResult IotconServerManager::GetResourceByHandle(iotcon_resource_h r ResourceInfoPtr* res_pointer) const { ScopeLogger(); - auto it = std::find_if(resource_map_.begin(), resource_map_.end(), - [resource](const ResourceInfoMap::value_type& p) -> bool { - return p.second->handle == resource; - }); + auto it = + std::find_if(resource_map_.begin(), resource_map_.end(), + [resource](const ResourceInfoMap::value_type& p) -> bool { + ScopeLogger("Entered into asynchronous function, std::find_if's argument"); + return p.second->handle == resource; + }); if (it == resource_map_.end()) { return LogAndCreateTizenError(NotFoundError, "Resource with specified handle does not exist"); diff --git a/src/iotcon/iotcon_utils.cc b/src/iotcon/iotcon_utils.cc index c616f3df..70546a4e 100644 --- a/src/iotcon/iotcon_utils.cc +++ b/src/iotcon/iotcon_utils.cc @@ -244,20 +244,20 @@ TizenResult IotconUtils::InterfacesToArray(iotcon_resource_interfaces_h interfac ScopeLogger(); if (interfaces) { - auto result = ConvertIotconError( - iotcon_resource_interfaces_foreach(interfaces, - [](const char* iface, void* user_data) -> bool { - ScopeLogger("iotcon_resource_interfaces_foreach"); - - if (iface) { - auto arr = static_cast(user_data); - arr->push_back(picojson::value(iface)); - } - - // always continue with iteration - return true; - }, - arr)); + auto result = ConvertIotconError(iotcon_resource_interfaces_foreach( + interfaces, + [](const char* iface, void* user_data) -> bool { + ScopeLogger("Entered into asynchronous function, iotcon_resource_interfaces_foreach"); + + if (iface) { + auto arr = static_cast(user_data); + arr->push_back(picojson::value(iface)); + } + + // always continue with iteration + return true; + }, + arr)); if (!result) { LogAndReturnTizenError(result, ("iotcon_resource_interfaces_foreach() failed")); } @@ -734,6 +734,9 @@ common::TizenResult IotconUtils::RepresentationToJson(iotcon_representation_h re auto result = ConvertIotconError(iotcon_representation_foreach_children( representation, [](iotcon_representation_h child, void* user_data) -> bool { + ScopeLogger( + "Entered into asynchronous function, iotcon_representation_foreach_children's " + "argument"); auto arr = static_cast(user_data); arr->push_back(picojson::value{picojson::object{}}); auto result = RepresentationToJson(child, &arr->back().get()); @@ -764,6 +767,7 @@ common::TizenResult IotconUtils::AttributesToJson(iotcon_attributes_h attributes auto result = ConvertIotconError(iotcon_attributes_foreach( attributes, [](iotcon_attributes_h attributes, const char* key, void* user_data) -> bool { + ScopeLogger("Entered into asynchronous function, iotcon_attributes_foreach's argument"); iotcon_type_e type = IOTCON_TYPE_NONE; auto result = ConvertIotconError(iotcon_attributes_get_type(attributes, key, &type)); @@ -905,62 +909,69 @@ common::TizenResult IotconUtils::StateListToJson(iotcon_list_h list, picojson::a break; case IOTCON_TYPE_INT: - result = ConvertIotconError( - iotcon_list_foreach_int(list, - [](int, int value, void* user_data) -> bool { - auto out = static_cast(user_data); - out->push_back(picojson::value{static_cast(value)}); - // always continue with iteration - return true; - }, - out)); + result = ConvertIotconError(iotcon_list_foreach_int( + list, + [](int, int value, void* user_data) -> bool { + ScopeLogger("Entered into asynchronous function, iotcon_list_foreach_int's argument"); + auto out = static_cast(user_data); + out->push_back(picojson::value{static_cast(value)}); + // always continue with iteration + return true; + }, + out)); if (!result) { LogAndReturnTizenError(result, ("iotcon_list_foreach_int() failed")); } break; case IOTCON_TYPE_BOOL: - result = ConvertIotconError( - iotcon_list_foreach_bool(list, - [](int, bool value, void* user_data) -> bool { - auto out = static_cast(user_data); - out->push_back(picojson::value{value}); - // always continue with iteration - return true; - }, - out)); + result = ConvertIotconError(iotcon_list_foreach_bool( + list, + [](int, bool value, void* user_data) -> bool { + ScopeLogger( + "Entered into asynchronous function, iotcon_list_foreach_bool's argument"); + auto out = static_cast(user_data); + out->push_back(picojson::value{value}); + // always continue with iteration + return true; + }, + out)); if (!result) { LogAndReturnTizenError(result, ("iotcon_list_foreach_bool() failed")); } break; case IOTCON_TYPE_DOUBLE: - result = ConvertIotconError( - iotcon_list_foreach_double(list, - [](int, double value, void* user_data) -> bool { - auto out = static_cast(user_data); - out->push_back(picojson::value{value}); - // always continue with iteration - return true; - }, - out)); + result = ConvertIotconError(iotcon_list_foreach_double( + list, + [](int, double value, void* user_data) -> bool { + ScopeLogger( + "Entered into asynchronous function, iotcon_list_foreach_double's argument"); + auto out = static_cast(user_data); + out->push_back(picojson::value{value}); + // always continue with iteration + return true; + }, + out)); if (!result) { LogAndReturnTizenError(result, ("iotcon_list_foreach_double() failed")); } break; case IOTCON_TYPE_STR: - result = ConvertIotconError( - iotcon_list_foreach_str(list, - [](int, const char* value, void* user_data) -> bool { - if (value) { - auto out = static_cast(user_data); - out->push_back(picojson::value{value}); - } - // always continue with iteration - return true; - }, - out)); + result = ConvertIotconError(iotcon_list_foreach_str( + list, + [](int, const char* value, void* user_data) -> bool { + if (value) { + ScopeLogger( + "Entered into asynchronous function, iotcon_list_foreach_str's argument"); + auto out = static_cast(user_data); + out->push_back(picojson::value{value}); + } + // always continue with iteration + return true; + }, + out)); if (!result) { LogAndReturnTizenError(result, ("iotcon_list_foreach_str() failed")); } @@ -970,6 +981,8 @@ common::TizenResult IotconUtils::StateListToJson(iotcon_list_h list, picojson::a result = ConvertIotconError(iotcon_list_foreach_byte_str( list, [](int, const unsigned char* value, int length, void* user_data) -> bool { + ScopeLogger( + "Entered into asynchronous function, iotcon_list_foreach_byte_str's argument"); if (length) { std::unique_ptr data{new char[2 * length]}; common::tools::BinToHex(value, length, data.get(), 2 * length); @@ -994,6 +1007,8 @@ common::TizenResult IotconUtils::StateListToJson(iotcon_list_h list, picojson::a result = ConvertIotconError(iotcon_list_foreach_list( list, [](int, iotcon_list_h list, void* user_data) -> bool { + ScopeLogger( + "Entered into asynchronous function, iotcon_list_foreach_list's argument"); picojson::value value{picojson::array{}}; auto result = StateListToJson(list, &value.get()); if (result) { @@ -1015,6 +1030,8 @@ common::TizenResult IotconUtils::StateListToJson(iotcon_list_h list, picojson::a result = ConvertIotconError(iotcon_list_foreach_attributes( list, [](int, iotcon_attributes_h attributes, void* user_data) -> bool { + ScopeLogger( + "Entered into asynchronous function, iotcon_list_foreach_attributes' argument"); picojson::value value{picojson::object{}}; auto result = AttributesToJson(attributes, &value.get()); if (result) { @@ -1046,6 +1063,7 @@ common::TizenResult IotconUtils::OptionsToJson(iotcon_options_h options, picojso auto result = ConvertIotconError(iotcon_options_foreach( options, [](unsigned short id, const char* data, void* user_data) -> bool { + ScopeLogger("Entered into asynchronous function, iotcon_options_foreach's argument"); if (data) { picojson::value v{picojson::object{}}; auto& obj = v.get(); @@ -1098,17 +1116,19 @@ common::TizenResult IotconUtils::QueryToJson(iotcon_query_h query, picojson::obj { // filter picojson::value v{picojson::object{}}; - auto result = ConvertIotconError( - iotcon_query_foreach(query, - [](const char* key, const char* value, void* user_data) -> bool { - if (key && value) { - auto obj = static_cast(user_data); - obj->insert(std::make_pair(key, picojson::value{value})); - } - // always continue with iteration - return true; - }, - &v.get())); + auto result = ConvertIotconError(iotcon_query_foreach( + query, + [](const char* key, const char* value, void* user_data) -> bool { + + ScopeLogger("Entered into asynchronous function, iotcon_query_foreach's argument"); + if (key && value) { + auto obj = static_cast(user_data); + obj->insert(std::make_pair(key, picojson::value{value})); + } + // always continue with iteration + return true; + }, + &v.get())); if (!result) { LogAndReturnTizenError(result, ("iotcon_query_foreach() failed")); } diff --git a/src/keymanager/keymanager_instance.cc b/src/keymanager/keymanager_instance.cc index 2f0def12..0e055122 100644 --- a/src/keymanager/keymanager_instance.cc +++ b/src/keymanager/keymanager_instance.cc @@ -45,7 +45,7 @@ typedef int (*AliasListFunction)(ckmc_alias_list_s**); const std::string kSpace = " "; void GetGenericAliasList(AliasListFunction func, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); ckmc_alias_list_s* alias_list = nullptr; int ret = func(&alias_list); @@ -84,7 +84,7 @@ void GetGenericAliasList(AliasListFunction func, picojson::object* out) { } // namespace KeyManagerInstance::KeyManagerInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -104,7 +104,7 @@ KeyManagerInstance::KeyManagerInstance() { } void KeyManagerInstance::GetDataAliasList(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); GetGenericAliasList(ckmc_get_data_alias_list, &out); } @@ -129,7 +129,7 @@ PlatformResult KeyManagerInstance::GetError(int ret) { } void KeyManagerInstance::SaveData(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); std::string data_raw = args.get("rawData").get(); std::string alias = args.get("aliasName").get(); @@ -145,6 +145,7 @@ void KeyManagerInstance::SaveData(const picojson::value& args, picojson::object& } auto save_data = [data_raw, password, alias](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, save_data"); unsigned char* data = new unsigned char[data_raw.size()]; std::copy(data_raw.begin(), data_raw.end(), data); @@ -166,6 +167,7 @@ void KeyManagerInstance::SaveData(const picojson::value& args, picojson::object& }; auto save_data_result = [this, callback_id](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, save_data_result"); result->get()["callbackId"] = picojson::value{callback_id}; Instance::PostMessage(this, result->serialize().c_str()); }; @@ -178,7 +180,7 @@ void KeyManagerInstance::SaveData(const picojson::value& args, picojson::object& } void KeyManagerInstance::GetData(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const auto& data_alias = args.get("name").get(); const auto& password_value = args.get("password"); @@ -211,11 +213,11 @@ void KeyManagerInstance::GetData(const picojson::value& args, picojson::object& } KeyManagerInstance::~KeyManagerInstance() { - LoggerD("Enter"); + ScopeLogger(); } void KeyManagerInstance::RemoveAlias(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const std::string& alias = args.get("aliasName").get(); int ret = ckmc_remove_alias(alias.c_str()); @@ -230,7 +232,7 @@ void KeyManagerInstance::RemoveAlias(const picojson::value& args, picojson::obje } void KeyManagerInstance::SetPermission(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const std::string& data_name = args.get("aliasName").get(); const std::string& id = args.get("packageId").get(); @@ -250,6 +252,8 @@ void KeyManagerInstance::SetPermission(const picojson::value& args, picojson::ob auto set_permissions = [data_name, id, permissions](const std::shared_ptr& response) -> void { + + ScopeLogger("Entered into asynchronous function, set_permissions"); int ret = ckmc_set_permission(data_name.c_str(), id.c_str(), permissions); if (CKMC_ERROR_NONE != ret) { @@ -262,6 +266,7 @@ void KeyManagerInstance::SetPermission(const picojson::value& args, picojson::ob auto set_permissions_response = [this, callback_id](const std::shared_ptr& response) -> void { + ScopeLogger("Entered into asynchronous function, set_permissions_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(this, response->serialize().c_str()); diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc index 59df5aa7..55dccb2b 100644 --- a/src/mediacontroller/mediacontroller_client.cc +++ b/src/mediacontroller/mediacontroller_client.cc @@ -32,11 +32,11 @@ using common::PlatformResult; using common::ErrorCode; MediaControllerClient::MediaControllerClient() : handle_(nullptr) { - LoggerD("Enter"); + ScopeLogger(); } MediaControllerClient::~MediaControllerClient() { - LoggerD("Enter"); + ScopeLogger(); if (handle_) { int ret = mc_client_destroy(handle_); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { @@ -46,7 +46,7 @@ MediaControllerClient::~MediaControllerClient() { } PlatformResult MediaControllerClient::Init() { - LoggerD("Enter"); + ScopeLogger(); int ret = mc_client_create(&handle_); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { return LogAndCreateResult( @@ -58,7 +58,7 @@ PlatformResult MediaControllerClient::Init() { } PlatformResult MediaControllerClient::FindServers(picojson::array* servers) { - LoggerD("Enter"); + ScopeLogger(); int ret; ret = mc_client_foreach_server(handle_, FindServersCallback, servers); @@ -96,7 +96,7 @@ PlatformResult MediaControllerClient::FindServers(picojson::array* servers) { } bool MediaControllerClient::FindServersCallback(const char* server_name, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array* servers = static_cast(user_data); picojson::value server = picojson::value(picojson::object()); @@ -111,7 +111,7 @@ bool MediaControllerClient::FindServersCallback(const char* server_name, void* u } PlatformResult MediaControllerClient::GetLatestServerInfo(picojson::value* server_info) { - LoggerD("Enter"); + ScopeLogger(); int ret; char* name = nullptr; @@ -149,7 +149,7 @@ PlatformResult MediaControllerClient::GetLatestServerInfo(picojson::value* serve PlatformResult MediaControllerClient::GetPlaybackInfo(const std::string& server_name, picojson::object* playback_info) { - LoggerD("Enter"); + ScopeLogger(); int ret; mc_playback_h playback_h; @@ -217,7 +217,7 @@ PlatformResult MediaControllerClient::GetPlaybackInfo(const std::string& server_ PlatformResult MediaControllerClient::GetMetadata(const std::string& server_name, picojson::object* metadata) { - LoggerD("Enter"); + ScopeLogger(); int ret; mc_metadata_h metadata_h; @@ -241,7 +241,7 @@ PlatformResult MediaControllerClient::GetMetadata(const std::string& server_name } PlatformResult MediaControllerClient::SetServerStatusChangeListener(JsonCallback callback) { - LoggerD("Enter"); + ScopeLogger(); if (callback && server_status_listener_) { return LogAndCreateResult(ErrorCode::INVALID_STATE_ERR, "Listener already registered"); } @@ -271,7 +271,7 @@ PlatformResult MediaControllerClient::SetServerStatusChangeListener(JsonCallback void MediaControllerClient::OnServerStatusUpdate(const char* server_name, mc_server_state_e state, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerClient* client = static_cast(user_data); if (!client->server_status_listener_) { @@ -298,7 +298,7 @@ void MediaControllerClient::OnServerStatusUpdate(const char* server_name, mc_ser } PlatformResult MediaControllerClient::SetPlaybackInfoListener(JsonCallback callback) { - LoggerD("Enter"); + ScopeLogger(); if (callback && playback_info_listener_) { return LogAndCreateResult(ErrorCode::INVALID_STATE_ERR, "Listener already registered"); } @@ -372,7 +372,7 @@ PlatformResult MediaControllerClient::SetPlaybackInfoListener(JsonCallback callb void MediaControllerClient::OnPlaybackUpdate(const char* server_name, mc_playback_h playback, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerClient* client = static_cast(user_data); if (!client->playback_info_listener_) { @@ -409,7 +409,7 @@ void MediaControllerClient::OnPlaybackUpdate(const char* server_name, mc_playbac void MediaControllerClient::OnShuffleModeUpdate(const char* server_name, mc_shuffle_mode_e mode, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerClient* client = static_cast(user_data); if (!client->playback_info_listener_) { @@ -429,7 +429,7 @@ void MediaControllerClient::OnShuffleModeUpdate(const char* server_name, mc_shuf void MediaControllerClient::OnRepeatModeUpdate(const char* server_name, mc_repeat_mode_e mode, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerClient* client = static_cast(user_data); if (!client->playback_info_listener_) { @@ -449,7 +449,7 @@ void MediaControllerClient::OnRepeatModeUpdate(const char* server_name, mc_repea void MediaControllerClient::OnMetadataUpdate(const char* server_name, mc_metadata_h metadata_h, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerClient* client = static_cast(user_data); if (!client->playback_info_listener_) { @@ -479,7 +479,7 @@ PlatformResult MediaControllerClient::SendCommand(const std::string& server_name const picojson::value& data, const std::string& reply_id, const JsonCallback& reply_cb) { - LoggerD("Enter"); + ScopeLogger(); bundle* bundle = bundle_create(); SCOPE_EXIT { bundle_free(bundle); @@ -515,7 +515,7 @@ PlatformResult MediaControllerClient::SendCommand(const std::string& server_name void MediaControllerClient::OnCommandReply(const char* server_name, int result_code, bundle* bundle, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerClient* client = static_cast(user_data); picojson::value reply = picojson::value(picojson::object()); @@ -558,7 +558,7 @@ void MediaControllerClient::OnCommandReply(const char* server_name, int result_c PlatformResult MediaControllerClient::SendPlaybackState(const std::string& server_name, const std::string& state) { - LoggerD("Enter"); + ScopeLogger(); int state_e; PlatformResult result = Types::StringToPlatformEnum(Types::kMediaControllerPlaybackState, state, &state_e); diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc index a714734a..6f2a9613 100644 --- a/src/mediacontroller/mediacontroller_instance.cc +++ b/src/mediacontroller/mediacontroller_instance.cc @@ -41,7 +41,7 @@ using common::PlatformResult; using common::TaskQueue; MediaControllerInstance::MediaControllerInstance() { - LoggerD("Enter"); + ScopeLogger(); using namespace std::placeholders; #define REGISTER_SYNC(c, x) \ @@ -97,7 +97,7 @@ MediaControllerInstance::MediaControllerInstance() { } MediaControllerInstance::~MediaControllerInstance() { - LoggerD("Enter"); + ScopeLogger(); } #define CHECK_EXIST(args, name, out) \ @@ -109,7 +109,7 @@ MediaControllerInstance::~MediaControllerInstance() { void MediaControllerInstance::MediaControllerManagerCreateServer(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMediaControllerServer, &out); @@ -130,7 +130,7 @@ void MediaControllerInstance::MediaControllerManagerCreateServer(const picojson: void MediaControllerInstance::MediaControllerServerUpdatePlaybackState(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "state", out) if (!server_) { @@ -151,7 +151,7 @@ void MediaControllerInstance::MediaControllerServerUpdatePlaybackState(const pic void MediaControllerInstance::MediaControllerServerUpdatePlaybackPosition( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, ("Failed: server_")); @@ -172,7 +172,7 @@ void MediaControllerInstance::MediaControllerServerUpdatePlaybackPosition( void MediaControllerInstance::MediaControllerServerUpdateShuffleMode(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, ("Failed: server_")); @@ -194,7 +194,7 @@ void MediaControllerInstance::MediaControllerServerUpdateShuffleMode(const picoj void MediaControllerInstance::MediaControllerServerUpdateRepeatMode(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, @@ -217,7 +217,7 @@ void MediaControllerInstance::MediaControllerServerUpdateRepeatMode(const picojs void MediaControllerInstance::MediaControllerServerUpdateMetadata(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, ("Failed: server_")); @@ -239,7 +239,7 @@ void MediaControllerInstance::MediaControllerServerUpdateMetadata(const picojson void MediaControllerInstance::MediaControllerServerAddChangeRequestPlaybackInfoListener( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, ("Failed: server_")); @@ -267,7 +267,7 @@ void MediaControllerInstance::MediaControllerServerAddChangeRequestPlaybackInfoL void MediaControllerInstance::MediaControllerServerRemoveChangeRequestPlaybackInfoListener( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, ("Failed: server_")); @@ -279,7 +279,7 @@ void MediaControllerInstance::MediaControllerServerRemoveChangeRequestPlaybackIn void MediaControllerInstance::MediaControllerServerAddCommandListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, ("Failed: server_")); @@ -300,7 +300,7 @@ void MediaControllerInstance::MediaControllerServerAddCommandListener(const pico void MediaControllerInstance::MediaControllerServerReplyCommand(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, ("Failed: server_")); @@ -319,7 +319,7 @@ void MediaControllerInstance::MediaControllerServerReplyCommand(const picojson:: void MediaControllerInstance::MediaControllerServerRemoveCommandListener( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!server_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Server not initialized."), &out, ("Failed: server_")); @@ -333,7 +333,7 @@ void MediaControllerInstance::MediaControllerServerRemoveCommandListener( void MediaControllerInstance::MediaControllerManagerGetClient(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMediaControllerClient, &out); @@ -354,7 +354,7 @@ void MediaControllerInstance::MediaControllerManagerGetClient(const picojson::va void MediaControllerInstance::MediaControllerClientFindServers(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -387,7 +387,7 @@ void MediaControllerInstance::MediaControllerClientFindServers(const picojson::v void MediaControllerInstance::MediaControllerClientGetLatestServerInfo(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -406,7 +406,7 @@ void MediaControllerInstance::MediaControllerClientGetLatestServerInfo(const pic void MediaControllerInstance::MediaControllerClientGetPlaybackInfo(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -429,7 +429,7 @@ void MediaControllerInstance::MediaControllerClientGetPlaybackInfo(const picojso void MediaControllerInstance::MediaControllerServerInfoSendPlaybackState( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -464,7 +464,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendPlaybackState( void MediaControllerInstance::MediaControllerServerInfoSendPlaybackPosition( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -499,7 +499,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendPlaybackPosition( void MediaControllerInstance::MediaControllerServerInfoSendShuffleMode(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, @@ -535,7 +535,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendShuffleMode(const pic void MediaControllerInstance::MediaControllerServerInfoSendRepeatMode(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -570,7 +570,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendRepeatMode(const pico void MediaControllerInstance::MediaControllerServerInfoSendCommand(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -604,7 +604,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendCommand(const picojso void MediaControllerInstance::MediaControllerServerInfoAddServerStatusChangeListener( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -632,7 +632,7 @@ void MediaControllerInstance::MediaControllerServerInfoAddServerStatusChangeList void MediaControllerInstance::MediaControllerServerInfoRemoveServerStatusChangeListener( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); @@ -644,7 +644,7 @@ void MediaControllerInstance::MediaControllerServerInfoRemoveServerStatusChangeL void MediaControllerInstance::MediaControllerServerInfoAddPlaybackInfoChangeListener( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (!client_) { LogAndReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR, "Client not initialized."), &out, ("Failed: client_")); diff --git a/src/mediacontroller/mediacontroller_server.cc b/src/mediacontroller/mediacontroller_server.cc index 62416ea4..bd88e3f5 100644 --- a/src/mediacontroller/mediacontroller_server.cc +++ b/src/mediacontroller/mediacontroller_server.cc @@ -38,11 +38,11 @@ using common::PlatformResult; using common::ErrorCode; MediaControllerServer::MediaControllerServer() : handle_(nullptr) { - LoggerD("Enter"); + ScopeLogger(); } MediaControllerServer::~MediaControllerServer() { - LoggerD("Enter"); + ScopeLogger(); if (handle_) { int ret; @@ -59,7 +59,7 @@ MediaControllerServer::~MediaControllerServer() { } PlatformResult MediaControllerServer::Init() { - LoggerD("Enter"); + ScopeLogger(); int ret = mc_server_create(&handle_); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { @@ -79,7 +79,7 @@ PlatformResult MediaControllerServer::Init() { } PlatformResult MediaControllerServer::SetPlaybackState(const std::string& state) { - LoggerD("Enter"); + ScopeLogger(); int state_int; PlatformResult result = @@ -107,7 +107,7 @@ PlatformResult MediaControllerServer::SetPlaybackState(const std::string& state) } PlatformResult MediaControllerServer::SetPlaybackPosition(double position) { - LoggerD("Enter"); + ScopeLogger(); int ret = mc_server_set_playback_position(handle_, static_cast(position)); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { @@ -127,7 +127,7 @@ PlatformResult MediaControllerServer::SetPlaybackPosition(double position) { } PlatformResult MediaControllerServer::SetShuffleMode(bool mode) { - LoggerD("Enter"); + ScopeLogger(); int ret = mc_server_update_shuffle_mode(handle_, mode ? MC_SHUFFLE_MODE_ON : MC_SHUFFLE_MODE_OFF); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { @@ -140,7 +140,7 @@ PlatformResult MediaControllerServer::SetShuffleMode(bool mode) { } PlatformResult MediaControllerServer::SetRepeatMode(bool mode) { - LoggerD("Enter"); + ScopeLogger(); int ret = mc_server_update_repeat_mode(handle_, mode ? MC_REPEAT_MODE_ON : MC_REPEAT_MODE_OFF); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { @@ -153,7 +153,7 @@ PlatformResult MediaControllerServer::SetRepeatMode(bool mode) { } PlatformResult MediaControllerServer::SetMetadata(const picojson::object& metadata) { - LoggerD("Enter"); + ScopeLogger(); int attribute_int, ret; for (picojson::object::const_iterator i = metadata.begin(); i != metadata.end(); ++i) { @@ -184,7 +184,7 @@ PlatformResult MediaControllerServer::SetMetadata(const picojson::object& metada void MediaControllerServer::OnCommandReceived(const char* client_name, const char* command, bundle* bundle, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerServer* server = static_cast(user_data); @@ -259,7 +259,7 @@ void MediaControllerServer::OnCommandReceived(const char* client_name, const cha PlatformResult MediaControllerServer::CommandReply(const std::string& client_name, const std::string& reply_id, const picojson::value& data) { - LoggerD("Enter"); + ScopeLogger(); int ret; @@ -293,7 +293,7 @@ PlatformResult MediaControllerServer::CommandReply(const std::string& client_nam } PlatformResult MediaControllerServer::SetChangeRequestPlaybackInfoListener(JsonCallback callback) { - LoggerD("Enter"); + ScopeLogger(); if (callback && change_request_playback_info_listener_) { return LogAndCreateResult(ErrorCode::INVALID_STATE_ERR, "Listener already registered"); @@ -325,7 +325,7 @@ PlatformResult MediaControllerServer::SetChangeRequestPlaybackInfoListener(JsonC void MediaControllerServer::OnPlaybackStateCommand(const char* client_name, mc_playback_states_e state_e, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerServer* server = static_cast(user_data); @@ -354,7 +354,7 @@ void MediaControllerServer::OnPlaybackStateCommand(const char* client_name, void MediaControllerServer::OnPlaybackPositionCommand(const char* client_name, unsigned long long position, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerServer* server = static_cast(user_data); @@ -374,7 +374,7 @@ void MediaControllerServer::OnPlaybackPositionCommand(const char* client_name, void MediaControllerServer::OnShuffleModeCommand(const char* client_name, mc_shuffle_mode_e mode, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerServer* server = static_cast(user_data); @@ -394,7 +394,7 @@ void MediaControllerServer::OnShuffleModeCommand(const char* client_name, mc_shu void MediaControllerServer::OnRepeatModeCommand(const char* client_name, mc_repeat_mode_e mode, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MediaControllerServer* server = static_cast(user_data); diff --git a/src/mediacontroller/mediacontroller_types.cc b/src/mediacontroller/mediacontroller_types.cc index f54907cd..a08aeff5 100644 --- a/src/mediacontroller/mediacontroller_types.cc +++ b/src/mediacontroller/mediacontroller_types.cc @@ -61,7 +61,7 @@ PlatformEnumReverseMap Types::platform_enum_reverse_map_ = {}; PlatformResult Types::GetPlatformEnumMap(const std::string& type, std::map* enum_map) { - LoggerD("Enter"); + ScopeLogger(); auto iter = platform_enum_map_.find(type); if (iter == platform_enum_map_.end()) { @@ -76,7 +76,7 @@ PlatformResult Types::GetPlatformEnumMap(const std::string& type, PlatformResult Types::StringToPlatformEnum(const std::string& type, const std::string& value, int* platform_enum) { - LoggerD("Enter"); + ScopeLogger(); std::map def; PlatformResult result = GetPlatformEnumMap(type, &def); @@ -96,7 +96,7 @@ PlatformResult Types::StringToPlatformEnum(const std::string& type, const std::s PlatformResult Types::PlatformEnumToString(const std::string& type, int value, std::string* platform_str) { - LoggerD("Enter"); + ScopeLogger(); if (platform_enum_reverse_map_.empty()) { for (auto& def : platform_enum_map_) { @@ -126,7 +126,7 @@ PlatformResult Types::PlatformEnumToString(const std::string& type, int value, } PlatformResult Types::ConvertPlaybackState(mc_playback_h playback_h, std::string* state) { - LoggerD("Enter"); + ScopeLogger(); int ret; mc_playback_states_e state_e; @@ -151,7 +151,7 @@ PlatformResult Types::ConvertPlaybackState(mc_playback_h playback_h, std::string } PlatformResult Types::ConvertPlaybackPosition(mc_playback_h playback_h, double* position) { - LoggerD("Enter"); + ScopeLogger(); int ret; @@ -169,7 +169,7 @@ PlatformResult Types::ConvertPlaybackPosition(mc_playback_h playback_h, double* } PlatformResult Types::ConvertMetadata(mc_metadata_h metadata_h, picojson::object* metadata) { - LoggerD("Enter"); + ScopeLogger(); std::map metadata_fields; PlatformResult result = diff --git a/src/mediakey/mediakey_instance.cc b/src/mediakey/mediakey_instance.cc index 4a31a1e0..69d69150 100644 --- a/src/mediakey/mediakey_instance.cc +++ b/src/mediakey/mediakey_instance.cc @@ -30,7 +30,7 @@ const std::map kMediaKeyTypeMap = { {MEDIA_KEY_REWIND, "MEDIA_REWIND"}, {MEDIA_KEY_PLAYPAUSE, "MEDIA_PLAY_PAUSE"}}; MediaKeyInstance::MediaKeyInstance() { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&MediaKeyInstance::x, this, _1, _2)); @@ -40,13 +40,13 @@ MediaKeyInstance::MediaKeyInstance() { } MediaKeyInstance::~MediaKeyInstance() { - LoggerD("Entered"); + ScopeLogger(); MediaKeyManager::GetInstance().UnregisterMediaKeyEventListener(); } void MediaKeyInstance::SetMediaKeyEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); common::PlatformResult result = MediaKeyManager::GetInstance().RegisterMediaKeyEventListener(this); @@ -59,7 +59,7 @@ void MediaKeyInstance::SetMediaKeyEventListener(const picojson::value& args, void MediaKeyInstance::UnsetMediaKeyEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); common::PlatformResult result = MediaKeyManager::GetInstance().UnregisterMediaKeyEventListener(); if (result.IsError()) { LogAndReportError(result, &out, ("Failed to remove media key event listener")); @@ -69,17 +69,17 @@ void MediaKeyInstance::UnsetMediaKeyEventListener(const picojson::value& args, } void MediaKeyInstance::OnPressedMediaKeyEventCallback(media_key_e type) { - LoggerD("Enter"); + ScopeLogger(); PostEvent("onPressedMediaKeyEventCallback", type); } void MediaKeyInstance::OnReleasedMediaKeyEventCallback(media_key_e type) { - LoggerD("Enter"); + ScopeLogger(); PostEvent("onReleasedMediaKeyEventCallback", type); } void MediaKeyInstance::PostEvent(const std::string& eventCallback, media_key_e type) { - LoggerD("Enter"); + ScopeLogger(); auto k = kMediaKeyTypeMap.find(type); if (k != kMediaKeyTypeMap.end()) { picojson::value event = picojson::value(picojson::object()); diff --git a/src/mediakey/mediakey_manager.cc b/src/mediakey/mediakey_manager.cc index 05182146..8e8182d6 100644 --- a/src/mediakey/mediakey_manager.cc +++ b/src/mediakey/mediakey_manager.cc @@ -24,7 +24,7 @@ namespace mediakey { using common::UnknownException; using common::ErrorCode; MediaKeyListener::~MediaKeyListener() { - LoggerD("Enter"); + ScopeLogger(); } MediaKeyManager& MediaKeyManager::GetInstance() { @@ -34,11 +34,11 @@ MediaKeyManager& MediaKeyManager::GetInstance() { MediaKeyManager::MediaKeyManager() : m_media_key_listener(nullptr), m_media_key_listener_registered(false) { - LoggerD("Enter"); + ScopeLogger(); } common::PlatformResult MediaKeyManager::RegisterMediaKeyEventListener(MediaKeyListener* listener) { - LoggerD("Enter"); + ScopeLogger(); if (!m_media_key_listener_registered) { LoggerD("before calling media_key_reserve"); int ret = media_key_reserve(MediaKeyEventCallback, NULL); @@ -55,7 +55,7 @@ common::PlatformResult MediaKeyManager::RegisterMediaKeyEventListener(MediaKeyLi return common::PlatformResult(ErrorCode::NO_ERROR); } common::PlatformResult MediaKeyManager::UnregisterMediaKeyEventListener() { - LoggerD("Enter"); + ScopeLogger(); if (m_media_key_listener_registered) { int ret = media_key_release(); if (MEDIA_KEY_ERROR_NONE != ret) { @@ -71,7 +71,7 @@ common::PlatformResult MediaKeyManager::UnregisterMediaKeyEventListener() { void MediaKeyManager::MediaKeyEventCallback(media_key_e key, media_key_event_e status, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); if (!GetInstance().m_media_key_listener) { LoggerD("Listener is null. Ignoring"); return; diff --git a/src/messageport/messageport_instance.cc b/src/messageport/messageport_instance.cc index e6d63cda..2614fdaa 100644 --- a/src/messageport/messageport_instance.cc +++ b/src/messageport/messageport_instance.cc @@ -35,7 +35,7 @@ using common::NotFoundException; using common::QuotaExceededException; MessageportInstance::MessageportInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_SYNC(c, x) \ @@ -53,7 +53,7 @@ MessageportInstance::MessageportInstance() { } MessageportInstance::~MessageportInstance() { - LoggerD("Enter"); + ScopeLogger(); } enum MessageportCallbacks { @@ -68,7 +68,7 @@ enum MessageportCallbacks { static void BundleJsonIterator(const char* key, const int type, const bundle_keyval_t* kv, void* d) { - LoggerD("Enter"); + ScopeLogger(); void* basic_val = nullptr; size_t basic_size = 0; @@ -158,7 +158,7 @@ static void BundleJsonIterator(const char* key, const int type, const bundle_key static void OnReceiveLocalMessage(int local_port_id, const char* remote_app_id, const char* remote_port, bool trusted_remote_port, bundle* message, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); MessageportInstance* object = static_cast(user_data); picojson::value::object o; picojson::value::array data; @@ -183,7 +183,7 @@ static void OnReceiveLocalMessage(int local_port_id, const char* remote_app_id, void MessageportInstance::MessagePortManagerRequestlocalmessageport(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "localMessagePortName", out) int portId; @@ -225,7 +225,7 @@ void MessageportInstance::MessagePortManagerRequestlocalmessageport(const picojs void MessageportInstance::MessagePortManagerRequesttrustedlocalmessageport( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "localMessagePortName", out) int portId; @@ -267,7 +267,7 @@ void MessageportInstance::MessagePortManagerRequesttrustedlocalmessageport( void MessageportInstance::MessagePortManagerRequestremotemessageport(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "remoteMessagePortName", out) const std::string& remoteMessagePortName = args.get("remoteMessagePortName").get(); @@ -314,7 +314,7 @@ void MessageportInstance::MessagePortManagerRequestremotemessageport(const picoj void MessageportInstance::MessagePortManagerRequesttrustedremotemessageport( const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "remoteMessagePortName", out) const std::string& remoteMessagePortName = args.get("remoteMessagePortName").get(); @@ -366,7 +366,7 @@ void MessageportInstance::MessagePortManagerRequesttrustedremotemessageport( void MessageportInstance::RemoteMessagePortSendmessage(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const std::string& appId = args.get("appId").get(); const std::string& message_port_name = args.get("messagePortName").get(); std::vector data = args.get("data").get(); diff --git a/src/messaging/DBus/EmailSignalProxy.cpp b/src/messaging/DBus/EmailSignalProxy.cpp index 9c6b216d..65f4b63b 100644 --- a/src/messaging/DBus/EmailSignalProxy.cpp +++ b/src/messaging/DBus/EmailSignalProxy.cpp @@ -32,9 +32,11 @@ EmailSignalProxy::EmailSignalProxy(const std::string& proxy_path, const std::str : common::dbus::Proxy(proxy_path, proxy_iface, kDBusNameSignalEmail, // specify email signal details kDBusPathNetworkStatus, kDBusIfaceNetworkStatus) { + ScopeLogger(); } EmailSignalProxy::~EmailSignalProxy() { + ScopeLogger(); } void EmailSignalProxy::signalCallback(GDBusConnection* connection, const gchar* sender_name, diff --git a/src/messaging/DBus/LoadAttachmentProxy.cpp b/src/messaging/DBus/LoadAttachmentProxy.cpp index 97dea32b..95fdaf36 100644 --- a/src/messaging/DBus/LoadAttachmentProxy.cpp +++ b/src/messaging/DBus/LoadAttachmentProxy.cpp @@ -47,8 +47,10 @@ PlatformResult updateAttachmentDataWithEmailGetAttachmentData( std::shared_ptr attachment) { struct ScopedEmailAttachmentData { ScopedEmailAttachmentData() : data(NULL) { + ScopeLogger(); } ~ScopedEmailAttachmentData() { + ScopeLogger(); if (data) { email_free_attachment_data(&data, 1); } @@ -100,13 +102,16 @@ PlatformResult updateAttachmentDataWithEmailGetAttachmentData( LoadAttachmentProxy::LoadAttachmentProxy(const std::string& path, const std::string& iface) : EmailSignalProxy(path, iface) { + ScopeLogger(); } LoadAttachmentProxy::~LoadAttachmentProxy() { + ScopeLogger(); } PlatformResult LoadAttachmentProxy::create(const std::string& path, const std::string& iface, LoadAttachmentProxyPtr* load_attachment_proxy) { + ScopeLogger(); load_attachment_proxy->reset(new LoadAttachmentProxy(path, iface)); if ((*load_attachment_proxy)->isNotProxyGot()) { load_attachment_proxy->reset(); @@ -117,6 +122,7 @@ PlatformResult LoadAttachmentProxy::create(const std::string& path, const std::s } void LoadAttachmentProxy::addCallback(MessageAttachmentCallbackData* callbackOwned) { + ScopeLogger(); if (callbackOwned->getMessageAttachment()) { LoggerD("Registered callback for attachment_id: %d mail_id:%d op_handle:%d nth:%d", callbackOwned->getMessageAttachment()->getId(), @@ -128,6 +134,7 @@ void LoadAttachmentProxy::addCallback(MessageAttachmentCallbackData* callbackOwn } void LoadAttachmentProxy::removeCallback(MessageAttachmentCallbackData* callback) { + ScopeLogger(); if (callback->getMessageAttachment()) { LoggerD("Removed callback for attachment_id: %d mail_id:%d op_handle:%d nth:%d", callback->getMessageAttachment()->getId(), @@ -139,6 +146,7 @@ void LoadAttachmentProxy::removeCallback(MessageAttachmentCallbackData* callback } MessageAttachmentCallbackData* LoadAttachmentProxy::findCallback(const int nth, const int mail_id) { + ScopeLogger(); CallbackSet::iterator it = m_callback_set.begin(); for (; it != m_callback_set.end(); ++it) { MessageAttachmentCallbackData* callback = *it; @@ -154,6 +162,7 @@ MessageAttachmentCallbackData* LoadAttachmentProxy::findCallback(const int nth, void LoadAttachmentProxy::handleEmailSignal(const int status, const int mail_id, const std::string& source, const int op_handle, const int error_code) { + ScopeLogger(); if (NOTI_DOWNLOAD_ATTACH_FINISH != status && NOTI_DOWNLOAD_ATTACH_FAIL != status) { return; } diff --git a/src/messaging/DBus/LoadBodyProxy.cpp b/src/messaging/DBus/LoadBodyProxy.cpp index 944614aa..63f77b6b 100644 --- a/src/messaging/DBus/LoadBodyProxy.cpp +++ b/src/messaging/DBus/LoadBodyProxy.cpp @@ -49,13 +49,16 @@ using namespace common; LoadBodyProxy::LoadBodyProxy(const std::string& path, const std::string& iface) : EmailSignalProxy(path, iface) { + ScopeLogger(); } LoadBodyProxy::~LoadBodyProxy() { + ScopeLogger(); } PlatformResult LoadBodyProxy::create(const std::string& path, const std::string& iface, LoadBodyProxyPtr* load_body_proxy) { + ScopeLogger(); load_body_proxy->reset(new LoadBodyProxy(path, iface)); if ((*load_body_proxy)->isNotProxyGot()) { load_body_proxy->reset(); @@ -74,6 +77,7 @@ void LoadBodyProxy::removeCallback(MessageBodyCallbackData* callback) { } MessageBodyCallbackData* LoadBodyProxy::findCallbackByOpHandle(const int op_handle) { + ScopeLogger(); CallbackSet::iterator it = m_callback_set.begin(); for (; it != m_callback_set.end(); ++it) { MessageBodyCallbackData* callback = *it; @@ -89,6 +93,7 @@ MessageBodyCallbackData* LoadBodyProxy::findCallbackByOpHandle(const int op_hand void LoadBodyProxy::handleEmailSignal(const int status, const int mail_id, const std::string& source, const int op_handle, const int error_code) { + ScopeLogger(); switch (status) { // We should handle this signal since it is DOWNLOAD_BODY_* case NOTI_DOWNLOAD_BODY_START: diff --git a/src/messaging/DBus/MessageProxy.cpp b/src/messaging/DBus/MessageProxy.cpp index cd3a7d1b..7cc1653d 100644 --- a/src/messaging/DBus/MessageProxy.cpp +++ b/src/messaging/DBus/MessageProxy.cpp @@ -35,12 +35,15 @@ MessageProxy::MessageProxy() : common::dbus::Proxy(kDBusPathEmailStorageChange, kDBusIfaceEmailStorageChange, kDBusNameSignalEmail, kDBusPathEmailStorageChange, kDBusIfaceEmailStorageChange) { + ScopeLogger(); } MessageProxy::~MessageProxy() { + ScopeLogger(); } PlatformResult MessageProxy::create(MessageProxyPtr* message_proxy) { + ScopeLogger(); message_proxy->reset(new MessageProxy()); if ((*message_proxy)->isNotProxyGot()) { message_proxy->reset(); @@ -53,7 +56,7 @@ PlatformResult MessageProxy::create(MessageProxyPtr* message_proxy) { void MessageProxy::signalCallback(GDBusConnection* connection, const gchar* sender_name, const gchar* object_path, const gchar* interface_name, const gchar* signal_name, GVariant* parameters) { - LoggerD("Enter"); + ScopeLogger(); int status, account_id, object_id, thread_id; char* name; g_variant_get(parameters, "(iiisi)", &status, &account_id, &object_id, &name, &thread_id); @@ -100,7 +103,7 @@ void MessageProxy::signalCallback(GDBusConnection* connection, const gchar* send PlatformResult MessageProxy::handleEmailEvent(int account_id, int mail_id, int thread_id, int event) { - LoggerD("Enter"); + ScopeLogger(); if (ChangeListenerContainer::getInstance().isEmailListenerRegistered()) { LoggerD("Listener registered - perform action"); @@ -175,6 +178,7 @@ PlatformResult MessageProxy::handleEmailEvent(int account_id, int mail_id, int t } std::vector getMailIds(const std::string& idsString) { + ScopeLogger(); std::stringstream idsStream(idsString); std::string item; std::vector ids; @@ -193,7 +197,7 @@ std::vector getMailIds(const std::string& idsString) { } void MessageProxy::handleEmailRemoveEvent(int account_id, const std::string& idsString) { - LoggerD("Enter"); + ScopeLogger(); std::vector ids = getMailIds(idsString); if (ids.empty()) { LoggerD("Mail id list is empty."); @@ -216,7 +220,7 @@ void MessageProxy::handleEmailRemoveEvent(int account_id, const std::string& ids void MessageProxy::notifyEmailManager(const std::string& idsString, email_noti_on_storage_event status) { - LoggerD("Enter"); + ScopeLogger(); std::vector ids = getMailIds(idsString); if (ids.empty()) { LoggerD("Mail id list is empty."); @@ -226,7 +230,7 @@ void MessageProxy::notifyEmailManager(const std::string& idsString, } void MessageProxy::handleThreadRemoveEvent(int account_id, int thread_id) { - LoggerD("Enter"); + ScopeLogger(); // event is called after thread is removed, so we just set thread id and type ConversationPtr conv = std::make_shared(); conv->setConversationId(thread_id); @@ -242,7 +246,7 @@ void MessageProxy::handleThreadRemoveEvent(int account_id, int thread_id) { } PlatformResult MessageProxy::handleMailboxEvent(int account_id, int mailbox_id, int event) { - LoggerD("Enter"); + ScopeLogger(); EventFolders* eventFolder = new EventFolders(); eventFolder->service_type = MessageType::EMAIL; eventFolder->service_id = account_id; diff --git a/src/messaging/DBus/SendProxy.cpp b/src/messaging/DBus/SendProxy.cpp index f7471130..0e8dc8e7 100644 --- a/src/messaging/DBus/SendProxy.cpp +++ b/src/messaging/DBus/SendProxy.cpp @@ -30,12 +30,15 @@ namespace DBus { using namespace common; SendProxy::SendProxy() : EmailSignalProxy(kDBusPathNetworkStatus, kDBusIfaceNetworkStatus) { + ScopeLogger(); } SendProxy::~SendProxy() { + ScopeLogger(); } PlatformResult SendProxy::create(SendProxyPtr* send_proxy) { + ScopeLogger(); send_proxy->reset(new SendProxy()); if ((*send_proxy)->isNotProxyGot()) { send_proxy->reset(); @@ -47,7 +50,7 @@ PlatformResult SendProxy::create(SendProxyPtr* send_proxy) { void SendProxy::handleEmailSignal(const int status, const int account_id, const std::string& source, const int mail_id, const int error_code) { - LoggerD("Enter"); + ScopeLogger(); switch (status) { case NOTI_SEND_FINISH: case NOTI_SEND_FAIL: diff --git a/src/messaging/DBus/SyncProxy.cpp b/src/messaging/DBus/SyncProxy.cpp index c47b6b2a..5ca89fc3 100644 --- a/src/messaging/DBus/SyncProxy.cpp +++ b/src/messaging/DBus/SyncProxy.cpp @@ -34,13 +34,16 @@ using namespace common; SyncProxy::SyncProxy(const std::string& path, const std::string& iface) : EmailSignalProxy(path, iface) { + ScopeLogger(); } SyncProxy::~SyncProxy() { + ScopeLogger(); } PlatformResult SyncProxy::create(const std::string& path, const std::string& iface, SyncProxyPtr* sync_proxy) { + ScopeLogger(); sync_proxy->reset(new SyncProxy(path, iface)); if ((*sync_proxy)->isNotProxyGot()) { sync_proxy->reset(); @@ -51,10 +54,12 @@ PlatformResult SyncProxy::create(const std::string& path, const std::string& ifa } void SyncProxy::addCallback(long op_id, CallbackUserData* callbackOwned) { + ScopeLogger(); m_callback_map.insert(std::make_pair(op_id, callbackOwned)); } CallbackUserData* SyncProxy::getCallback(long op_id) { + ScopeLogger(); CallbackUserData* cb = nullptr; const auto it = m_callback_map.find(op_id); @@ -68,6 +73,7 @@ CallbackUserData* SyncProxy::getCallback(long op_id) { } void SyncProxy::removeCallback(long op_id) { + ScopeLogger(); auto it = m_callback_map.find(op_id); if (it != m_callback_map.end()) { delete it->second; @@ -79,6 +85,7 @@ void SyncProxy::removeCallback(long op_id) { void SyncProxy::handleEmailSignal(const int status, const int mail_id, const std::string& source, const int op_handle, const int error_code) { + ScopeLogger(); if (NOTI_DOWNLOAD_START != status && NOTI_DOWNLOAD_FINISH != status && NOTI_DOWNLOAD_FAIL != status) { // Nothing to do: this status is not related to sync nor syncFolder request @@ -132,6 +139,7 @@ void SyncProxy::handleEmailSignal(const int status, const int mail_id, const std PlatformResult SyncProxy::findSyncCallbackByOpHandle(const int op_handle, SyncProxy::CallbackMap::iterator* it) { + ScopeLogger(); *it = m_callback_map.begin(); for (; *it != m_callback_map.end(); ++(*it)) { SyncCallbackData* cb = dynamic_cast((*it)->second); diff --git a/src/messaging/MsgCommon/AbstractFilter.cpp b/src/messaging/MsgCommon/AbstractFilter.cpp index 9cbddb90..3f30d4d1 100644 --- a/src/messaging/MsgCommon/AbstractFilter.cpp +++ b/src/messaging/MsgCommon/AbstractFilter.cpp @@ -29,9 +29,11 @@ namespace tizen { using namespace common; AbstractFilter::AbstractFilter(FilterType filter_type) : m_filter_type(filter_type) { + ScopeLogger(); } AbstractFilter::~AbstractFilter() { + ScopeLogger(); } FilterType AbstractFilter::getFilterType() const { @@ -83,6 +85,7 @@ inline std::string convertToLowerCase(const std::string& input_string) { bool FilterUtils::isStringMatching(const std::string& key, const std::string& value, tizen::FilterMatchFlag flag) { + ScopeLogger(); switch (flag) { case tizen::ENDSWITH: { if (key.empty()) { @@ -134,6 +137,7 @@ bool FilterUtils::isStringMatching(const std::string& key, const std::string& va bool FilterUtils::isAnyStringMatching(const std::string& key, const std::vector& values, tizen::FilterMatchFlag flag) { + ScopeLogger(); for (auto it = values.begin(); it != values.end(); ++it) { if (isStringMatching(key, *it, flag)) { return true; @@ -144,6 +148,7 @@ bool FilterUtils::isAnyStringMatching(const std::string& key, bool FilterUtils::isTimeStampInRange(const time_t& time_stamp, tizen::AnyPtr& initial_value, tizen::AnyPtr& end_value) { + ScopeLogger(); time_t from_time = 0; time_t to_time = 0; diff --git a/src/messaging/MsgCommon/Any.cpp b/src/messaging/MsgCommon/Any.cpp index e61087b2..23434a04 100644 --- a/src/messaging/MsgCommon/Any.cpp +++ b/src/messaging/MsgCommon/Any.cpp @@ -24,10 +24,12 @@ namespace tizen { Any::Any(picojson::value value) : // m_context(context), m_value(value) { + ScopeLogger(); // JSValueProtect(m_context, m_value); } Any::~Any() { + ScopeLogger(); // JSValueUnprotect(m_context, m_value); } diff --git a/src/messaging/MsgCommon/AttributeFilter.cpp b/src/messaging/MsgCommon/AttributeFilter.cpp index 2342f5ca..352c0a84 100644 --- a/src/messaging/MsgCommon/AttributeFilter.cpp +++ b/src/messaging/MsgCommon/AttributeFilter.cpp @@ -23,9 +23,11 @@ namespace tizen { AttributeFilter::AttributeFilter(const std::string &attribute_name) : AbstractFilter(ATTRIBUTE_FILTER), m_attribute_name(attribute_name), m_match_flag(EXACTLY) { + ScopeLogger(); } AttributeFilter::~AttributeFilter() { + ScopeLogger(); } std::string AttributeFilter::getAttributeName() const { @@ -53,6 +55,7 @@ void AttributeFilter::setMatchValue(AnyPtr match_value) { } bool AttributeFilter::isMatching(const FilterableObject *const filtered_object) const { + ScopeLogger(); if (!filtered_object) { LoggerE("Invalid object: NULL!"); return false; diff --git a/src/messaging/MsgCommon/AttributeRangeFilter.cpp b/src/messaging/MsgCommon/AttributeRangeFilter.cpp index 242f3ba4..d3437671 100644 --- a/src/messaging/MsgCommon/AttributeRangeFilter.cpp +++ b/src/messaging/MsgCommon/AttributeRangeFilter.cpp @@ -23,10 +23,12 @@ namespace tizen { AttributeRangeFilter::AttributeRangeFilter(const std::string &attribute_name) : m_attribute_name(attribute_name) { + ScopeLogger(); m_filter_type = ATTRIBUTE_RANGE_FILTER; } AttributeRangeFilter::~AttributeRangeFilter() { + ScopeLogger(); } std::string AttributeRangeFilter::getAttributeName() const { diff --git a/src/messaging/MsgCommon/CompositeFilter.cpp b/src/messaging/MsgCommon/CompositeFilter.cpp index 3f5b3521..d9b4ff77 100644 --- a/src/messaging/MsgCommon/CompositeFilter.cpp +++ b/src/messaging/MsgCommon/CompositeFilter.cpp @@ -27,9 +27,11 @@ CompositeFilter::CompositeFilter(CompositeFilterType type) m_type(type) // m_context(NULL) { + ScopeLogger(); } CompositeFilter::~CompositeFilter() { + ScopeLogger(); } CompositeFilterType CompositeFilter::getType() const { diff --git a/src/messaging/MsgCommon/FilterIterator.cpp b/src/messaging/MsgCommon/FilterIterator.cpp index 4430f7d4..2f2ccd04 100644 --- a/src/messaging/MsgCommon/FilterIterator.cpp +++ b/src/messaging/MsgCommon/FilterIterator.cpp @@ -25,6 +25,7 @@ namespace tizen { FilterIterator::FilterIterator(AbstractFilterPtr filter) : m_root_filter(filter), m_current_state(FIS_NOT_VALID) { + ScopeLogger(); if (!m_root_filter) { LoggerE("Trying to create FilterIterator with NULL filter"); m_root_filter = AbstractFilterPtr(new AbstractFilter()); @@ -79,10 +80,12 @@ bool FilterIterator::isLastCompositeSubFilter() const { } void FilterIterator::operator++(int) { + ScopeLogger(); this->operator++(); } void FilterIterator::operator++() { + ScopeLogger(); if (FIS_ATTRIBUTE_FILTER == m_current_state || FIS_ATTRIBUTE_RANGE_FILTER == m_current_state) { if (m_composite_stack.empty()) { // We are not inside composite filter iteration -> reached THE END @@ -109,6 +112,7 @@ void FilterIterator::operator++() { } void FilterIterator::goToNextInCurCompositeFilter() { + ScopeLogger(); CompositeIterState& cur_cs = m_composite_stack.top(); AbstractFilterPtrVector sub_filters = cur_cs.filter->getFilters(); const size_t next_filter_index = cur_cs.cur_sub_filter_index + 1; @@ -124,11 +128,13 @@ void FilterIterator::goToNextInCurCompositeFilter() { } void FilterIterator::setReachedEnd() { + ScopeLogger(); m_current_state = FIS_END; m_current_filter = AbstractFilterPtr(); } void FilterIterator::goToNext(AbstractFilterPtr next) { + ScopeLogger(); switch (next->getFilterType()) { case ATTRIBUTE_FILTER: { m_current_state = FIS_ATTRIBUTE_FILTER; diff --git a/src/messaging/MsgCommon/SortMode.cpp b/src/messaging/MsgCommon/SortMode.cpp index e81b5958..4887014d 100644 --- a/src/messaging/MsgCommon/SortMode.cpp +++ b/src/messaging/MsgCommon/SortMode.cpp @@ -23,11 +23,12 @@ namespace tizen { SortMode::SortMode(const std::string &attribute_name, SortModeOrder order) : m_attribute_name(attribute_name), m_order(order) { - LoggerD("SortMode attributeName: %s, SortMode order: %s", attribute_name.c_str(), - (order == SortModeOrder::DESC) ? "DESC" : "ASC"); + ScopeLogger("SortMode attributeName: %s, SortMode order: %s", attribute_name.c_str(), + (order == SortModeOrder::DESC) ? "DESC" : "ASC"); } SortMode::~SortMode() { + ScopeLogger(); } std::string SortMode::getAttributeName() const { diff --git a/src/messaging/callback_user_data.cc b/src/messaging/callback_user_data.cc index 4816ce6c..dfe796ae 100755 --- a/src/messaging/callback_user_data.cc +++ b/src/messaging/callback_user_data.cc @@ -31,7 +31,7 @@ CallbackUserData::CallbackUserData(PostQueue& queue, long cid, bool keep /* = fa cid_(cid), queue_(queue), result_(common::ErrorCode::NO_ERROR) { - LoggerD("Entered"); + ScopeLogger(); if (!keep) { // this is not listener, add callbackId AddJsonData(JSON_CALLBACK_ID, picojson::value(static_cast(cid_))); @@ -39,16 +39,16 @@ CallbackUserData::CallbackUserData(PostQueue& queue, long cid, bool keep /* = fa } CallbackUserData::~CallbackUserData() { - LoggerD("Entered"); + ScopeLogger(); } bool CallbackUserData::IsError() const { - LoggerD("Entered"); + ScopeLogger(); return result_.IsError(); } void CallbackUserData::SetError(const common::PlatformResult& error) { - LoggerD("Entered"); + ScopeLogger(); // keep only the first error if (!IsError()) { ReportError(error, &obj_); @@ -57,7 +57,7 @@ void CallbackUserData::SetError(const common::PlatformResult& error) { } void CallbackUserData::SetSuccess(const picojson::value& data /* = picojson::value()*/) { - LoggerD("Entered"); + ScopeLogger(); // do not allow to overwrite the error if (!IsError()) { ReportSuccess(data, obj_); @@ -65,7 +65,7 @@ void CallbackUserData::SetSuccess(const picojson::value& data /* = picojson::val } void CallbackUserData::SetAction(const char* action, const picojson::value& data) { - LoggerD("Entered"); + ScopeLogger(); AddJsonData(JSON_ACTION, picojson::value(action)); // ReportSuccess cannot be used here, update of this field is necessary (this is a special case) @@ -77,12 +77,12 @@ void CallbackUserData::SetListenerId(const char* id) { } void CallbackUserData::AddToQueue() { - LoggerD("Entered"); + ScopeLogger(); queue_.add(cid_, PostPriority::HIGH); } void CallbackUserData::Post() { - LoggerD("Entered"); + ScopeLogger(); queue_.resolve(cid_, json_.serialize()); } @@ -91,12 +91,12 @@ void CallbackUserData::AddAndPost(PostPriority p) { } bool CallbackUserData::HasQueue(const PostQueue& q) const { - LoggerD("Entered"); + ScopeLogger(); return &q == &queue_; } void CallbackUserData::AddJsonData(const char* key, const picojson::value& value) { - LoggerD("Entered"); + ScopeLogger(); // always overwrite obj_[key] = value; } diff --git a/src/messaging/change_listener_container.cc b/src/messaging/change_listener_container.cc index e5303973..e201c8fc 100644 --- a/src/messaging/change_listener_container.cc +++ b/src/messaging/change_listener_container.cc @@ -29,7 +29,7 @@ namespace messaging { class ChangeListenerContainer::ChangeListeners { public: ChangeListeners() { - LoggerD("Entered"); + ScopeLogger(); groups_[SMS] = std::shared_ptr(new ListenerGroup()); groups_[MMS] = std::shared_ptr(new ListenerGroup()); @@ -41,7 +41,7 @@ class ChangeListenerContainer::ChangeListeners { template long Add(const std::shared_ptr& c) { - LoggerD("Entered"); + ScopeLogger(); auto it = groups_.find(c->getServiceType()); @@ -54,7 +54,7 @@ class ChangeListenerContainer::ChangeListeners { } void Remove(long id) { - LoggerD("Entered"); + ScopeLogger(); for (auto& it : groups_) { if (it.second->Remove(id)) { @@ -68,7 +68,7 @@ class ChangeListenerContainer::ChangeListeners { template void Call(typename CallbackType::Signature m, EventType* e) const { - LoggerD("Entered"); + ScopeLogger(); auto it = groups_.find(e->service_type); @@ -80,7 +80,7 @@ class ChangeListenerContainer::ChangeListeners { } bool HasListeners(MessageType type) const { - LoggerD("Entered"); + ScopeLogger(); auto it = groups_.find(type); @@ -97,7 +97,7 @@ class ChangeListenerContainer::ChangeListeners { class Listener { public: long Add(const std::shared_ptr& c) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(mutex_); auto id = GetNextId(); @@ -106,7 +106,7 @@ class ChangeListenerContainer::ChangeListeners { } bool Remove(long id) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(mutex_); return (0 != callbacks_.erase(id)); @@ -114,7 +114,7 @@ class ChangeListenerContainer::ChangeListeners { template void Call(typename CallbackType::Signature m, EventType* e) const { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(mutex_); @@ -127,7 +127,7 @@ class ChangeListenerContainer::ChangeListeners { } bool HasListeners() const { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(mutex_); return !callbacks_.empty(); @@ -150,7 +150,7 @@ class ChangeListenerContainer::ChangeListeners { } bool Remove(long id) { - LoggerD("Entered"); + ScopeLogger(); bool ret = false; @@ -166,7 +166,7 @@ class ChangeListenerContainer::ChangeListeners { } bool HasListeners() const { - LoggerD("Entered"); + ScopeLogger(); return message_callbacks_.HasListeners() || conversation_callbacks_.HasListeners() || folder_callbacks_.HasListeners(); } @@ -178,7 +178,7 @@ class ChangeListenerContainer::ChangeListeners { }; static long GetNextId() { - LoggerD("Entered"); + ScopeLogger(); static std::mutex mutex; static long next_id = 0; @@ -210,7 +210,7 @@ ChangeListenerContainer::ChangeListeners::ListenerGroup::Get& callback) { - LoggerD("Entered"); + ScopeLogger(); return listeners_->Add(callback); } long ChangeListenerContainer::addConversationChangeListener( const std::shared_ptr& callback) { - LoggerD("Entered"); + ScopeLogger(); return listeners_->Add(callback); } long ChangeListenerContainer::addFolderChangeListener( const std::shared_ptr& callback) { - LoggerD("Entered"); + ScopeLogger(); return listeners_->Add(callback); } // --- listeners removal --- void ChangeListenerContainer::removeChangeListener(long id) { - LoggerD("Entered"); + ScopeLogger(); listeners_->Remove(id); } // --- Callback invoking functions --- // -- for message -- void ChangeListenerContainer::callMessageAdded(EventMessages* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&MessagesChangeCallback::added, event); } void ChangeListenerContainer::callMessageUpdated(EventMessages* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&MessagesChangeCallback::updated, event); } void ChangeListenerContainer::callMessageRemoved(EventMessages* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&MessagesChangeCallback::removed, event); } // -- for conversation -- void ChangeListenerContainer::callConversationAdded(EventConversations* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&ConversationsChangeCallback::added, event); } void ChangeListenerContainer::callConversationUpdated(EventConversations* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&ConversationsChangeCallback::updated, event); } void ChangeListenerContainer::callConversationRemoved(EventConversations* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&ConversationsChangeCallback::removed, event); } // -- for folder -- void ChangeListenerContainer::callFolderAdded(EventFolders* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&FoldersChangeCallback::added, event); } void ChangeListenerContainer::callFolderUpdated(EventFolders* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&FoldersChangeCallback::updated, event); } void ChangeListenerContainer::callFolderRemoved(EventFolders* event) const { - LoggerD("Entered"); + ScopeLogger(); listeners_->Call(&FoldersChangeCallback::removed, event); } bool ChangeListenerContainer::isEmailListenerRegistered() const { - LoggerD("Entered"); + ScopeLogger(); return listeners_->HasListeners(EMAIL); } diff --git a/src/messaging/conversation_callback_data.cc b/src/messaging/conversation_callback_data.cc index 8f684093..83070920 100644 --- a/src/messaging/conversation_callback_data.cc +++ b/src/messaging/conversation_callback_data.cc @@ -27,11 +27,11 @@ ConversationCallbackData::ConversationCallbackData(PostQueue& queue, long cid, m_offset(0), m_account_id(0), m_service_type(UNDEFINED) { - LoggerD("Entered"); + ScopeLogger(); } ConversationCallbackData::~ConversationCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } void ConversationCallbackData::setFilter(AbstractFilterPtr filter) { diff --git a/src/messaging/conversations_change_callback.cc b/src/messaging/conversations_change_callback.cc index e84428f9..91620a4b 100644 --- a/src/messaging/conversations_change_callback.cc +++ b/src/messaging/conversations_change_callback.cc @@ -44,17 +44,17 @@ ConversationsChangeCallback::ConversationsChangeCallback(long cid, int service_i m_id(service_id), m_msg_type(service_type), m_is_act(true) { - LoggerD("Entered"); + ScopeLogger(); m_callback_data.SetListenerId("ConversationsChangeListener"); } ConversationsChangeCallback::~ConversationsChangeCallback() { - LoggerD("Entered"); + ScopeLogger(); } ConversationPtrVector ConversationsChangeCallback::filterConversations( AbstractFilterPtr filter, const ConversationPtrVector& source_conversations) { - LoggerD("Entered"); + ScopeLogger(); if (filter) { LoggerD("filter pointer is valid"); ConversationPtrVector filtered_conversations; @@ -84,7 +84,7 @@ ConversationPtrVector ConversationsChangeCallback::filterConversations( } void ConversationsChangeCallback::added(const ConversationPtrVector& conversations) { - LoggerD("Entered conversations.size()=%d", conversations.size()); + ScopeLogger("conversations.size() = %d", conversations.size()); if (!m_is_act) { return; } @@ -110,7 +110,7 @@ void ConversationsChangeCallback::added(const ConversationPtrVector& conversatio } void ConversationsChangeCallback::updated(const ConversationPtrVector& conversations) { - LoggerD("Entered conversations.size()=%d", conversations.size()); + ScopeLogger("conversations.size() = %d", conversations.size()); if (!m_is_act) { return; } @@ -136,7 +136,7 @@ void ConversationsChangeCallback::updated(const ConversationPtrVector& conversat } void ConversationsChangeCallback::removed(const ConversationPtrVector& conversations) { - LoggerD("Entered conversations.size()=%d", conversations.size()); + ScopeLogger("conversations.size() = %d", conversations.size()); if (!m_is_act) { return; } diff --git a/src/messaging/email_manager.cc b/src/messaging/email_manager.cc index 753c752e..3bdb55ca 100644 --- a/src/messaging/email_manager.cc +++ b/src/messaging/email_manager.cc @@ -72,11 +72,11 @@ const std::string FIND_FOLDERS_ATTRIBUTE_ACCOUNTID_NAME = "serviceId"; } // anonymous namespace EmailManager::EmailManager() : m_slot_size(-1), m_is_initialized(false) { - LoggerD("Entered"); + ScopeLogger(); } EmailManager& EmailManager::getInstance() { - LoggerD("Entered"); + ScopeLogger(); static EmailManager instance; return instance; } @@ -88,7 +88,7 @@ EmailManager& EmailManager::getInstance() { } PlatformResult EmailManager::InitializeEmailService() { - LoggerD("Entered"); + ScopeLogger(); EmailManager& instance = EmailManager::getInstance(); if (!instance.m_is_initialized) { @@ -162,23 +162,24 @@ PlatformResult EmailManager::InitializeEmailService() { } EmailManager::~EmailManager() { - LoggerD("Entered"); + ScopeLogger(); } PlatformResult EmailManager::addDraftMessagePlatform(int account_id, std::shared_ptr message) { - LoggerD("Entered"); + ScopeLogger(); return addMessagePlatform(account_id, message, EMAIL_MAILBOX_TYPE_DRAFT); } PlatformResult EmailManager::addOutboxMessagePlatform(int account_id, std::shared_ptr message) { + ScopeLogger(); return addMessagePlatform(account_id, message, EMAIL_MAILBOX_TYPE_OUTBOX); } PlatformResult EmailManager::addMessagePlatform(int account_id, std::shared_ptr message, email_mailbox_type_e mailbox_type) { - LoggerD("Entered"); + ScopeLogger(); email_mail_data_t* mail_data = NULL; email_mail_data_t* mail_data_final = NULL; int err = EMAIL_ERROR_NONE; @@ -300,7 +301,7 @@ PlatformResult EmailManager::addMessagePlatform(int account_id, std::shared_ptr< } static gboolean addDraftMessageCompleteCB(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessageCallbackUserData* callback = static_cast(data); if (!callback) { LoggerE("Callback is null"); @@ -327,7 +328,7 @@ static gboolean addDraftMessageCompleteCB(void* data) { } void EmailManager::addDraftMessage(MessageCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -351,7 +352,7 @@ void EmailManager::addDraftMessage(MessageCallbackUserData* callback) { //**** sending email **** static gboolean sendEmailCompleteCB(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessageRecipientsCallbackData* callback = static_cast(data); if (!callback) { @@ -396,7 +397,7 @@ static gboolean sendEmailCompleteCB(void* data) { } PlatformResult EmailManager::sendMessage(MessageRecipientsCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Callback is null"); @@ -470,7 +471,7 @@ PlatformResult EmailManager::sendMessage(MessageRecipientsCallbackData* callback void EmailManager::sendStatusCallback(int mail_id, email_noti_on_network_event status, int error_code) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_mutex); // find first request for this mail_id @@ -517,7 +518,7 @@ void EmailManager::sendStatusCallback(int mail_id, email_noti_on_network_event s } email_mail_data_t* EmailManager::loadMessage(int msg_id) { - LoggerD("Entered"); + ScopeLogger(); email_mail_data_t* mail_data = NULL; int err = email_get_mail_data(msg_id, &mail_data); if (EMAIL_ERROR_NONE != err) { @@ -529,7 +530,7 @@ email_mail_data_t* EmailManager::loadMessage(int msg_id) { } EmailManager::SendReqMapIterator EmailManager::getSendRequest(int mail_id) { - LoggerD("Entered"); + ScopeLogger(); for (auto it = m_sendRequests.begin(); it != m_sendRequests.end(); it++) { if (it->second->getMessage()->getId() == mail_id) { return it; @@ -539,7 +540,7 @@ EmailManager::SendReqMapIterator EmailManager::getSendRequest(int mail_id) { } void EmailManager::freeMessage(email_mail_data_t* mail_data) { - LoggerD("Entered"); + ScopeLogger(); if (!mail_data) { return; } @@ -551,7 +552,7 @@ void EmailManager::freeMessage(email_mail_data_t* mail_data) { } void EmailManager::loadMessageBody(MessageBodyCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); return; @@ -577,7 +578,7 @@ void EmailManager::loadMessageBody(MessageBodyCallbackData* callback) { } PlatformResult EmailManager::loadMessageAttachment(MessageAttachmentCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Callback is null"); @@ -651,7 +652,7 @@ PlatformResult EmailManager::loadMessageAttachment(MessageAttachmentCallbackData //#################################### sync: ################################### void EmailManager::sync(void* data) { - LoggerD("Entered"); + ScopeLogger(); SyncCallbackData* callback = static_cast(data); @@ -698,7 +699,7 @@ void EmailManager::sync(void* data) { //################################## syncFolder: ############################### void EmailManager::syncFolder(SyncFolderCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -768,7 +769,7 @@ void EmailManager::syncFolder(SyncFolderCallbackData* callback) { //################################## stopSync: ################################# void EmailManager::stopSync(long op_id) { - LoggerD("Entered"); + ScopeLogger(); SyncCallbackData* callback = static_cast(m_proxy_sync->getCallback(op_id)); @@ -793,12 +794,12 @@ void EmailManager::stopSync(long op_id) { //################################## ^stopSync ################################# void EmailManager::RemoveSyncCallback(long op_id) { - LoggerD("Entered"); + ScopeLogger(); m_proxy_sync->removeCallback(op_id); } void EmailManager::RemoveCallbacksByQueue(const PostQueue& q) { - LoggerD("Entered"); + ScopeLogger(); for (auto it = m_sendRequests.begin(); it != m_sendRequests.end();) { if (it->second->HasQueue(q)) { @@ -811,7 +812,7 @@ void EmailManager::RemoveCallbacksByQueue(const PostQueue& q) { } void removeEmailCompleteCB(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); return; @@ -834,7 +835,7 @@ void removeEmailCompleteCB(MessagesCallbackUserData* callback) { EmailManager::DeleteReqVector::iterator EmailManager::getDeleteRequest( const std::vector& ids) { - LoggerD("Entered"); + ScopeLogger(); for (auto idIt = ids.begin(); idIt != ids.end(); ++idIt) { for (auto reqIt = m_deleteRequests.begin(); reqIt != m_deleteRequests.end(); ++reqIt) { MessagePtrVector msgs = reqIt->callback->getMessages(); @@ -850,7 +851,7 @@ EmailManager::DeleteReqVector::iterator EmailManager::getDeleteRequest( void EmailManager::removeStatusCallback(const std::vector& ids, email_noti_on_storage_event status) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_mutex); DeleteReqVector::iterator it = getDeleteRequest(ids); if (it != m_deleteRequests.end()) { @@ -881,7 +882,7 @@ void EmailManager::removeStatusCallback(const std::vector& ids, } PlatformResult EmailManager::RemoveMessagesPlatform(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); int error; email_mail_data_t* mail = NULL; @@ -922,7 +923,7 @@ PlatformResult EmailManager::RemoveMessagesPlatform(MessagesCallbackUserData* ca } void EmailManager::removeMessages(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -938,7 +939,7 @@ void EmailManager::removeMessages(MessagesCallbackUserData* callback) { } PlatformResult EmailManager::UpdateMessagesPlatform(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); int error; email_mail_data_t* mail = NULL; SCOPE_EXIT { @@ -1000,7 +1001,7 @@ PlatformResult EmailManager::UpdateMessagesPlatform(MessagesCallbackUserData* ca } void EmailManager::updateMessages(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -1035,7 +1036,7 @@ void EmailManager::updateMessages(MessagesCallbackUserData* callback) { } PlatformResult EmailManager::FindMessagesPlatform(FindMsgCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); email_mail_data_t* mailList = NULL; int mailListCount = 0; @@ -1068,7 +1069,7 @@ PlatformResult EmailManager::FindMessagesPlatform(FindMsgCallbackUserData* callb } void EmailManager::findMessages(FindMsgCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -1106,7 +1107,7 @@ void EmailManager::findMessages(FindMsgCallbackUserData* callback) { } PlatformResult EmailManager::FindConversationsPlatform(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); int convListCount = 0; std::lock_guard lock(m_mutex); @@ -1130,7 +1131,7 @@ PlatformResult EmailManager::FindConversationsPlatform(ConversationCallbackData* } void EmailManager::findConversations(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -1169,7 +1170,7 @@ void EmailManager::findConversations(ConversationCallbackData* callback) { } long EmailManager::getUniqueOpId() { - LoggerD("Entered"); + ScopeLogger(); // mutex is created only on first call (first call added to constructor // to initialize mutex correctly) static std::mutex op_id_mutex; @@ -1179,7 +1180,7 @@ long EmailManager::getUniqueOpId() { } PlatformResult EmailManager::FindFoldersPlatform(FoldersCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); int ret = EMAIL_ERROR_UNKNOWN; int account_id = ACCOUNT_ID_NOT_INITIALIZED; email_mailbox_t* mailboxes = NULL; @@ -1249,7 +1250,7 @@ PlatformResult EmailManager::FindFoldersPlatform(FoldersCallbackData* callback) } void EmailManager::findFolders(FoldersCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -1288,7 +1289,7 @@ void EmailManager::findFolders(FoldersCallbackData* callback) { } PlatformResult EmailManager::RemoveConversationsPlatform(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); int error; std::lock_guard lock(m_mutex); std::vector> conversations = callback->getConversations(); @@ -1331,7 +1332,7 @@ PlatformResult EmailManager::RemoveConversationsPlatform(ConversationCallbackDat } void EmailManager::removeConversations(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -1359,7 +1360,7 @@ void EmailManager::removeConversations(ConversationCallbackData* callback) { } std::string EmailManager::getMessageStatus(int id) { - LoggerD("Entered"); + ScopeLogger(); email_mail_data_t* mail = nullptr; MessageStatus status = MessageStatus::STATUS_UNDEFINED; diff --git a/src/messaging/find_msg_callback_user_data.cc b/src/messaging/find_msg_callback_user_data.cc index bd28ba41..2b309a2a 100644 --- a/src/messaging/find_msg_callback_user_data.cc +++ b/src/messaging/find_msg_callback_user_data.cc @@ -29,11 +29,11 @@ FindMsgCallbackUserData::FindMsgCallbackUserData(PostQueue& queue, long cid) m_offset(0), m_account_id(0), m_service_type(UNDEFINED) { - LoggerD("Entered"); + ScopeLogger(); } FindMsgCallbackUserData::~FindMsgCallbackUserData() { - LoggerD("Entered"); + ScopeLogger(); } void FindMsgCallbackUserData::setFilter(AbstractFilterPtr filter) { diff --git a/src/messaging/folders_callback_data.cc b/src/messaging/folders_callback_data.cc index 6d5f3dab..a6ba2e68 100644 --- a/src/messaging/folders_callback_data.cc +++ b/src/messaging/folders_callback_data.cc @@ -20,10 +20,11 @@ namespace extension { namespace messaging { FoldersCallbackData::~FoldersCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } void FoldersCallbackData::addFolder(std::shared_ptr folder) { + ScopeLogger(); m_folders.push_back(folder); } diff --git a/src/messaging/folders_change_callback.cc b/src/messaging/folders_change_callback.cc index 72113138..59c159ba 100644 --- a/src/messaging/folders_change_callback.cc +++ b/src/messaging/folders_change_callback.cc @@ -33,17 +33,17 @@ FoldersChangeCallback::FoldersChangeCallback(long cid, int service_id, MessageTy m_id(service_id), m_msg_type(service_type), m_is_act(true) { - LoggerD("Entered"); + ScopeLogger(); m_callback_data.SetListenerId("FoldersChangeListener"); } FoldersChangeCallback::~FoldersChangeCallback() { - LoggerD("Entered"); + ScopeLogger(); } FolderPtrVector FoldersChangeCallback::filterFolders(tizen::AbstractFilterPtr filter, const FolderPtrVector& source_folders) { - LoggerD("Entered"); + ScopeLogger(); if (filter) { LoggerD("filter pointer is valid"); FolderPtrVector filtered_folders; @@ -69,7 +69,7 @@ FolderPtrVector FoldersChangeCallback::filterFolders(tizen::AbstractFilterPtr fi } void FoldersChangeCallback::added(const FolderPtrVector& folders) { - LoggerD("Entered folders.size()=%d", folders.size()); + ScopeLogger("folders.size() = %d", folders.size()); if (!m_is_act) { return; } @@ -95,7 +95,7 @@ void FoldersChangeCallback::added(const FolderPtrVector& folders) { } void FoldersChangeCallback::updated(const FolderPtrVector& folders) { - LoggerD("Entered folders.size()=%d", folders.size()); + ScopeLogger("folders.size() = %d", folders.size()); if (!m_is_act) { return; } @@ -121,7 +121,7 @@ void FoldersChangeCallback::updated(const FolderPtrVector& folders) { } void FoldersChangeCallback::removed(const FolderPtrVector& folders) { - LoggerD("Entered folders.size()=%d", folders.size()); + ScopeLogger("folders.size() = %d", folders.size()); if (!m_is_act) { return; } diff --git a/src/messaging/message.cc b/src/messaging/message.cc index 2a108403..a171c9a2 100644 --- a/src/messaging/message.cc +++ b/src/messaging/message.cc @@ -63,11 +63,11 @@ Message::Message() m_service_id_set(false), m_status(STATUS_UNDEFINED), m_sim_index(TAPI_NETWORK_DEFAULT_DATA_SUBS_UNKNOWN) { - LoggerD("Message constructor (%p)", this); + ScopeLogger("Message constructor (%p)", this); } Message::~Message() { - LoggerD("Message destructor (%p)", this); + ScopeLogger("Message destructor (%p)", this); } // *** attribute getters @@ -87,12 +87,11 @@ int Message::getConversationId() const { } int Message::getFolderId() const { - LoggerD("Entered"); return m_folder_id; } int Message::getFolderIdForUser() const { - LoggerD("Entered"); + ScopeLogger(); // WIDL states: // For SMS and MMS, folderId can be one of these values: // - INBOX = 1, @@ -190,7 +189,7 @@ TelNetworkDefaultDataSubs_t Message::getSimIndex() const { // *** attributes setters void Message::setId(int id) { - LoggerD("Entered"); + ScopeLogger(); m_id = id; m_id_set = true; m_body->setMessageId(m_id); @@ -200,18 +199,18 @@ void Message::setId(int id) { } void Message::setOldId(int id) { - LoggerD("Entered"); + ScopeLogger(); m_old_id = id; } void Message::setConversationId(int id) { - LoggerD("Entered"); + ScopeLogger(); m_conversation_id = id; m_conversation_id_set = true; } void Message::setFolderId(int id) { - LoggerD("Entered"); + ScopeLogger(); m_folder_id = id; m_folder_id_set = true; } @@ -219,19 +218,19 @@ void Message::setFolderId(int id) { // type setting not allowed - no setter for type void Message::setTimeStamp(time_t timestamp) { - LoggerD("Entered"); + ScopeLogger(); m_timestamp = timestamp; m_timestamp_set = true; } void Message::setFrom(std::string from) { - LoggerD("Entered"); + ScopeLogger(); m_from = from; m_from_set = true; } void Message::setTO(std::vector& to) { - LoggerD("Entered"); + ScopeLogger(); // Recipient's format validation should be done by Core API service m_to = to; @@ -250,7 +249,6 @@ void Message::setBCC(std::vector& bcc) { } void Message::setBody(std::shared_ptr& body) { - LoggerD("Entered"); // while replacing message body old body should have some invalid id mark m_body->setMessageId(-1); @@ -261,14 +259,12 @@ void Message::setBody(std::shared_ptr& body) { } void Message::setIsRead(bool read) { - LoggerD("Entered"); m_is_read = read; } // has attachment can't be set explicity -> no setter for this flag void Message::setIsHighPriority(bool highpriority) { - LoggerD("Entered"); // High priority field is used only in MessageEmail m_high_priority = highpriority; } @@ -278,13 +274,11 @@ void Message::setSubject(std::string subject) { } void Message::setInResponseTo(int inresp) { - LoggerD("Entered"); m_in_response = inresp; m_in_response_set = true; } void Message::setMessageStatus(MessageStatus status) { - LoggerD("Entered"); m_status = status; } @@ -293,13 +287,11 @@ void Message::setMessageAttachments(AttachmentPtrVector& attachments) { } void Message::setServiceId(int service_id) { - LoggerD("Entered"); m_service_id = service_id; m_service_id_set = true; } void Message::setSimIndex(TelNetworkDefaultDataSubs_t sim_index) { - LoggerD("Entered"); m_sim_index = sim_index; } @@ -333,7 +325,7 @@ bool Message::is_service_is_set() const { } std::string Message::convertEmailRecipients(const std::vector& recipients) { - LoggerD("Entered"); + ScopeLogger(); std::string address = ""; unsigned size = recipients.size(); for (unsigned i = 0; i < size; ++i) { @@ -344,7 +336,7 @@ std::string Message::convertEmailRecipients(const std::vector& reci } PlatformResult saveToTempFile(const std::string& data, std::string* file_name) { - LoggerD("Entered"); + ScopeLogger(); char buf[] = "XXXXXX"; mode_t mask = umask(S_IWGRP | S_IWOTH); @@ -371,7 +363,7 @@ PlatformResult saveToTempFile(const std::string& data, std::string* file_name) { } PlatformResult copyFileToTemp(const std::string& sourcePath, std::string* result_path) { - LoggerD("Entered"); + ScopeLogger(); char buf[] = "XXXXXX"; std::string fileName, attPath, tmpPath; @@ -436,7 +428,7 @@ PlatformResult copyFileToTemp(const std::string& sourcePath, std::string* result } PlatformResult removeDirFromTemp(const std::string& dirPath) { - LoggerD("Entered"); + ScopeLogger(); if (EINA_TRUE != ecore_file_recursive_rm(dirPath.c_str())) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unknown error while deleting temp directory."); @@ -446,7 +438,7 @@ PlatformResult removeDirFromTemp(const std::string& dirPath) { PlatformResult Message::convertPlatformEmail(std::shared_ptr message, email_mail_data_t** result_mail_data) { - LoggerD("Entered"); + ScopeLogger(); email_mail_data_t* mail_data = nullptr; if (EMAIL != message->getType()) { return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Invalid type."); @@ -540,7 +532,7 @@ PlatformResult Message::convertPlatformEmail(std::shared_ptr message, PlatformResult addSingleEmailAttachment(std::shared_ptr message, std::shared_ptr att, AttachmentType attType) { - LoggerD("Entered"); + ScopeLogger(); std::string dirPath = ""; PlatformResult ret = copyFileToTemp(att->getFilePath(), &dirPath); if (ret.IsError()) return ret; @@ -580,7 +572,7 @@ PlatformResult addSingleEmailAttachment(std::shared_ptr message, } PlatformResult Message::addEmailAttachments(std::shared_ptr message) { - LoggerD("Entered"); + ScopeLogger(); int attachment_data_count = 0, error; email_mail_data_t* mail = NULL; @@ -662,7 +654,7 @@ PlatformResult Message::addEmailAttachments(std::shared_ptr message) { PlatformResult Message::addSMSRecipientsToStruct(const std::vector& recipients, msg_struct_t& msg) { - LoggerD("Entered"); + ScopeLogger(); const unsigned size = recipients.size(); for (unsigned int i = 0; i < size; ++i) { char* address = const_cast(recipients.at(i).c_str()); @@ -683,7 +675,7 @@ PlatformResult Message::addSMSRecipientsToStruct(const std::vector& PlatformResult Message::addMMSRecipientsToStruct(const std::vector& recipients, msg_struct_t& msg, int type) { - LoggerD("Entered"); + ScopeLogger(); const unsigned size = recipients.size(); for (unsigned int i = 0; i < size; ++i) { msg_struct_t tmpAddr = NULL; @@ -712,7 +704,7 @@ PlatformResult Message::addMMSRecipientsToStruct(const std::vector& PlatformResult Message::addMMSBodyAndAttachmentsToStruct(const AttachmentPtrVector& attach, msg_struct_t& mms_struct, Message* message) { - LoggerD("Entered with %d attachments", attach.size()); + ScopeLogger("attachments.size() = %zd", attach.size()); int size = attach.size(); for (int i = 0; i < size; i++) { @@ -779,7 +771,7 @@ PlatformResult Message::addMMSBodyAndAttachmentsToStruct(const AttachmentPtrVect PlatformResult Message::convertPlatformShortMessageToStruct(Message* message, msg_handle_t handle, msg_struct_t* result_msg) { - LoggerD("Entered"); + ScopeLogger(); int ntv_ret = 0; @@ -1023,14 +1015,13 @@ PlatformResult Message::convertPlatformShortMessageToStruct(Message* message, ms // Set message if is read msg_set_bool_value(msg, MSG_MESSAGE_READ_BOOL, message->getIsRead()); - LoggerD("End"); *result_msg = msg; msg_ptr.release(); // release ownership return PlatformResult(ErrorCode::NO_ERROR); } std::string Message::getShortMsgSenderFromStruct(msg_struct_t& msg) { - LoggerD("Entered"); + ScopeLogger(); msg_list_handle_t addr_list = NULL; msg_get_list_handle(msg, MSG_MESSAGE_ADDR_LIST_HND, (void**)&addr_list); @@ -1063,7 +1054,7 @@ std::string Message::getShortMsgSenderFromStruct(msg_struct_t& msg) { PlatformResult Message::getSMSRecipientsFromStruct(msg_struct_t& msg, std::vector* result_address) { - LoggerD("Entered"); + ScopeLogger(); std::vector address; msg_list_handle_t addr_list = NULL; int ntv_ret = msg_get_list_handle(msg, MSG_MESSAGE_ADDR_LIST_HND, (void**)&addr_list); @@ -1089,7 +1080,7 @@ PlatformResult Message::getSMSRecipientsFromStruct(msg_struct_t& msg, PlatformResult Message::getMMSRecipientsFromStruct(msg_struct_t& msg, int type, std::vector* result_address) { - LoggerD("Entered"); + ScopeLogger(); std::vector address; msg_list_handle_t addr_list = NULL; int ntv_ret = msg_get_list_handle(msg, MSG_MESSAGE_ADDR_LIST_HND, (void**)&addr_list); @@ -1118,7 +1109,7 @@ PlatformResult Message::getMMSRecipientsFromStruct(msg_struct_t& msg, int type, } PlatformResult Message::setMMSBodyAndAttachmentsFromStruct(Message* message, msg_struct_t& msg) { - LoggerD("Entered message(%p)", message); + ScopeLogger("message(%p)", message); int tempInt = 0; char infoStr[MSG_FILEPATH_LEN_MAX + 1]; @@ -1289,7 +1280,7 @@ PlatformResult Message::setMMSBodyAndAttachmentsFromStruct(Message* message, msg PlatformResult Message::convertPlatformShortMessageToObject(msg_struct_t msg, Message** result_message) { - LoggerD("Entered"); + ScopeLogger(); std::unique_ptr message; int infoInt; bool infoBool; @@ -1486,7 +1477,7 @@ PlatformResult Message::convertPlatformShortMessageToObject(msg_struct_t msg, } PlatformResult Message::findShortMessageById(const int id, MessagePtr* message) { - LoggerD("Entered"); + ScopeLogger(); msg_struct_t msg; PlatformResult ret = ShortMsgManager::getInstance().getMessage(id, &msg); if (ret.IsError()) { @@ -1503,7 +1494,7 @@ PlatformResult Message::findShortMessageById(const int id, MessagePtr* message) } std::vector Message::split(const std::string& input, char delimiter) { - LoggerD("Entered"); + ScopeLogger(); std::vector ret; std::stringstream stream(input); std::string item; @@ -1514,7 +1505,7 @@ std::vector Message::split(const std::string& input, char delimiter } std::vector Message::getEmailRecipientsFromStruct(const char* recipients) { - LoggerD("Entered"); + ScopeLogger(); std::vector tmp = Message::split(recipients, ';'); for (std::vector::iterator it = tmp.begin(); it != tmp.end(); ++it) { *it = MessagingUtil::ltrim(*it); @@ -1536,7 +1527,7 @@ std::vector Message::getEmailRecipientsFromStruct(const char* recip } std::shared_ptr Message::convertEmailToMessageBody(email_mail_data_t& mail) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr body(new MessageBody()); body->updateBody(mail); return body; @@ -1544,7 +1535,7 @@ std::shared_ptr Message::convertEmailToMessageBody(email_mail_data_ PlatformResult Message::convertEmailToMessageAttachment(email_mail_data_t& mail, AttachmentPtrVector* att) { - LoggerD("Entered"); + ScopeLogger(); email_attachment_data_t* attachment = NULL; int attachmentCount = 0; @@ -1568,7 +1559,7 @@ PlatformResult Message::convertEmailToMessageAttachment(email_mail_data_t& mail, PlatformResult Message::convertPlatformEmailToObject(email_mail_data_t& mail, std::shared_ptr* result) { - LoggerD("Entered"); + ScopeLogger(); Message* message = new MessageEmail(); PlatformResult ret = message->updateEmailMessage(mail); if (ret.IsError()) { @@ -1629,7 +1620,7 @@ const std::string SUBJECT = MESSAGE_ATTRIBUTE_SUBJECT; bool Message::isMatchingAttribute(const std::string& attribute_name, const FilterMatchFlag match_flag, AnyPtr match_value) const { - LoggerD("Entered"); + ScopeLogger(); auto key = match_value->toString(); LoggerD("attribute_name:%s match_flag:%d matchValue:%s", attribute_name.c_str(), match_flag, key.c_str()); @@ -1677,7 +1668,7 @@ bool Message::isMatchingAttribute(const std::string& attribute_name, bool Message::isMatchingAttributeRange(const std::string& attribute_name, AnyPtr initial_value, AnyPtr end_value) const { - LoggerD("Entered attribute_name: %s", attribute_name.c_str()); + ScopeLogger(attribute_name); using namespace MESSAGE_FILTER_ATTRIBUTE; if (TIMESTAMP == attribute_name) { diff --git a/src/messaging/message_attachment.cc b/src/messaging/message_attachment.cc index 07972e95..56558a9c 100644 --- a/src/messaging/message_attachment.cc +++ b/src/messaging/message_attachment.cc @@ -31,7 +31,7 @@ std::map& MessageAttachment::MIMETypeEnumToStringMap initializeMIMETypeEnumToStringMap(); MessageAttachment::MessageAttachment() { - LoggerD("MessageAttachment constructor (%p)", this); + ScopeLogger("MessageAttachment constructor (%p)", this); m_id = -1; m_isIdSet = false; m_messageId = -1; @@ -44,7 +44,7 @@ MessageAttachment::MessageAttachment() { } MessageAttachment::~MessageAttachment() { - LoggerD("MessageAttachment destructor (%p)", this); + ScopeLogger("MessageAttachment destructor (%p)", this); } // id @@ -111,7 +111,7 @@ std::string MessageAttachment::getFilePath() { } std::string MessageAttachment::getShortFileName() const { - LoggerD("Entered"); + ScopeLogger(); if (!m_isFilePathSet) { return ""; } @@ -126,7 +126,7 @@ std::string MessageAttachment::getShortFileName() const { } void MessageAttachment::setFilePath(const std::string& value) { - LoggerD("Entered"); + ScopeLogger(); m_filePath = common::FilesystemProvider::Create().GetRealPath(value); m_isFilePathSet = true; @@ -149,7 +149,7 @@ bool MessageAttachment::isSaved() const { } std::map& MessageAttachment::initializeMIMETypeEnumToStringMap() { - LoggerD("Entered"); + ScopeLogger(); static std::map enumToString; // 0 enumToString[MIME_ASTERISK] = "*/*"; @@ -347,7 +347,7 @@ std::map& MessageAttachment::initializeMIMETypeEnumTo } std::map& MessageAttachment::initializeMIMETypeStringToEnumMap() { - LoggerD("Entered"); + ScopeLogger(); static std::map stringToEnum; // 0 stringToEnum["*/*"] = MIME_ASTERISK; @@ -546,7 +546,7 @@ std::map& MessageAttachment::initializeMIMETypeString } unsigned int MessageAttachment::MIMETypeStringToEnum(std::string str) { - LoggerD("Entered"); + ScopeLogger(); std::map::iterator it = MIMETypeStringToEnumMap.find(str); if (it != MIMETypeStringToEnumMap.end()) { return it->second; @@ -555,7 +555,7 @@ unsigned int MessageAttachment::MIMETypeStringToEnum(std::string str) { } std::string MessageAttachment::MIMETypeEnumToString(unsigned int num) { - LoggerD("Entered"); + ScopeLogger(); std::map::iterator it = MIMETypeEnumToStringMap.find(num); if (it != MIMETypeEnumToStringMap.end()) { return it->second; @@ -564,7 +564,7 @@ std::string MessageAttachment::MIMETypeEnumToString(unsigned int num) { } void MessageAttachment::updateWithAttachmentData(const email_attachment_data_t& attachment_data) { - LoggerD("Entered"); + ScopeLogger(); setId(attachment_data.attachment_id); setMessageId(attachment_data.mail_id); if (attachment_data.attachment_mime_type) { diff --git a/src/messaging/message_body.cc b/src/messaging/message_body.cc index 8349d8e8..821acd19 100644 --- a/src/messaging/message_body.cc +++ b/src/messaging/message_body.cc @@ -28,11 +28,11 @@ using namespace common; MessageBody::MessageBody() : m_messageId(1), m_messageId_set(false), m_loaded(false), m_plainBody(""), m_htmlBody("") { - LoggerD("Entered"); + ScopeLogger(); } MessageBody::~MessageBody() { - LoggerD("Entered"); + ScopeLogger(); } // messageId @@ -92,7 +92,7 @@ bool MessageBody::is_message_id_set() const { } PlatformResult MessageBody::updateBody(email_mail_data_t& mail) { - LoggerD("Entered"); + ScopeLogger(); setMessageId(mail.mail_id); setLoaded(mail.body_download_status); diff --git a/src/messaging/message_callback_user_data.cc b/src/messaging/message_callback_user_data.cc index c7479bdb..bb6f1b97 100644 --- a/src/messaging/message_callback_user_data.cc +++ b/src/messaging/message_callback_user_data.cc @@ -22,11 +22,11 @@ namespace messaging { MessageCallbackUserData::MessageCallbackUserData(PostQueue& queue, long cid) : CallbackUserData(queue, cid), m_account_id(0) { - LoggerD("Entered"); + ScopeLogger(); } MessageCallbackUserData::~MessageCallbackUserData() { - LoggerD("Entered"); + ScopeLogger(); } void MessageCallbackUserData::setMessage(std::shared_ptr message) { diff --git a/src/messaging/message_conversation.cc b/src/messaging/message_conversation.cc index ed2b475a..5d1ea2cd 100644 --- a/src/messaging/message_conversation.cc +++ b/src/messaging/message_conversation.cc @@ -40,11 +40,11 @@ MessageConversation::MessageConversation() m_unread_messages(0), m_is_read(false), m_last_message_id(-1) { - LoggerD("Message Conversation constructor."); + ScopeLogger("Message Conversation constructor."); } MessageConversation::~MessageConversation() { - LoggerD("Message Conversation destructor."); + ScopeLogger("Message Conversation destructor."); } // *** attributes getters int MessageConversation::getConversationId() const { @@ -105,7 +105,7 @@ int MessageConversation::getLastMessageId() const { PlatformResult MessageConversation::convertMsgConversationToObject( unsigned int threadId, msg_handle_t handle, std::shared_ptr* result) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr conversation(new MessageConversation()); msg_struct_t msgInfo = NULL; @@ -249,7 +249,7 @@ PlatformResult MessageConversation::convertMsgConversationToObject( PlatformResult MessageConversation::convertEmailConversationToObject( unsigned int threadId, std::shared_ptr* result) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr conversation(new MessageConversation()); email_mail_list_item_t* resultMail = NULL; @@ -443,7 +443,7 @@ const std::string TO = MESSAGE_CONVERSATION_ATTRIBUTE_TO; bool MessageConversation::isMatchingAttribute(const std::string& attribute_name, const FilterMatchFlag match_flag, AnyPtr match_value) const { - LoggerD("Entered"); + ScopeLogger(); auto key = match_value->toString(); LoggerD("attribute_name: %s match_flag:%d match_value:%s", attribute_name.c_str(), match_flag, key.c_str()); @@ -473,7 +473,7 @@ bool MessageConversation::isMatchingAttribute(const std::string& attribute_name, bool MessageConversation::isMatchingAttributeRange(const std::string& attribute_name, AnyPtr initial_value, AnyPtr end_value) const { - LoggerD("Entered attribute_name: %s", attribute_name.c_str()); + ScopeLogger("attribute_name: " + attribute_name); using namespace CONVERSATION_FILTER_ATTRIBUTE; @@ -486,7 +486,7 @@ bool MessageConversation::isMatchingAttributeRange(const std::string& attribute_ } std::string MessageConversation::SanitizeUtf8String(const std::string& input) { - LoggerD("Entered"); + ScopeLogger(); std::string result = input; const gchar* end = nullptr; diff --git a/src/messaging/message_email.cc b/src/messaging/message_email.cc index d2ee2bf8..1ad2f57f 100644 --- a/src/messaging/message_email.cc +++ b/src/messaging/message_email.cc @@ -25,24 +25,24 @@ namespace messaging { using namespace common; MessageEmail::MessageEmail() : Message() { - LoggerD("MessageEmail constructor."); + ScopeLogger(); this->m_type = MessageType(EMAIL); } MessageEmail::~MessageEmail() { - LoggerD("MessageEmail destructor."); + ScopeLogger(); } // *** overridden methods int MessageEmail::getFolderIdForUser() const { - LoggerD("Entered"); + ScopeLogger(); // in case of e-mails we're using platform IDs directly return m_folder_id; } void MessageEmail::setCC(std::vector &cc) { - LoggerD("Entered"); + ScopeLogger(); // CC recipient's format validation should be done by email service m_cc = cc; @@ -53,7 +53,7 @@ void MessageEmail::setCC(std::vector &cc) { } void MessageEmail::setBCC(std::vector &bcc) { - LoggerD("Entered"); + ScopeLogger(); // BCC recipient's format validation should be done by email service m_bcc = bcc; @@ -64,17 +64,17 @@ void MessageEmail::setBCC(std::vector &bcc) { } void MessageEmail::setSubject(std::string subject) { - LoggerD("Entered"); + ScopeLogger(); m_subject = subject; } void MessageEmail::setIsHighPriority(bool highpriority) { - LoggerD("Entered"); + ScopeLogger(); m_high_priority = highpriority; } void MessageEmail::setMessageAttachments(AttachmentPtrVector &attachments) { - LoggerD("Entered"); + ScopeLogger(); m_attachments = attachments; m_has_attachment = true; @@ -90,7 +90,7 @@ bool MessageEmail::getHasAttachment() const { } PlatformResult MessageEmail::updateEmailMessage(email_mail_data_t &mail) { - LoggerD("Entered"); + ScopeLogger(); std::vector recp_list; setId(mail.mail_id); diff --git a/src/messaging/message_folder.cc b/src/messaging/message_folder.cc index 87c166de..5a4795a1 100644 --- a/src/messaging/message_folder.cc +++ b/src/messaging/message_folder.cc @@ -34,11 +34,11 @@ MessageFolder::MessageFolder(std::string id, std::string parent_id, std::string m_path(path), m_type(type), m_synchronizable(synchronizable) { - LoggerD("Entered"); + ScopeLogger(); } MessageFolder::MessageFolder(email_mailbox_t mailbox) { - LoggerD("Entered"); + ScopeLogger(); m_id = std::to_string(mailbox.mailbox_id); m_parent_id_set = false; m_service_id = std::to_string(mailbox.account_id); @@ -103,7 +103,7 @@ void MessageFolder::setSynchronizable(const bool& value) { } MessageFolderType MessageFolder::convertPlatformFolderType(email_mailbox_type_e folderType) { - LoggerD("Entered"); + ScopeLogger(); switch (folderType) { case email_mailbox_type_e::EMAIL_MAILBOX_TYPE_INBOX: return MessageFolderType::MESSAGE_FOLDER_TYPE_INBOX; @@ -142,7 +142,7 @@ const std::string SERVICE_ID = "serviceId"; bool MessageFolder::isMatchingAttribute(const std::string& attribute_name, const FilterMatchFlag match_flag, AnyPtr match_value) const { - LoggerD("Entered"); + ScopeLogger(); auto key = match_value->toString(); LoggerD("attribute_name: %s match_flag:%d match_value:%s", attribute_name.c_str(), match_flag, key.c_str()); @@ -160,7 +160,7 @@ bool MessageFolder::isMatchingAttribute(const std::string& attribute_name, bool MessageFolder::isMatchingAttributeRange(const std::string& attribute_name, AnyPtr initial_value, AnyPtr end_value) const { - LoggerD("Entered"); + ScopeLogger(); LoggerD("attribute_name: %s NOT SUPPORTED", attribute_name.c_str()); return false; } diff --git a/src/messaging/message_mms.cc b/src/messaging/message_mms.cc index 8ef1cc35..397739b0 100644 --- a/src/messaging/message_mms.cc +++ b/src/messaging/message_mms.cc @@ -23,17 +23,17 @@ namespace extension { namespace messaging { MessageMMS::MessageMMS() : Message() { - LoggerD("MessageMMS constructor."); + ScopeLogger(); this->m_type = MessageType(MessageType(MMS)); } MessageMMS::~MessageMMS() { - LoggerD("MessageMMS destructor."); + ScopeLogger(); } // *** overrided methods void MessageMMS::setCC(std::vector &cc) { - LoggerD("Entered"); + ScopeLogger(); // CC recipient's format validation should be done by email service m_cc = cc; @@ -44,7 +44,7 @@ void MessageMMS::setCC(std::vector &cc) { } void MessageMMS::setBCC(std::vector &bcc) { - LoggerD("Entered"); + ScopeLogger(); // BCC recipient's format validation should be done by email service m_bcc = bcc; @@ -59,7 +59,7 @@ void MessageMMS::setSubject(std::string subject) { } void MessageMMS::setMessageAttachments(AttachmentPtrVector &attachments) { - LoggerD("Entered"); + ScopeLogger(); m_attachments = attachments; m_has_attachment = true; @@ -70,7 +70,7 @@ void MessageMMS::setMessageAttachments(AttachmentPtrVector &attachments) { } bool MessageMMS::getHasAttachment() const { - LoggerD("MessageMMS::getHasAttachment()"); + ScopeLogger("MessageMMS::getHasAttachment()"); return m_has_attachment; } diff --git a/src/messaging/message_service.cc b/src/messaging/message_service.cc index 6472985a..aa922a52 100644 --- a/src/messaging/message_service.cc +++ b/src/messaging/message_service.cc @@ -46,11 +46,11 @@ MessageRecipientsCallbackData::MessageRecipientsCallbackData(PostQueue& queue, l m_account_id(-1), m_sim_index(TAPI_NETWORK_DEFAULT_DATA_SUBS_UNKNOWN), m_default_sim_index(TAPI_NETWORK_DEFAULT_DATA_SUBS_UNKNOWN) { - LoggerD("Entered"); + ScopeLogger(); } MessageRecipientsCallbackData::~MessageRecipientsCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } void MessageRecipientsCallbackData::setMessage(std::shared_ptr message) { @@ -79,7 +79,7 @@ int MessageRecipientsCallbackData::getAccountId() const { } bool MessageRecipientsCallbackData::setSimIndex(int sim_index) { - LoggerD("Entered"); + ScopeLogger(); char** cp_list = tel_get_cp_name_list(); int sim_count = 0; if (cp_list) { @@ -124,11 +124,11 @@ TelNetworkDefaultDataSubs_t MessageRecipientsCallbackData::getDefaultSimIndex() BaseMessageServiceCallbackData::BaseMessageServiceCallbackData(PostQueue& queue, long cid) : CallbackUserData(queue, cid), m_op_handle(-1) { - LoggerD("Entered"); + ScopeLogger(); } BaseMessageServiceCallbackData::~BaseMessageServiceCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } void BaseMessageServiceCallbackData::setOperationHandle(const int op_handle) { @@ -142,7 +142,7 @@ int BaseMessageServiceCallbackData::getOperationHandle() const { //#################### MessageBodyCallbackData #################### MessageBodyCallbackData::~MessageBodyCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } void MessageBodyCallbackData::setMessage(std::shared_ptr message) { @@ -157,11 +157,11 @@ std::shared_ptr MessageBodyCallbackData::getMessage() const { MessageAttachmentCallbackData::MessageAttachmentCallbackData(PostQueue& queue, long cid) : BaseMessageServiceCallbackData(queue, cid), m_nth(0) { - LoggerD("Entered"); + ScopeLogger(); } MessageAttachmentCallbackData::~MessageAttachmentCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } void MessageAttachmentCallbackData::setMessageAttachment( @@ -189,11 +189,11 @@ SyncCallbackData::SyncCallbackData(PostQueue& queue, long cid) m_limit(0), m_op_id(-1), m_account_id(-1) { - LoggerD("Entered"); + ScopeLogger(); } SyncCallbackData::~SyncCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } void SyncCallbackData::setLimit(const unsigned long limit) { @@ -228,7 +228,7 @@ int SyncCallbackData::getAccountId() const { //#################### SyncFolderCallbackData #################### SyncFolderCallbackData::~SyncFolderCallbackData() { - LoggerD("Entered"); + ScopeLogger(); } void SyncFolderCallbackData::setMessageFolder(std::shared_ptr message_folder) { @@ -243,7 +243,7 @@ std::shared_ptr SyncFolderCallbackData::getMessageFolder() const MessageService::MessageService(int id, MessageType msgType, const std::string& name) : m_id(id), m_msg_type(msgType), m_name(name) { - LoggerD("Entered"); + ScopeLogger(); switch (msgType) { case MessageType::SMS: case MessageType::MMS: @@ -260,11 +260,11 @@ MessageService::MessageService(int id, MessageType msgType, const std::string& n } MessageService::~MessageService() { - LoggerD("Entered"); + ScopeLogger(); } picojson::object MessageService::toPicoJS() const { - LoggerD("Entered"); + ScopeLogger(); picojson::object picojs = picojson::object(); picojs[JSON_SERVICE_ID] = picojson::value(std::to_string(m_id)); picojs[JSON_SERVICE_TYPE] = picojson::value(getMsgServiceTypeString()); diff --git a/src/messaging/message_service_email.cc b/src/messaging/message_service_email.cc index 6780539c..09b941e7 100644 --- a/src/messaging/message_service_email.cc +++ b/src/messaging/message_service_email.cc @@ -27,11 +27,11 @@ namespace messaging { MessageServiceEmail::MessageServiceEmail(int id, std::string name) : MessageService(id, MessageType::EMAIL, name) { - LoggerD("Entered"); + ScopeLogger(); } MessageServiceEmail::~MessageServiceEmail() { - LoggerD("Entered"); + ScopeLogger(); for (auto id : registered_callbacks_) { // this may internally fail, because we don't have information about @@ -41,7 +41,7 @@ MessageServiceEmail::~MessageServiceEmail() { } static gboolean sendMessageTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); auto ret = EmailManager::getInstance().sendMessage(static_cast(data)); @@ -54,7 +54,7 @@ static gboolean sendMessageTask(void* data) { } PlatformResult MessageServiceEmail::sendMessage(MessageRecipientsCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Callback is null"); @@ -72,7 +72,7 @@ PlatformResult MessageServiceEmail::sendMessage(MessageRecipientsCallbackData* c } static gboolean loadMessageBodyTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); EmailManager::getInstance().loadMessageBody(static_cast(data)); @@ -80,7 +80,7 @@ static gboolean loadMessageBodyTask(void* data) { } PlatformResult MessageServiceEmail::loadMessageBody(MessageBodyCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Callback is null"); } @@ -95,7 +95,7 @@ PlatformResult MessageServiceEmail::loadMessageBody(MessageBodyCallbackData* cal } static gboolean loadMessageAttachmentTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); auto callback = static_cast(data); @@ -127,7 +127,7 @@ static gboolean loadMessageAttachmentTask(void* data) { } PlatformResult MessageServiceEmail::loadMessageAttachment(MessageAttachmentCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); guint id = g_idle_add(loadMessageAttachmentTask, static_cast(callback)); if (!id) { delete callback; @@ -137,7 +137,7 @@ PlatformResult MessageServiceEmail::loadMessageAttachment(MessageAttachmentCallb } static gboolean syncTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); EmailManager::getInstance().sync(data); @@ -145,7 +145,7 @@ static gboolean syncTask(void* data) { } PlatformResult MessageServiceEmail::sync(SyncCallbackData* callback, long* operation_id) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Callback is null"); @@ -165,7 +165,7 @@ PlatformResult MessageServiceEmail::sync(SyncCallbackData* callback, long* opera } static gboolean syncFolderTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); EmailManager::getInstance().syncFolder(static_cast(data)); @@ -174,7 +174,7 @@ static gboolean syncFolderTask(void* data) { PlatformResult MessageServiceEmail::syncFolder(SyncFolderCallbackData* callback, long* operation_id) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Callback is null"); } @@ -198,7 +198,7 @@ PlatformResult MessageServiceEmail::syncFolder(SyncFolderCallbackData* callback, } static gboolean stopSyncTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); if (!data) { LoggerE("opId is null"); @@ -214,7 +214,7 @@ static gboolean stopSyncTask(void* data) { } PlatformResult MessageServiceEmail::stopSync(long op_id) { - LoggerD("Entered"); + ScopeLogger(); registered_callbacks_.erase(op_id); long* data = new long(op_id); diff --git a/src/messaging/message_service_short_msg.cc b/src/messaging/message_service_short_msg.cc index 290f8657..78db7058 100644 --- a/src/messaging/message_service_short_msg.cc +++ b/src/messaging/message_service_short_msg.cc @@ -39,15 +39,15 @@ namespace messaging { MessageServiceShortMsg::MessageServiceShortMsg(int id, MessageType msgType) : MessageService(id, msgType, MessagingUtil::messageTypeToString(msgType)) { - LoggerD("Entered"); + ScopeLogger(); } MessageServiceShortMsg::~MessageServiceShortMsg() { - LoggerD("Entered"); + ScopeLogger(); } static gboolean sendMessageThread(void* data) { - LoggerD("Entered"); + ScopeLogger(); auto ret = ShortMsgManager::getInstance().sendMessage(static_cast(data)); @@ -60,7 +60,7 @@ static gboolean sendMessageThread(void* data) { } PlatformResult MessageServiceShortMsg::sendMessage(MessageRecipientsCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Callback is null"); } @@ -118,7 +118,7 @@ PlatformResult MessageServiceShortMsg::sendMessage(MessageRecipientsCallbackData } static gboolean loadMessageBodyTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessageBodyCallbackData* callback = static_cast(data); if (!callback) { LoggerE("callback is NULL"); @@ -136,7 +136,7 @@ static gboolean loadMessageBodyTask(void* data) { } PlatformResult MessageServiceShortMsg::loadMessageBody(MessageBodyCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Callback is null"); } @@ -151,11 +151,13 @@ PlatformResult MessageServiceShortMsg::loadMessageBody(MessageBodyCallbackData* } MessageServiceShortMsg* MessageServiceShortMsg::GetMmsMessageService() { + ScopeLogger(); return new (std::nothrow) MessageServiceShortMsg(MessageServiceAccountId::MMS_ACCOUNT_ID, MessageType::MMS); } MessageServiceShortMsg* MessageServiceShortMsg::GetSmsMessageService() { + ScopeLogger(); return new (std::nothrow) MessageServiceShortMsg(MessageServiceAccountId::SMS_ACCOUNT_ID, MessageType::SMS); } diff --git a/src/messaging/message_sms.cc b/src/messaging/message_sms.cc index bf67c8cc..32bdcc2b 100644 --- a/src/messaging/message_sms.cc +++ b/src/messaging/message_sms.cc @@ -22,12 +22,12 @@ namespace extension { namespace messaging { MessageSMS::MessageSMS() : Message() { - LoggerD("MessageSMS constructor."); + ScopeLogger(); this->m_type = MessageType(MessageType(SMS)); } MessageSMS::~MessageSMS() { - LoggerD("MessageSMS destructor."); + ScopeLogger(); } } // messaging diff --git a/src/messaging/message_storage.cc b/src/messaging/message_storage.cc index 36a771b4..b6a5e466 100644 --- a/src/messaging/message_storage.cc +++ b/src/messaging/message_storage.cc @@ -26,11 +26,11 @@ namespace extension { namespace messaging { MessageStorage::MessageStorage(int id, MessageType msgType) : m_id(id), m_msg_type(msgType) { - LoggerD("Entered"); + ScopeLogger(); } MessageStorage::~MessageStorage() { - LoggerD("Entered"); + ScopeLogger(); for (auto id : registered_listeners_) { ChangeListenerContainer::getInstance().removeChangeListener(id); @@ -38,12 +38,12 @@ MessageStorage::~MessageStorage() { } int MessageStorage::getMsgServiceId() const { - LoggerD("Entered"); + ScopeLogger(); return m_id; } MessageType MessageStorage::getMsgServiceType() const { - LoggerD("Entered"); + ScopeLogger(); return m_msg_type; } @@ -52,7 +52,7 @@ std::string MessageStorage::getMsgServiceTypeString() const { } long MessageStorage::addMessagesChangeListener(std::shared_ptr callback) { - LoggerD("Entered"); + ScopeLogger(); long id = ChangeListenerContainer::getInstance().addMessageChangeListener(callback); registered_listeners_.insert(id); return id; @@ -60,21 +60,21 @@ long MessageStorage::addMessagesChangeListener(std::shared_ptr callback) { - LoggerD("Entered"); + ScopeLogger(); long id = ChangeListenerContainer::getInstance().addConversationChangeListener(callback); registered_listeners_.insert(id); return id; } long MessageStorage::addFoldersChangeListener(std::shared_ptr callback) { - LoggerD("Entered"); + ScopeLogger(); long id = ChangeListenerContainer::getInstance().addFolderChangeListener(callback); registered_listeners_.insert(id); return id; } void MessageStorage::removeChangeListener(long watchId) { - LoggerD("Entered"); + ScopeLogger(); ChangeListenerContainer::getInstance().removeChangeListener(watchId); registered_listeners_.erase(watchId); } diff --git a/src/messaging/message_storage_email.cc b/src/messaging/message_storage_email.cc index 432f21b8..87e670c7 100644 --- a/src/messaging/message_storage_email.cc +++ b/src/messaging/message_storage_email.cc @@ -27,15 +27,15 @@ namespace extension { namespace messaging { MessageStorageEmail::MessageStorageEmail(int id) : MessageStorage(id, MessageType::EMAIL) { - LoggerD("Entered"); + ScopeLogger(); } MessageStorageEmail::~MessageStorageEmail() { - LoggerD("Entered"); + ScopeLogger(); } static gboolean addDraftMessageTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessageCallbackUserData* callback = static_cast(data); EmailManager::getInstance().addDraftMessage(callback); @@ -44,7 +44,7 @@ static gboolean addDraftMessageTask(void* data) { } void MessageStorageEmail::addDraftMessage(MessageCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -62,7 +62,7 @@ void MessageStorageEmail::addDraftMessage(MessageCallbackUserData* callback) { } static gboolean removeMessagesTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessagesCallbackUserData* callback = static_cast(data); EmailManager::getInstance().removeMessages(callback); @@ -71,7 +71,7 @@ static gboolean removeMessagesTask(void* data) { } void MessageStorageEmail::removeMessages(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -89,7 +89,7 @@ void MessageStorageEmail::removeMessages(MessagesCallbackUserData* callback) { } static gboolean updateMessagesTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessagesCallbackUserData* callback = static_cast(data); EmailManager::getInstance().updateMessages(callback); @@ -98,7 +98,7 @@ static gboolean updateMessagesTask(void* data) { } void MessageStorageEmail::updateMessages(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -115,7 +115,7 @@ void MessageStorageEmail::updateMessages(MessagesCallbackUserData* callback) { } static gboolean findMessagesTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); FindMsgCallbackUserData* callback = static_cast(data); EmailManager::getInstance().findMessages(callback); @@ -124,7 +124,7 @@ static gboolean findMessagesTask(void* data) { } void MessageStorageEmail::findMessages(FindMsgCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -143,7 +143,7 @@ void MessageStorageEmail::findMessages(FindMsgCallbackUserData* callback) { } static gboolean findConversationsTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); ConversationCallbackData* callback = static_cast(data); EmailManager::getInstance().findConversations(callback); @@ -152,7 +152,7 @@ static gboolean findConversationsTask(void* data) { } void MessageStorageEmail::findConversations(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -170,7 +170,7 @@ void MessageStorageEmail::findConversations(ConversationCallbackData* callback) } static gboolean removeConversationsTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); ConversationCallbackData* callback = static_cast(data); EmailManager::getInstance().removeConversations(callback); @@ -179,7 +179,7 @@ static gboolean removeConversationsTask(void* data) { } void MessageStorageEmail::removeConversations(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -197,7 +197,7 @@ void MessageStorageEmail::removeConversations(ConversationCallbackData* callback } static gboolean findFoldersTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); FoldersCallbackData* callback = static_cast(data); EmailManager::getInstance().findFolders(callback); @@ -206,7 +206,7 @@ static gboolean findFoldersTask(void* data) { } void MessageStorageEmail::findFolders(FoldersCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); diff --git a/src/messaging/message_storage_short_msg.cc b/src/messaging/message_storage_short_msg.cc index 69a1ebd0..335b1899 100644 --- a/src/messaging/message_storage_short_msg.cc +++ b/src/messaging/message_storage_short_msg.cc @@ -28,15 +28,15 @@ namespace messaging { MessageStorageShortMsg::MessageStorageShortMsg(int id, MessageType msgType) : MessageStorage(id, msgType) { - LoggerD("Entered"); + ScopeLogger(); } MessageStorageShortMsg::~MessageStorageShortMsg() { - LoggerD("Entered"); + ScopeLogger(); } static gboolean addDraftMessageTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessageCallbackUserData* callback = static_cast(data); ShortMsgManager::getInstance().addDraftMessage(callback); @@ -45,7 +45,7 @@ static gboolean addDraftMessageTask(void* data) { } void MessageStorageShortMsg::addDraftMessage(MessageCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -61,7 +61,7 @@ void MessageStorageShortMsg::addDraftMessage(MessageCallbackUserData* callback) } static gboolean removeMessagesTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessagesCallbackUserData* callback = static_cast(data); ShortMsgManager::getInstance().removeMessages(callback); @@ -70,7 +70,7 @@ static gboolean removeMessagesTask(void* data) { } void MessageStorageShortMsg::removeMessages(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -88,7 +88,7 @@ void MessageStorageShortMsg::removeMessages(MessagesCallbackUserData* callback) } static gboolean updateMessagesTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); MessagesCallbackUserData* callback = static_cast(data); ShortMsgManager::getInstance().updateMessages(callback); @@ -97,7 +97,7 @@ static gboolean updateMessagesTask(void* data) { } void MessageStorageShortMsg::updateMessages(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -115,7 +115,7 @@ void MessageStorageShortMsg::updateMessages(MessagesCallbackUserData* callback) } static gboolean findMessagesTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); FindMsgCallbackUserData* callback = static_cast(data); ShortMsgManager::getInstance().findMessages(callback); @@ -124,7 +124,7 @@ static gboolean findMessagesTask(void* data) { } void MessageStorageShortMsg::findMessages(FindMsgCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -142,7 +142,7 @@ void MessageStorageShortMsg::findMessages(FindMsgCallbackUserData* callback) { } static gboolean findConversationsTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); ConversationCallbackData* callback = static_cast(data); ShortMsgManager::getInstance().findConversations(callback); @@ -151,7 +151,7 @@ static gboolean findConversationsTask(void* data) { } void MessageStorageShortMsg::findConversations(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -169,7 +169,7 @@ void MessageStorageShortMsg::findConversations(ConversationCallbackData* callbac } static gboolean removeConversationsTask(void* data) { - LoggerD("Entered"); + ScopeLogger(); ConversationCallbackData* callback = static_cast(data); ShortMsgManager::getInstance().removeConversations(callback); @@ -178,7 +178,7 @@ static gboolean removeConversationsTask(void* data) { } void MessageStorageShortMsg::removeConversations(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -196,7 +196,7 @@ void MessageStorageShortMsg::removeConversations(ConversationCallbackData* callb } static gboolean findFoldersCB(void* data) { - LoggerD("Entered"); + ScopeLogger(); FoldersCallbackData* callback = static_cast(data); @@ -218,7 +218,7 @@ static gboolean findFoldersCB(void* data) { } void MessageStorageShortMsg::findFolders(FoldersCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); return; diff --git a/src/messaging/messages_callback_user_data.cc b/src/messaging/messages_callback_user_data.cc index cb41f5d6..ef74d62e 100644 --- a/src/messaging/messages_callback_user_data.cc +++ b/src/messaging/messages_callback_user_data.cc @@ -22,15 +22,15 @@ namespace messaging { MessagesCallbackUserData::MessagesCallbackUserData(PostQueue& queue, long cid, bool keep /* = false*/) : CallbackUserData(queue, cid, keep), m_service_type(UNDEFINED) { - LoggerD("Entered"); + ScopeLogger(); } MessagesCallbackUserData::~MessagesCallbackUserData() { - LoggerD("Entered"); + ScopeLogger(); } void MessagesCallbackUserData::addMessage(std::shared_ptr msg) { - LoggerD("Entered"); + ScopeLogger(); m_messages.push_back(msg); } diff --git a/src/messaging/messages_change_callback.cc b/src/messaging/messages_change_callback.cc index 937f942c..d262a425 100644 --- a/src/messaging/messages_change_callback.cc +++ b/src/messaging/messages_change_callback.cc @@ -32,7 +32,7 @@ namespace messaging { namespace { std::string limitedString(const std::string& src, const size_t max_len = 40) { - LoggerD("Entered"); + ScopeLogger(); if (src.length() > max_len) { return src.substr(0, max_len); } else { @@ -52,19 +52,19 @@ MessagesChangeCallback::MessagesChangeCallback(long cid, int service_id, Message m_service_id(service_id), m_msg_type(service_type), m_is_act(true) { - LoggerD("Entered"); + ScopeLogger(); m_callback_data.SetListenerId("MessagesChangeListener"); } MessagesChangeCallback::~MessagesChangeCallback() { - LoggerD("Entered"); + ScopeLogger(); } MessagePtrVector MessagesChangeCallback::filterMessages(tizen::AbstractFilterPtr filter, const MessagePtrVector& source_messages, const int service_id) { - LoggerD("Entered sourceMessages.size():%d filter:%s", source_messages.size(), - (filter ? "PRESENT" : "NULL")); + ScopeLogger("sourceMessages.size() = %d filter %s", source_messages.size(), + (filter ? "PRESENT" : "NULL")); if (filter) { MessagePtrVector filtered_messages; @@ -104,7 +104,7 @@ MessagePtrVector MessagesChangeCallback::filterMessages(tizen::AbstractFilterPtr } void MessagesChangeCallback::added(const MessagePtrVector& msgs) { - LoggerD("Entered num messages: %d", msgs.size()); + ScopeLogger("event: msgs.size() = %d", msgs.size()); if (!m_is_act) { return; } @@ -130,7 +130,7 @@ void MessagesChangeCallback::added(const MessagePtrVector& msgs) { } void MessagesChangeCallback::updated(const MessagePtrVector& msgs) { - LoggerD("Entered num messages: %d", msgs.size()); + ScopeLogger("event: msgs.size() = %d", msgs.size()); if (!m_is_act) { return; } @@ -156,7 +156,7 @@ void MessagesChangeCallback::updated(const MessagePtrVector& msgs) { } void MessagesChangeCallback::removed(const MessagePtrVector& msgs) { - LoggerD("Enter event: msgs.size() = %d", msgs.size()); + ScopeLogger("event: msgs.size() = %d", msgs.size()); if (!m_is_act) { return; } diff --git a/src/messaging/messaging_database_manager.cc b/src/messaging/messaging_database_manager.cc index 7e57bc77..4e4edffc 100644 --- a/src/messaging/messaging_database_manager.cc +++ b/src/messaging/messaging_database_manager.cc @@ -41,18 +41,18 @@ namespace messaging { AttributeInfo::AttributeInfo() : sql_name(), sql_type(UNDEFINED_TYPE), any_type(PrimitiveType_NoType) { - LoggerD("Entered"); + ScopeLogger(); } AttributeInfo::AttributeInfo(const std::string& in_sql_name, const SQLAttributeType in_sql_type, const tizen::PrimitiveType in_any_type) : sql_name(in_sql_name), sql_type(in_sql_type), any_type(in_any_type) { - LoggerD("Entered"); + ScopeLogger(); } AttributeInfo::AttributeInfo(const AttributeInfo& other) : sql_name(other.sql_name), sql_type(other.sql_type), any_type(other.any_type) { - LoggerD("Entered"); + ScopeLogger(); } AttributeInfo& AttributeInfo::operator=(const AttributeInfo& other) { @@ -63,7 +63,7 @@ AttributeInfo& AttributeInfo::operator=(const AttributeInfo& other) { } MessagingDatabaseManager::MessagingDatabaseManager() { - LoggerD("Entered"); + ScopeLogger(); // Attributes map for short messages ========================================== m_msg_attr_map.insert( std::make_pair("id", AttributeInfo("A.MSG_ID", INTEGER, PrimitiveType_String))); @@ -171,11 +171,11 @@ MessagingDatabaseManager::MessagingDatabaseManager() { } MessagingDatabaseManager::~MessagingDatabaseManager() { - LoggerD("Entered"); + ScopeLogger(); } MessagingDatabaseManager& MessagingDatabaseManager::getInstance() { - LoggerD("Entered"); + ScopeLogger(); static MessagingDatabaseManager instance; return instance; } @@ -184,7 +184,7 @@ __thread sqlite3* sqlHandle = NULL; __thread sqlite3_stmt* stmt = NULL; msg_error_t MessagingDatabaseManager::connect() { - LoggerD("Entered"); + ScopeLogger(); if (NULL == sqlHandle) { char strDBName[64]; @@ -212,7 +212,7 @@ msg_error_t MessagingDatabaseManager::connect() { } msg_error_t MessagingDatabaseManager::disconnect() { - LoggerD("Entered"); + ScopeLogger(); msg_error_t err = 0; if (NULL != sqlHandle) { err = db_util_close(sqlHandle); @@ -231,7 +231,7 @@ msg_error_t MessagingDatabaseManager::disconnect() { msg_error_t MessagingDatabaseManager::getTable(std::string sqlQuery, char*** results, int* resultsCount) { - LoggerD("Entered"); + ScopeLogger(); msg_error_t err = 0; *resultsCount = 0; @@ -261,7 +261,7 @@ msg_error_t MessagingDatabaseManager::getTable(std::string sqlQuery, char*** res } void MessagingDatabaseManager::freeTable(char*** results) { - LoggerD("Entered"); + ScopeLogger(); if (*results) { sqlite3_free_table(*results); *results = NULL; @@ -269,7 +269,7 @@ void MessagingDatabaseManager::freeTable(char*** results) { } int MessagingDatabaseManager::cellToInt(char** array, int cellId) { - LoggerD("Entered"); + ScopeLogger(); if (NULL == array) { LoggerD("Array is NULL"); return 0; @@ -286,7 +286,7 @@ int MessagingDatabaseManager::cellToInt(char** array, int cellId) { std::string MessagingDatabaseManager::getMatchString(tizen::AnyPtr match_value, const PrimitiveType type) const { - LoggerD("Entered"); + ScopeLogger(); if (!match_value) { LoggerD("Warning: match value is NULL"); return std::string(); @@ -344,7 +344,7 @@ PlatformResult MessagingDatabaseManager::getAttributeFilterQuery(AbstractFilterP AttributeInfoMap& attribute_map, MessageType msgType, std::string* result) { - LoggerD("Entered"); + ScopeLogger(); std::ostringstream sqlQuery; AttributeFilterPtr attr_filter = castToAttributeFilter(filter); @@ -548,7 +548,7 @@ PlatformResult MessagingDatabaseManager::getAttributeFilterQuery(AbstractFilterP PlatformResult MessagingDatabaseManager::getAttributeRangeFilterQuery( AbstractFilterPtr filter, AttributeInfoMap& attribute_map, MessageType msg_type, std::string* result) { - LoggerD("Entered"); + ScopeLogger(); std::ostringstream sql_query, converter; std::string initial_value, end_value; @@ -576,7 +576,7 @@ PlatformResult MessagingDatabaseManager::getCompositeFilterQuery(AbstractFilterP AttributeInfoMap& attribute_map, MessageType msg_type, std::string* result) { - LoggerD("Entered"); + ScopeLogger(); std::ostringstream sql_query; CompositeFilterPtr comp_filter = castToCompositeFilter(filter); @@ -652,7 +652,7 @@ PlatformResult MessagingDatabaseManager::addFilters(AbstractFilterPtr filter, So long limit, long offset, AttributeInfoMap& attribute_map, MessageType msg_type, std::string* result) { - LoggerD("Entered"); + ScopeLogger(); std::ostringstream sql_query; // Service type query @@ -743,7 +743,7 @@ PlatformResult MessagingDatabaseManager::addFilters(AbstractFilterPtr filter, So PlatformResult MessagingDatabaseManager::findShortMessages(FindMsgCallbackUserData* callback, std::vector* result) { - LoggerD("Entered"); + ScopeLogger(); std::ostringstream sqlQuery; int attributesCount = 1; // It has to be set manually each time when the query is changed int cellId = attributesCount; @@ -795,7 +795,7 @@ PlatformResult MessagingDatabaseManager::findShortMessages(FindMsgCallbackUserDa PlatformResult MessagingDatabaseManager::findEmails(FindMsgCallbackUserData* callback, std::pair* result) { - LoggerD("Entered"); + ScopeLogger(); std::ostringstream sqlWhereClause; int resultsCount; email_mail_data_t* results; @@ -839,7 +839,7 @@ PlatformResult MessagingDatabaseManager::findEmails(FindMsgCallbackUserData* cal PlatformResult MessagingDatabaseManager::findShortMessageConversations( ConversationCallbackData* callback, std::vector* result) { - LoggerD("Entered"); + ScopeLogger(); std::ostringstream sqlQuery; int attributesCount = 1; // It has to be set manually each time when the query is changed int cellId = attributesCount; @@ -893,7 +893,7 @@ PlatformResult MessagingDatabaseManager::findShortMessageConversations( PlatformResult MessagingDatabaseManager::findEmailConversations( ConversationCallbackData* callback, std::vector* result) { - LoggerD("Entered"); + ScopeLogger(); std::ostringstream sqlWhereClause; int resultsCount; email_mail_data_t* results; diff --git a/src/messaging/messaging_extension.cc b/src/messaging/messaging_extension.cc index 066e5a6e..caefca7e 100644 --- a/src/messaging/messaging_extension.cc +++ b/src/messaging/messaging_extension.cc @@ -34,7 +34,7 @@ common::Extension* CreateExtension() { } MessagingExtension::MessagingExtension() { - LoggerD("Entered"); + ScopeLogger(); SetExtensionName(kMessaging); SetJavaScriptAPI(kSource_messaging_api); const char* entry_points[] = {kMessage, kMessageAttachment, NULL}; @@ -42,11 +42,11 @@ MessagingExtension::MessagingExtension() { } MessagingExtension::~MessagingExtension() { - LoggerD("Entered"); + ScopeLogger(); } common::Instance* MessagingExtension::CreateInstance() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = extension::messaging::EmailManager::InitializeEmailService(); if (ret.IsError()) { LoggerE("Initializing the email service failed (%s)", ret.message().c_str()); diff --git a/src/messaging/messaging_instance.cc b/src/messaging/messaging_instance.cc index fb0ceec9..1446c731 100644 --- a/src/messaging/messaging_instance.cc +++ b/src/messaging/messaging_instance.cc @@ -126,7 +126,7 @@ const long kDumbCallbackId = -1; } MessagingInstance::MessagingInstance() : manager_(*this), queue_(*this) { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&MessagingInstance::x, this, _1, _2)); @@ -158,7 +158,7 @@ MessagingInstance::MessagingInstance() : manager_(*this), queue_(*this) { } MessagingInstance::~MessagingInstance() { - LoggerD("Entered"); + ScopeLogger(); } #define POST_AND_RETURN(ret, json, obj) \ @@ -175,7 +175,7 @@ MessagingInstance::~MessagingInstance() { } void MessagingInstance::GetMessageServices(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -188,7 +188,7 @@ void MessagingInstance::GetMessageServices(const picojson::value& args, picojson void MessagingInstance::MessageServiceSendMessage(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -241,7 +241,7 @@ void MessagingInstance::MessageServiceSendMessage(const picojson::value& args, void MessagingInstance::MessageServiceLoadMessageBody(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -275,7 +275,7 @@ void MessagingInstance::MessageServiceLoadMessageBody(const picojson::value& arg void MessagingInstance::MessageServiceLoadMessageAttachment(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -299,7 +299,7 @@ void MessagingInstance::MessageServiceLoadMessageAttachment(const picojson::valu } void MessagingInstance::MessageServiceSync(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -340,7 +340,7 @@ void MessagingInstance::MessageServiceSync(const picojson::value& args, picojson void MessagingInstance::MessageServiceSyncFolder(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -382,7 +382,7 @@ void MessagingInstance::MessageServiceSyncFolder(const picojson::value& args, } void MessagingInstance::MessageServiceStopSync(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, STOP_SYNC_ARGS_OPID, out); picojson::object data = args.get(); @@ -418,7 +418,7 @@ void MessagingInstance::MessageServiceStopSync(const picojson::value& args, pico } void MessagingInstance::MessageStorageAddDraft(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -450,7 +450,7 @@ void MessagingInstance::MessageStorageAddDraft(const picojson::value& args, pico void MessagingInstance::MessageStorageFindMessages(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingRead, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -491,7 +491,7 @@ void MessagingInstance::MessageStorageFindMessages(const picojson::value& args, void MessagingInstance::MessageStorageRemoveMessages(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -520,7 +520,7 @@ void MessagingInstance::MessageStorageRemoveMessages(const picojson::value& args void MessagingInstance::MessageStorageUpdateMessages(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -548,7 +548,7 @@ void MessagingInstance::MessageStorageUpdateMessages(const picojson::value& args void MessagingInstance::MessageStorageFindConversations(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingRead, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -587,7 +587,7 @@ void MessagingInstance::MessageStorageFindConversations(const picojson::value& a void MessagingInstance::MessageStorageRemoveConversations(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingWrite, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -622,7 +622,7 @@ void MessagingInstance::MessageStorageRemoveConversations(const picojson::value& void MessagingInstance::MessageStorageFindFolders(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingRead, &out); CHECK_EXIST(args, JSON_CALLBACK_ID, out); @@ -650,7 +650,7 @@ void MessagingInstance::MessageStorageFindFolders(const picojson::value& args, void MessagingInstance::MessageStorageAddMessagesChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingRead, &out); @@ -680,7 +680,7 @@ void MessagingInstance::MessageStorageAddMessagesChangeListener(const picojson:: void MessagingInstance::MessageStorageAddConversationsChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingRead, &out); @@ -710,7 +710,7 @@ void MessagingInstance::MessageStorageAddConversationsChangeListener(const picoj void MessagingInstance::MessageStorageAddFolderChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingRead, &out); @@ -740,7 +740,7 @@ void MessagingInstance::MessageStorageAddFolderChangeListener(const picojson::va void MessagingInstance::MessageStorageRemoveChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeMessagingRead, &out); @@ -756,7 +756,7 @@ void MessagingInstance::MessageStorageRemoveChangeListener(const picojson::value void MessagingInstance::MessageGetMessageStatus(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::object data = args.get(); const int id = stoi(data.at("id").get()); diff --git a/src/messaging/messaging_manager.cc b/src/messaging/messaging_manager.cc index e6e9d3b9..3016ff94 100644 --- a/src/messaging/messaging_manager.cc +++ b/src/messaging/messaging_manager.cc @@ -52,11 +52,11 @@ MsgManagerCallbackData::MsgManagerCallbackData(MessagingInstance& instance) sms_service(nullptr), mms_service(nullptr), instance_(instance) { - LoggerD("Entered"); + ScopeLogger(); } MessagingManager::MessagingManager(MessagingInstance& instance) : instance_(instance) { - LoggerD("Entered"); + ScopeLogger(); int ret = msg_open_msg_handle(&m_msg_handle); if (ret != MSG_SUCCESS) { LoggerE("Cannot get message handle: %d", ret); @@ -69,7 +69,7 @@ MessagingManager::MessagingManager(MessagingInstance& instance) : instance_(inst } MessagingManager::~MessagingManager() { - LoggerD("Entered"); + ScopeLogger(); int ret = msg_close_msg_handle(&m_msg_handle); if (ret != MSG_SUCCESS) { LoggerW("Cannot close message handle: %d", ret); @@ -88,14 +88,14 @@ MessagingManager::~MessagingManager() { } static gboolean callbackCompleted(const std::shared_ptr& user_data) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr response = user_data->json; common::Instance::PostMessage(&user_data->instance_, response->serialize().c_str()); return false; } static void* getMsgServicesThread(const std::shared_ptr& user_data) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr response = user_data->json; picojson::object& obj = response->get(); @@ -233,7 +233,7 @@ static void* getMsgServicesThread(const std::shared_ptr& } void MessagingManager::getMessageServices(const std::string& type, double callbackId) { - LoggerD("Entered"); + ScopeLogger(); auto json = std::shared_ptr(new picojson::value(picojson::object())); picojson::object& obj = json->get(); @@ -251,6 +251,7 @@ void MessagingManager::getMessageServices(const std::string& type, double callba } MessageService* MessagingManager::getMessageService(const int id) { + ScopeLogger(); if (id == m_sms_service.first) { return m_sms_service.second; } else if (id == m_mms_service.first) { diff --git a/src/messaging/messaging_util.cc b/src/messaging/messaging_util.cc index 73f50f07..6385c433 100644 --- a/src/messaging/messaging_util.cc +++ b/src/messaging/messaging_util.cc @@ -148,7 +148,7 @@ const std::string FOLDER_TYPE_SENTBOX = "SENTBOX"; } // namespace std::string MessagingUtil::messageFolderTypeToString(MessageFolderType type) { - LoggerD("Entered"); + ScopeLogger(); switch (type) { case MessageFolderType::MESSAGE_FOLDER_TYPE_INBOX: return FOLDER_TYPE_INBOX; @@ -164,7 +164,7 @@ std::string MessagingUtil::messageFolderTypeToString(MessageFolderType type) { } MessageFolderType MessagingUtil::stringToMessageFolderType(std::string type) { - LoggerD("Entered"); + ScopeLogger(); if (FOLDER_TYPE_INBOX == type) { return MessageFolderType::MESSAGE_FOLDER_TYPE_INBOX; } @@ -181,7 +181,7 @@ MessageFolderType MessagingUtil::stringToMessageFolderType(std::string type) { } PlatformResult MessagingUtil::stringToMessageType(const std::string& str, MessageType* out) { - LoggerD("Entered"); + ScopeLogger(); const auto it = stringToTypeMap.find(str); if (it == stringToTypeMap.end()) { @@ -194,7 +194,7 @@ PlatformResult MessagingUtil::stringToMessageType(const std::string& str, Messag } common::PlatformResult MessagingUtil::messageTypeToString(MessageType type, std::string* out) { - LoggerD("Entered"); + ScopeLogger(); const auto it = typeToStringMap.find(type); if (it == typeToStringMap.end()) { @@ -207,7 +207,7 @@ common::PlatformResult MessagingUtil::messageTypeToString(MessageType type, std: } std::string MessagingUtil::messageTypeToString(MessageType type) { - LoggerD("Entered"); + ScopeLogger(); std::string type_str; PlatformResult platform_result = messageTypeToString(type, &type_str); Assert(platform_result); @@ -215,7 +215,7 @@ std::string MessagingUtil::messageTypeToString(MessageType type) { } std::string MessagingUtil::ltrim(const std::string& input) { - LoggerD("Entered"); + ScopeLogger(); std::string str = input; std::string::iterator i; for (i = str.begin(); i != str.end(); ++i) { @@ -232,7 +232,7 @@ std::string MessagingUtil::ltrim(const std::string& input) { } std::string MessagingUtil::extractSingleEmailAddress(const std::string& address) { - LoggerD("Entered"); + ScopeLogger(); std::size_t found_begin = address.rfind('<'); std::size_t found_end = address.rfind('>'); // if both '<' and '>' bracket found and '<' is before '>' @@ -248,7 +248,7 @@ std::string MessagingUtil::extractSingleEmailAddress(const std::string& address) std::vector MessagingUtil::extractEmailAddresses( const std::vector& addresses) { - LoggerD("Entered"); + ScopeLogger(); std::vector extractedAddresses; for (auto it = addresses.begin(); it != addresses.end(); ++it) { extractedAddresses.push_back(MessagingUtil::extractSingleEmailAddress(*it)); @@ -259,7 +259,7 @@ std::vector MessagingUtil::extractEmailAddresses( PlatformResult MessagingUtil::loadFileContentToString(const std::string& file_path, std::string* result) { - LoggerD("Entered"); + ScopeLogger(); std::ifstream input_file; input_file.open(file_path, std::ios::in); @@ -284,14 +284,14 @@ PlatformResult MessagingUtil::loadFileContentToString(const std::string& file_pa namespace { std::string GetFilename(const std::string& file_path) { - LoggerD("Entered"); + ScopeLogger(); const auto start = file_path.find_last_of("/\\"); const auto basename = file_path.substr(std::string::npos == start ? 0 : start + 1); return basename.substr(0, basename.find_last_of(".")); } std::string PerformConversion(const std::string& input, const gchar* from_charset) { - LoggerD("Entered"); + ScopeLogger(); GIConv cd = g_iconv_open("UTF-8//IGNORE", from_charset); @@ -405,7 +405,7 @@ std::string PerformConversion(const std::string& input, const gchar* from_charse std::string MessagingUtil::ConvertToUtf8(const std::string& file_path, const std::string& contents) { - LoggerD("Entered"); + ScopeLogger(); // in case of messages, encoding of the file contents is stored as its filename // is case of draft messages, it is not... @@ -465,7 +465,7 @@ std::string MessagingUtil::ConvertToUtf8(const std::string& file_path, } std::string MessagingUtil::messageStatusToString(MessageStatus status) { - LoggerD("Converting MessageStatus %d to string.", (int)status); + ScopeLogger("Converting MessageStatus %d to string.", (int)status); switch (status) { case STATUS_SENT: return SENT; @@ -485,7 +485,7 @@ std::string MessagingUtil::messageStatusToString(MessageStatus status) { } picojson::value MessagingUtil::messageBodyToJson(std::shared_ptr body) { - LoggerD("Entered"); + ScopeLogger(); picojson::object b; b[MESSAGE_BODY_ATTRIBUTE_MESSAGE_ID] = picojson::value(std::to_string(body->getMessageId())); b[MESSAGE_BODY_ATTRIBUTE_LOADED] = picojson::value(body->getLoaded()); @@ -508,7 +508,7 @@ picojson::value MessagingUtil::messageBodyToJson(std::shared_ptr bo } picojson::value MessagingUtil::messageToJson(std::shared_ptr message) { - LoggerD("Entered"); + ScopeLogger(); picojson::object o; std::vector array; @@ -589,7 +589,7 @@ picojson::value MessagingUtil::messageToJson(std::shared_ptr message) { picojson::value MessagingUtil::conversationToJson( std::shared_ptr conversation) { - LoggerD("Entered"); + ScopeLogger(); picojson::object o; o[MESSAGE_CONVERSATION_ATTRIBUTE_ID] = @@ -654,7 +654,7 @@ picojson::value MessagingUtil::conversationToJson( } picojson::value MessagingUtil::folderToJson(std::shared_ptr folder) { - LoggerD("Entered"); + ScopeLogger(); picojson::object o; @@ -675,7 +675,7 @@ picojson::value MessagingUtil::folderToJson(std::shared_ptr folde PlatformResult MessagingUtil::jsonToMessage(const picojson::value& json, std::shared_ptr* result_message) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr message; picojson::object data = json.get(); std::string type = data.at("type").get(); @@ -800,7 +800,7 @@ PlatformResult MessagingUtil::jsonToMessage(const picojson::value& json, } std::shared_ptr MessagingUtil::jsonToMessageBody(const picojson::value& json) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr body = std::shared_ptr(new MessageBody()); picojson::object data = json.get(); @@ -837,7 +837,7 @@ std::shared_ptr MessagingUtil::jsonToMessageBody(const picojson::va } std::shared_ptr MessagingUtil::jsonToMessageFolder(const picojson::value& json) { - LoggerD("Entered"); + ScopeLogger(); picojson::object data = json.get(); @@ -879,7 +879,7 @@ std::shared_ptr MessagingUtil::jsonToMessageFolder(const picojson } tizen::SortModePtr MessagingUtil::jsonToSortMode(const picojson::object& json) { - LoggerD("Entered"); + ScopeLogger(); using namespace tizen; const auto it = json.find(JSON_TO_SORT); @@ -897,7 +897,7 @@ tizen::SortModePtr MessagingUtil::jsonToSortMode(const picojson::object& json) { PlatformResult MessagingUtil::jsonToAbstractFilter(const picojson::object& json, tizen::AbstractFilterPtr* result) { - LoggerD("Entered"); + ScopeLogger(); const auto it = json.find(JSON_TO_FILTER); @@ -911,7 +911,7 @@ PlatformResult MessagingUtil::jsonToAbstractFilter(const picojson::object& json, PlatformResult MessagingUtil::jsonFilterToAbstractFilter(const picojson::object& filter, tizen::AbstractFilterPtr* result) { - LoggerD("Entered"); + ScopeLogger(); const auto& type = filter.at(JSON_FILTER_TYPE).get(); if (JSON_FILTER_ATTRIBUTE_TYPE == type) { @@ -930,7 +930,7 @@ PlatformResult MessagingUtil::jsonFilterToAbstractFilter(const picojson::object& PlatformResult MessagingUtil::jsonFilterToAttributeFilter(const picojson::object& filter, tizen::AbstractFilterPtr* result) { - LoggerD("Entered"); + ScopeLogger(); using namespace tizen; @@ -965,7 +965,7 @@ PlatformResult MessagingUtil::jsonFilterToAttributeFilter(const picojson::object PlatformResult MessagingUtil::jsonFilterToAttributeRangeFilter(const picojson::object& filter, tizen::AbstractFilterPtr* result) { - LoggerD("Entered"); + ScopeLogger(); auto name = getValueFromJSONObject(filter, JSON_TO_ATTRIBUTE_NAME); @@ -979,7 +979,7 @@ PlatformResult MessagingUtil::jsonFilterToAttributeRangeFilter(const picojson::o PlatformResult MessagingUtil::jsonFilterToCompositeFilter(const picojson::object& filter, tizen::AbstractFilterPtr* result) { - LoggerD("Entered"); + ScopeLogger(); using namespace tizen; @@ -1016,7 +1016,7 @@ PlatformResult MessagingUtil::jsonFilterToCompositeFilter(const picojson::object std::shared_ptr MessagingUtil::jsonToMessageAttachment( const picojson::value& json) { - LoggerD("Entered"); + ScopeLogger(); picojson::object data = json.get(); int attachmentId = @@ -1039,7 +1039,7 @@ std::shared_ptr MessagingUtil::jsonToMessageAttachment( picojson::value MessagingUtil::messageAttachmentToJson( std::shared_ptr attachment) { - LoggerD("Entered"); + ScopeLogger(); picojson::object o; o[MESSAGE_ATTACHMENT_ATTRIBUTE_ID] = attachment->isIdSet() @@ -1061,7 +1061,7 @@ picojson::value MessagingUtil::messageAttachmentToJson( PlatformResult MessagingUtil::jsonToMessageConversation( const picojson::value& json, std::shared_ptr* result_conversation) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr conversation; picojson::object data = json.get(); std::string type = data.at("type").get(); @@ -1138,16 +1138,16 @@ PlatformResult MessagingUtil::jsonToMessageConversation( } PostQueue::PostQueue(MessagingInstance& instance) : instance_(instance) { - LoggerD("Entered: [%p]", this); + ScopeLogger("this: [%p]", this); } PostQueue::~PostQueue() { - LoggerD("Entered: [%p]", this); + ScopeLogger("this: [%p]", this); EmailManager::getInstance().RemoveCallbacksByQueue(*this); } void PostQueue::addAndResolve(const long cid, PostPriority priority, const std::string& json) { - LoggerD("Entered"); + ScopeLogger(); std::shared_ptr t(new PostTask(priority)); t->attach(json); @@ -1161,7 +1161,7 @@ void PostQueue::addAndResolve(const long cid, PostPriority priority, const std:: } void PostQueue::add(const long cid, PostPriority priority) { - LoggerD("Entered"); + ScopeLogger(); tasks_mutex_.lock(); tasks_.push_back(std::make_pair(cid, std::shared_ptr(new PostTask(priority)))); @@ -1171,7 +1171,7 @@ void PostQueue::add(const long cid, PostPriority priority) { } void PostQueue::resolve(const long cid, const std::string& json) { - LoggerD("Entered: [%p]", this); + ScopeLogger("this: [%p]", this); tasks_mutex_.lock(); @@ -1193,7 +1193,7 @@ void PostQueue::resolve(const long cid, const std::string& json) { } void PostQueue::resolve(PostPriority p) { - LoggerD("Entered: [%p]", this); + ScopeLogger("this: [%p]", this); TasksCollection::iterator i; @@ -1234,21 +1234,21 @@ void PostQueue::resolve(PostPriority p) { } PostQueue::PostTask::PostTask() { - LoggerD("Entered"); + ScopeLogger(); priority_ = PostPriority::LOW; state_ = TaskState::NEW; } PostQueue::PostTask::PostTask(PostPriority p) { - LoggerD("Entered"); + ScopeLogger(); priority_ = p; state_ = TaskState::NEW; } PostQueue::PostTask::~PostTask() { - LoggerD("Entered"); + ScopeLogger(); } void PostQueue::PostTask::attach(const std::string& j) { - LoggerD("Entered"); + ScopeLogger(); if (TaskState::DONE == state_) { return; } @@ -1270,7 +1270,7 @@ std::string PostQueue::PostTask::json() { } void PostQueue::PostTask::resolve() { - LoggerD("Entered"); + ScopeLogger(); if (TaskState::READY == state_) { state_ = TaskState::DONE; } diff --git a/src/messaging/short_message_manager.cc b/src/messaging/short_message_manager.cc index 238d697d..8bc5468d 100644 --- a/src/messaging/short_message_manager.cc +++ b/src/messaging/short_message_manager.cc @@ -40,14 +40,14 @@ namespace extension { namespace messaging { ShortMsgManager& ShortMsgManager::getInstance() { - LoggerD("Entered"); + ScopeLogger(); static ShortMsgManager instance; return instance; } static gboolean sendMessageCompleteCB(void* data) { - LoggerD("Entered callback:%p", data); + ScopeLogger("callback:%p", data); MessageRecipientsCallbackData* callback = static_cast(data); if (!callback) { @@ -87,7 +87,7 @@ static gboolean sendMessageCompleteCB(void* data) { } static gboolean addDraftMessageCompleteCB(void* data) { - LoggerD("Enter"); + ScopeLogger(); auto callback = static_cast(data); if (!callback) { LoggerE("Callback is null"); @@ -116,7 +116,7 @@ static gboolean addDraftMessageCompleteCB(void* data) { } PlatformResult ShortMsgManager::addDraftMessagePlatform(std::shared_ptr message) { - LoggerD("Add new message(%p)", message.get()); + ScopeLogger("Add new message(%p)", message.get()); // Save platform msg to get ID msg_struct_t platform_msg = nullptr; @@ -191,7 +191,7 @@ PlatformResult ShortMsgManager::addDraftMessagePlatform(std::shared_ptr } PlatformResult ShortMsgManager::SendMessagePlatform(MessageRecipientsCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_mutex); PlatformResult platform_result(ErrorCode::NO_ERROR); @@ -320,7 +320,7 @@ PlatformResult ShortMsgManager::SendMessagePlatform(MessageRecipientsCallbackDat } PlatformResult ShortMsgManager::sendMessage(MessageRecipientsCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Callback is null"); @@ -345,7 +345,7 @@ PlatformResult ShortMsgManager::sendMessage(MessageRecipientsCallbackData* callb } void ShortMsgManager::sendStatusCallback(msg_struct_t sent_status) { - LoggerD("Entered"); + ScopeLogger(); int reqId = 0; int status = MSG_NETWORK_NOT_SEND; @@ -389,7 +389,7 @@ void ShortMsgManager::sendStatusCallback(msg_struct_t sent_status) { } static void sent_status_cb(msg_handle_t handle, msg_struct_t sent_status, void* data) { - LoggerD("Entered"); + ScopeLogger(); ShortMsgManager::getInstance().sendStatusCallback(sent_status); return; @@ -397,8 +397,8 @@ static void sent_status_cb(msg_handle_t handle, msg_struct_t sent_status, void* PlatformResult ShortMsgManager::callProperEventMessages( EventMessages* event, msg_storage_change_type_t storageChangeType) { - LoggerD( - "Entered event.items.size()=%d event.removed_conversations.size()=%d" + ScopeLogger( + "event.items.size()=%d event.removed_conversations.size()=%d" " sChangeType:%d", event->items.size(), event->removed_conversations.size(), storageChangeType); @@ -481,8 +481,7 @@ PlatformResult ShortMsgManager::callProperEventMessages( void ShortMsgManager::storage_change_cb(msg_handle_t handle, msg_storage_change_type_t storageChangeType, msg_id_list_s* pMsgIdList, void* data) { - LoggerD("Entered handle:%p sChangeType:%d numMsgs:%d", handle, storageChangeType, - pMsgIdList->nCount); + ScopeLogger("handle:%p sChangeType:%d numMsgs:%d", handle, storageChangeType, pMsgIdList->nCount); if (MSG_STORAGE_CHANGE_CONTACT == storageChangeType) { LoggerD("storageChangeType is MSG_STORAGE_CHANGE_CONTACT, ignoring"); @@ -651,7 +650,7 @@ void ShortMsgManager::storage_change_cb(msg_handle_t handle, } void ShortMsgManager::registerStatusCallback(msg_handle_t msg_handle) { - LoggerD("Entered"); + ScopeLogger(); m_msg_handle = msg_handle; // set message sent status callback if (MSG_SUCCESS != msg_reg_sent_status_callback(m_msg_handle, &sent_status_cb, NULL)) { @@ -663,7 +662,7 @@ void ShortMsgManager::registerStatusCallback(msg_handle_t msg_handle) { } void ShortMsgManager::addDraftMessage(MessageCallbackUserData* callback) { - LoggerD("Enter"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -689,7 +688,7 @@ void ShortMsgManager::addDraftMessage(MessageCallbackUserData* callback) { } void ShortMsgManager::removeMessages(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -754,7 +753,7 @@ void ShortMsgManager::removeMessages(MessagesCallbackUserData* callback) { } void ShortMsgManager::updateMessages(MessagesCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -829,7 +828,7 @@ void ShortMsgManager::updateMessages(MessagesCallbackUserData* callback) { } PlatformResult ShortMsgManager::getMessage(int msg_id, msg_struct_t* out_msg) { - LoggerD("Entered"); + ScopeLogger(); msg_struct_t sendOpt = msg_create_struct(MSG_STRUCT_SENDOPT); msg_struct_t msg = msg_create_struct(MSG_STRUCT_MESSAGE_INFO); @@ -849,7 +848,7 @@ PlatformResult ShortMsgManager::getMessage(int msg_id, msg_struct_t* out_msg) { PlatformResult ShortMsgManager::getConversationsForMessages( MessagePtrVector messages, msg_storage_change_type_t storageChangeType, ConversationPtrVector* result) { - LoggerD("Entered messages.size()=%d storageChangeType=%d", messages.size(), storageChangeType); + ScopeLogger("messages.size()=%d storageChangeType=%d", messages.size(), storageChangeType); std::unordered_set unique_conv_ids; ConversationPtrVector convs; @@ -879,7 +878,7 @@ PlatformResult ShortMsgManager::getConversationsForMessages( } void ShortMsgManager::findMessages(FindMsgCallbackUserData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -959,7 +958,7 @@ void ShortMsgManager::findMessages(FindMsgCallbackUserData* callback) { } void ShortMsgManager::findConversations(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -1015,7 +1014,7 @@ void ShortMsgManager::findConversations(ConversationCallbackData* callback) { } void ShortMsgManager::removeConversations(ConversationCallbackData* callback) { - LoggerD("Entered"); + ScopeLogger(); if (!callback) { LoggerE("Callback is null"); @@ -1133,11 +1132,11 @@ void ShortMsgManager::removeConversations(ConversationCallbackData* callback) { } ShortMsgManager::ShortMsgManager() : m_msg_handle(NULL) { - LoggerD("Entered"); + ScopeLogger(); } ShortMsgManager::~ShortMsgManager() { - LoggerD("Entered"); + ScopeLogger(); LoggerD("m_sms_removed_messages.size() = %d", m_sms_removed_messages.size()); LoggerD("m_mms_removed_messages.size() = %d", m_mms_removed_messages.size()); LoggerD("m_sms_removed_msg_id_conv_id_map.size() = %d", m_sms_removed_msg_id_conv_id_map.size()); @@ -1146,7 +1145,7 @@ ShortMsgManager::~ShortMsgManager() { LoggerD("m_mms_removed_conv_id_object_map.size() = %d", m_mms_removed_conv_id_object_map.size()); } std::string ShortMsgManager::getMessageStatus(int id) { - LoggerD("Entered"); + ScopeLogger(); msg_struct_t send_opt = nullptr; msg_struct_t msg = nullptr; diff --git a/src/networkbearerselection/networkbearerselection_instance.cc b/src/networkbearerselection/networkbearerselection_instance.cc index 65a89d20..ea339722 100644 --- a/src/networkbearerselection/networkbearerselection_instance.cc +++ b/src/networkbearerselection/networkbearerselection_instance.cc @@ -41,7 +41,7 @@ using namespace common; using namespace extension::networkbearerselection; NetworkBearerSelectionInstance::NetworkBearerSelectionInstance() { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -60,7 +60,7 @@ NetworkBearerSelectionInstance::NetworkBearerSelectionInstance() { } NetworkBearerSelectionInstance::~NetworkBearerSelectionInstance() { - LoggerD("Entered"); + ScopeLogger(); NetworkBearerSelectionManager::GetInstance()->RemoveListener(this); } @@ -72,7 +72,7 @@ NetworkBearerSelectionInstance::~NetworkBearerSelectionInstance() { void NetworkBearerSelectionInstance::NetworkBearerSelectionRequestRouteToHost( const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kNbsPrivileges, &out); @@ -90,7 +90,7 @@ void NetworkBearerSelectionInstance::NetworkBearerSelectionRequestRouteToHost( auto request = [=]() -> void { auto response = [this, domain_name, id](const common::PlatformResult result) -> void { - LoggerD("Entered"); + ScopeLogger(); picojson::value value{picojson::object{}}; picojson::object& obj = value.get(); @@ -116,7 +116,7 @@ void NetworkBearerSelectionInstance::NetworkBearerSelectionRequestRouteToHost( void NetworkBearerSelectionInstance::NetworkBearerSelectionReleaseRouteToHost( const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kNbsPrivileges, &out); @@ -136,7 +136,7 @@ void NetworkBearerSelectionInstance::NetworkBearerSelectionReleaseRouteToHost( auto release = [=]() -> void { auto response = [this, domain_name, id](const common::PlatformResult result) -> void { - LoggerD("Entered"); + ScopeLogger(); picojson::value value{picojson::object{}}; picojson::object& obj = value.get(); @@ -160,7 +160,7 @@ void NetworkBearerSelectionInstance::NetworkBearerSelectionReleaseRouteToHost( } void NetworkBearerSelectionInstance::onNBSEvent(const std::string& status) { - LoggerD("Entered"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); @@ -179,14 +179,14 @@ void NetworkBearerSelectionInstance::onNBSEvent(const std::string& status) { void NetworkBearerSelectionInstance::addDomainListener(const std::string& domain_name, int listener_id) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_listener_mutex_); listenerMap.insert(std::make_pair(domain_name, listener_id)); } void NetworkBearerSelectionInstance::removeDomainListener(const std::string& domain_name) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_listener_mutex_); listenerMap.erase(domain_name); diff --git a/src/networkbearerselection/networkbearerselection_manager.cc b/src/networkbearerselection/networkbearerselection_manager.cc index 37ecdc1b..b6206f46 100644 --- a/src/networkbearerselection/networkbearerselection_manager.cc +++ b/src/networkbearerselection/networkbearerselection_manager.cc @@ -39,25 +39,26 @@ struct NetworkBearerSelectionEvent { NetworkBearerSelectionEvent(const std::string& dm, const ReplyCallback& cb) : domain_name(dm), callback(cb) { + ScopeLogger(); } }; void NetworkBearerSelectionManager::AddListener(NetworkBearerSelectionInstance* listener) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_mutex_); m_listeners_.push_back(listener); } void NetworkBearerSelectionManager::RemoveListener(NetworkBearerSelectionInstance* listener) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_mutex_); m_listeners_.remove(listener); } NetworkBearerSelectionManager* NetworkBearerSelectionManager::GetInstance() { - LoggerD("Entered"); + ScopeLogger(); static NetworkBearerSelectionManager instance; return &instance; @@ -68,7 +69,7 @@ NetworkBearerSelectionManager::NetworkBearerSelectionManager() m_profile_handle_(nullptr), m_profile_name_(), m_is_connection_opened_(false) { - LoggerD("Entered"); + ScopeLogger(); int ret = connection_create(&m_connection_handle_); if (CONNECTION_ERROR_NONE == ret) { @@ -80,7 +81,7 @@ NetworkBearerSelectionManager::NetworkBearerSelectionManager() } NetworkBearerSelectionManager::~NetworkBearerSelectionManager() { - LoggerD("Entered"); + ScopeLogger(); for (auto it = m_domain_names_.begin(); it != m_domain_names_.end(); ++it) { if (!removeDomainRoute(it)) { @@ -98,7 +99,7 @@ NetworkBearerSelectionManager::~NetworkBearerSelectionManager() { void NetworkBearerSelectionManager::connection_state_changed_callback( connection_profile_state_e state, void* user_data) { - LoggerD("Entered [%d]", state); + ScopeLogger("state: %d", state); if (CONNECTION_PROFILE_STATE_CONNECTED == state) { NetworkBearerSelectionManager::GetInstance()->makeSuccessCallback(); @@ -109,7 +110,7 @@ void NetworkBearerSelectionManager::connection_state_changed_callback( void NetworkBearerSelectionManager::connection_opened_callback(connection_error_e result, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); NetworkBearerSelectionEvent* event = static_cast(user_data); if (!event) { LoggerE("Event not found"); @@ -135,7 +136,7 @@ void NetworkBearerSelectionManager::connection_opened_callback(connection_error_ void NetworkBearerSelectionManager::connection_closed_callback(connection_error_e result, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); NetworkBearerSelectionEvent* event = static_cast(user_data); if (!event) { LoggerE("Event not found"); @@ -160,7 +161,7 @@ void NetworkBearerSelectionManager::connection_closed_callback(connection_error_ } PlatformResult NetworkBearerSelectionManager::getCellularState() { - LoggerD("Entered"); + ScopeLogger(); connection_cellular_state_e state; @@ -180,14 +181,14 @@ PlatformResult NetworkBearerSelectionManager::getCellularState() { void NetworkBearerSelectionManager::callResultCallback(const ReplyCallback& reply, const PlatformResult result) { - LoggerD("Entered"); + ScopeLogger(); std::thread(reply, result).detach(); } void NetworkBearerSelectionManager::requestRouteToHost(const std::string& domain_name, const ReplyCallback& reply) { - LoggerD("Entered"); + ScopeLogger(); connection_profile_h profile_h = nullptr; char* current_profile_name_c = nullptr; @@ -259,7 +260,7 @@ void NetworkBearerSelectionManager::requestRouteToHost(const std::string& domain bool NetworkBearerSelectionManager::removeDomainRoute( const std::map::iterator& iter) { - LoggerD("Entered"); + ScopeLogger(); const char* domain_name = iter->first.c_str(); char* interface_name = nullptr; @@ -306,7 +307,7 @@ bool NetworkBearerSelectionManager::removeDomainRoute( void NetworkBearerSelectionManager::releaseRouteToHost(const std::string& domain_name, const ReplyCallback& reply) { - LoggerD("Entered"); + ScopeLogger(); if (!m_profile_handle_) { callResultCallback(reply, @@ -345,7 +346,7 @@ void NetworkBearerSelectionManager::releaseRouteToHost(const std::string& domain } bool NetworkBearerSelectionManager::registerStateChangeListener(const std::string& domain_name) { - LoggerD("Entered"); + ScopeLogger(); char* interface_name = nullptr; char* gateway = nullptr; @@ -435,7 +436,7 @@ bool NetworkBearerSelectionManager::registerStateChangeListener(const std::strin } bool NetworkBearerSelectionManager::deregisterStateChangeListener(const std::string& domain_name) { - LoggerD("Entered"); + ScopeLogger(); if (m_profile_handle_) { int ret = connection_profile_unset_state_changed_cb(m_profile_handle_); @@ -450,7 +451,7 @@ bool NetworkBearerSelectionManager::deregisterStateChangeListener(const std::str } void NetworkBearerSelectionManager::makeSuccessCallback() { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_mutex_); for (NetworkBearerSelectionInstance* listener : m_listeners_) { @@ -459,7 +460,7 @@ void NetworkBearerSelectionManager::makeSuccessCallback() { } void NetworkBearerSelectionManager::makeDisconnectCallback() { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(m_mutex_); for (NetworkBearerSelectionInstance* listener : m_listeners_) { @@ -468,7 +469,7 @@ void NetworkBearerSelectionManager::makeDisconnectCallback() { } void NetworkBearerSelectionManager::destroyProfileHandler() { - LoggerD("Entered"); + ScopeLogger(); if (m_profile_handle_) { if (CONNECTION_ERROR_NONE != connection_profile_destroy(m_profile_handle_)) { @@ -478,7 +479,7 @@ void NetworkBearerSelectionManager::destroyProfileHandler() { } ErrorCode NetworkBearerSelectionManager::GetNBSErrorCode(int error_code) { - LoggerD("Entered"); + ScopeLogger(); switch (error_code) { case CONNECTION_ERROR_NOT_SUPPORTED: @@ -489,7 +490,7 @@ ErrorCode NetworkBearerSelectionManager::GetNBSErrorCode(int error_code) { } bool NetworkBearerSelectionManager::createProfileHandler() { - LoggerD("Entered"); + ScopeLogger(); if (!m_connection_handle_) { LoggerE("Connection handle is not created"); diff --git a/src/nfc/aid_data.cc b/src/nfc/aid_data.cc index 239871f6..0acd2822 100644 --- a/src/nfc/aid_data.cc +++ b/src/nfc/aid_data.cc @@ -23,11 +23,11 @@ namespace nfc { AIDData::AIDData(std::string se_type, std::string aid, bool read_only) : se_type_(se_type), aid_(aid), read_only_(read_only) { - LoggerD("Entered"); + ScopeLogger(); } picojson::value AIDData::toJSON() const { - LoggerD("Entered"); + ScopeLogger(); picojson::value retval = picojson::value(picojson::object()); picojson::object& obj = retval.get(); diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc index 8c3b5cad..d29aa70f 100644 --- a/src/nfc/nfc_adapter.cc +++ b/src/nfc/nfc_adapter.cc @@ -54,7 +54,7 @@ const std::string HCE_EVENT_LISTENER = "HCEEventListener"; void HCEEventCallback(nfc_se_h handle, nfc_hce_event_type_e event_type, unsigned char* apdu, unsigned int apdu_len, void* /*user_data*/) { - LoggerD("Entered"); + ScopeLogger(); NFCAdapter::GetInstance()->SetSEHandle(handle); picojson::value response = picojson::value(picojson::object()); @@ -90,7 +90,7 @@ NFCAdapter::NFCAdapter() m_se_handle(nullptr), m_is_hce_listener_set(false), responder_(nullptr) { - LoggerD("Entered"); + ScopeLogger(); // NFC library initialization int ret = nfc_manager_initialize(); if (ret != NFC_ERROR_NONE) { @@ -99,7 +99,7 @@ NFCAdapter::NFCAdapter() } NFCAdapter::~NFCAdapter() { - LoggerD("Entered"); + ScopeLogger(); if (m_is_listener_set) { nfc_manager_unset_se_event_cb(); } @@ -130,12 +130,12 @@ NFCAdapter::~NFCAdapter() { } void NFCAdapter::SetResponder(IResponder* responder) { - LoggerD("Entered"); + ScopeLogger(); responder_ = responder; } void NFCAdapter::RespondAsync(const char* msg) { - LoggerD("Entered"); + ScopeLogger(); if (GetInstance()->responder_) { AssertMsg(GetInstance()->responder_, "Handler variable should be set"); GetInstance()->responder_->RespondAsync(msg); @@ -145,7 +145,7 @@ void NFCAdapter::RespondAsync(const char* msg) { } static picojson::value CreateEventError(double callbackId, const PlatformResult& ret) { - LoggerD("Entered"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); @@ -156,7 +156,7 @@ static picojson::value CreateEventError(double callbackId, const PlatformResult& } static picojson::value createEventSuccess(double callbackId) { - LoggerD("Entered"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); tools::ReportSuccess(obj); @@ -166,7 +166,7 @@ static picojson::value createEventSuccess(double callbackId) { } static gboolean setPoweredCompleteCB(void* user_data) { - LoggerD("Entered"); + ScopeLogger(); double* callbackId = static_cast(user_data); picojson::value event = createEventSuccess(*callbackId); NFCAdapter::GetInstance()->RespondAsync(event.serialize().c_str()); @@ -178,7 +178,7 @@ static gboolean setPoweredCompleteCB(void* user_data) { static void targetDetectedCallback(nfc_discovered_type_e type, nfc_p2p_target_h target, void* /*user_data*/) { - LoggerD("Entered"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); obj[JSON_LISTENER_ID] = picojson::value(PEER_LISTENER); @@ -203,20 +203,20 @@ static void targetDetectedCallback(nfc_discovered_type_e type, nfc_p2p_target_h } NFCAdapter* NFCAdapter::GetInstance() { - LoggerD("Entered"); + ScopeLogger(); static NFCAdapter instance; return &instance; } bool NFCAdapter::GetPowered() { - LoggerD("Entered"); + ScopeLogger(); return nfc_manager_is_activated(); } #ifndef APP_CONTROL_SETTINGS_SUPPORT static void NFCSetActivationCompletedCallback(nfc_error_e error, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); double* callbackId = static_cast(user_data); if (NFC_ERROR_NONE != error) { @@ -237,7 +237,7 @@ static void NFCSetActivationCompletedCallback(nfc_error_e error, void* user_data #endif static void se_event_callback(nfc_se_event_e se_event, void* /*user_data*/) { - LoggerD("Entered"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); tools::ReportSuccess(obj); @@ -265,7 +265,7 @@ static void se_event_callback(nfc_se_event_e se_event, void* /*user_data*/) { static void transaction_event_callback(nfc_se_type_e type, unsigned char* _aid, int aid_size, unsigned char* param, int param_size, void* /*user_data*/) { - LoggerD("Entered"); + ScopeLogger(); picojson::value response = picojson::value(picojson::object()); picojson::object& response_obj = response.get(); tools::ReportSuccess(response_obj); @@ -298,6 +298,7 @@ static void transaction_event_callback(nfc_se_type_e type, unsigned char* _aid, #ifdef APP_CONTROL_SETTINGS_SUPPORT static void PostMessage(double* callbackId) { + ScopeLogger(); LoggerE("Posting error message."); picojson::value event = CreateEventError(*callbackId, PlatformResult(ErrorCode::UNKNOWN_ERR, "SetPowered failed.")); @@ -308,7 +309,7 @@ static void PostMessage(double* callbackId) { #endif PlatformResult NFCAdapter::SetPowered(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); double* callbackId = new double(args.get(JSON_CALLBACK_ID).get()); bool powered = args.get("powered").get(); @@ -358,6 +359,8 @@ PlatformResult NFCAdapter::SetPowered(const picojson::value& args) { ret = app_control_send_launch_request( service, [](app_control_h request, app_control_h reply, app_control_result_e result, void* user_data) { + ScopeLogger( + "Entered into asynchronous function, app_control_send_launch_request's argument"); double* callbackId = static_cast(user_data); if (result != APP_CONTROL_RESULT_SUCCEEDED) { LoggerE("NFC enable app control failed : %d", result); @@ -403,7 +406,7 @@ PlatformResult NFCAdapter::SetPowered(const picojson::value& args) { } PlatformResult NFCAdapter::GetCardEmulationMode(std::string* mode) { - LoggerD("Entered"); + ScopeLogger(); nfc_se_card_emulation_mode_type_e card_mode; int ret = nfc_se_get_card_emulation_mode(&card_mode); @@ -417,7 +420,7 @@ PlatformResult NFCAdapter::GetCardEmulationMode(std::string* mode) { } PlatformResult NFCAdapter::SetCardEmulationMode(const std::string& mode) { - LoggerD("Entered"); + ScopeLogger(); nfc_se_card_emulation_mode_type_e new_mode; PlatformResult result = NFCUtil::ToCardEmulationMode(mode, &new_mode); @@ -462,7 +465,7 @@ PlatformResult NFCAdapter::SetCardEmulationMode(const std::string& mode) { } PlatformResult NFCAdapter::GetActiveSecureElement(std::string* type) { - LoggerD("Entered"); + ScopeLogger(); nfc_se_type_e se_type = NFC_SE_TYPE_DISABLE; int ret = nfc_manager_get_se_type(&se_type); @@ -475,7 +478,7 @@ PlatformResult NFCAdapter::GetActiveSecureElement(std::string* type) { } PlatformResult NFCAdapter::SetActiveSecureElement(std::string element) { - LoggerD("Entered"); + ScopeLogger(); // if given value is not correct secure element type then // there's no sense to get current value for comparison @@ -510,7 +513,7 @@ PlatformResult NFCAdapter::SetActiveSecureElement(std::string element) { } PlatformResult NFCAdapter::SetExclusiveModeForTransaction(bool exmode) { - LoggerD("Entered"); + ScopeLogger(); int ret = NFC_ERROR_NONE; if (exmode) { @@ -527,7 +530,7 @@ PlatformResult NFCAdapter::SetExclusiveModeForTransaction(bool exmode) { } PlatformResult NFCAdapter::AddCardEmulationModeChangeListener() { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_listener_set) { int ret = nfc_manager_set_se_event_cb(se_event_callback, nullptr); if (NFC_ERROR_NONE != ret) { @@ -541,7 +544,7 @@ PlatformResult NFCAdapter::AddCardEmulationModeChangeListener() { } PlatformResult NFCAdapter::RemoveCardEmulationModeChangeListener() { - LoggerD("Entered"); + ScopeLogger(); if (!nfc_manager_is_supported()) { return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported"); } @@ -554,7 +557,7 @@ PlatformResult NFCAdapter::RemoveCardEmulationModeChangeListener() { } PlatformResult NFCAdapter::AddTransactionEventListener(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); nfc_se_type_e se_type = NFC_SE_TYPE_DISABLE; PlatformResult result = NFCUtil::ToSecureElementType(args.get(JSON_TYPE).get(), &se_type); @@ -589,7 +592,7 @@ PlatformResult NFCAdapter::AddTransactionEventListener(const picojson::value& ar } PlatformResult NFCAdapter::RemoveTransactionEventListener(const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); nfc_se_type_e se_type = NFC_SE_TYPE_DISABLE; PlatformResult result = NFCUtil::ToSecureElementType(args.get(JSON_TYPE).get(), &se_type); @@ -613,7 +616,7 @@ PlatformResult NFCAdapter::RemoveTransactionEventListener(const picojson::value& } PlatformResult NFCAdapter::AddActiveSecureElementChangeListener() { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_listener_set) { int ret = nfc_manager_set_se_event_cb(se_event_callback, nullptr); if (NFC_ERROR_NONE != ret) { @@ -627,7 +630,7 @@ PlatformResult NFCAdapter::AddActiveSecureElementChangeListener() { } PlatformResult NFCAdapter::RemoveActiveSecureElementChangeListener() { - LoggerD("Entered"); + ScopeLogger(); if (!nfc_manager_is_supported()) { return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported"); } @@ -640,27 +643,27 @@ PlatformResult NFCAdapter::RemoveActiveSecureElementChangeListener() { } void NFCAdapter::SetPeerHandle(nfc_p2p_target_h handle) { - LoggerD("Entered"); + ScopeLogger(); m_peer_handle = handle; } nfc_p2p_target_h NFCAdapter::GetPeerHandle() { - LoggerD("Entered"); + ScopeLogger(); return m_peer_handle; } int NFCAdapter::GetPeerId() { - LoggerD("Entered"); + ScopeLogger(); return m_latest_peer_id; } void NFCAdapter::IncreasePeerId() { - LoggerD("Entered"); + ScopeLogger(); m_latest_peer_id++; } PlatformResult NFCAdapter::PeerIsConnectedGetter(int peer_id, bool* state) { - LoggerD("Entered"); + ScopeLogger(); if (m_latest_peer_id != peer_id || !m_peer_handle) { *state = false; return PlatformResult(ErrorCode::NO_ERROR); @@ -679,7 +682,7 @@ PlatformResult NFCAdapter::PeerIsConnectedGetter(int peer_id, bool* state) { } PlatformResult NFCAdapter::SetPeerListener() { - LoggerD("Entered"); + ScopeLogger(); if (!nfc_manager_is_supported()) { return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported"); } @@ -697,7 +700,7 @@ PlatformResult NFCAdapter::SetPeerListener() { } PlatformResult NFCAdapter::UnsetPeerListener() { - LoggerD("Entered"); + ScopeLogger(); if (!nfc_manager_is_supported()) { return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported"); } @@ -712,7 +715,7 @@ PlatformResult NFCAdapter::UnsetPeerListener() { static void targetReceivedCallback(nfc_p2p_target_h /*target*/, nfc_ndef_message_h message, void* /*data*/) { - LoggerD("Entered"); + ScopeLogger(); unsigned char* raw_data = NULL; unsigned int size; if (NFC_ERROR_NONE != nfc_ndef_message_get_rawdata(message, &raw_data, &size)) { @@ -734,7 +737,7 @@ static void targetReceivedCallback(nfc_p2p_target_h /*target*/, nfc_ndef_message } PlatformResult NFCAdapter::SetReceiveNDEFListener(int peer_id) { - LoggerD("Entered"); + ScopeLogger(); // unregister previous NDEF listener if (m_is_ndef_listener_set) { int ret = nfc_p2p_unset_data_received_cb(m_peer_handle); @@ -767,7 +770,7 @@ PlatformResult NFCAdapter::SetReceiveNDEFListener(int peer_id) { } PlatformResult NFCAdapter::UnsetReceiveNDEFListener(int peer_id) { - LoggerD("Entered"); + ScopeLogger(); if (m_is_ndef_listener_set) { // check if peer object is still connected @@ -794,13 +797,13 @@ PlatformResult NFCAdapter::UnsetReceiveNDEFListener(int peer_id) { } bool NFCAdapter::IsNDEFListenerSet() { - LoggerD("Entered"); + ScopeLogger(); return m_is_ndef_listener_set; } // NFCTag related functions PlatformResult NFCAdapter::TagTypeGetter(int /*tag_id*/, std::string* type) { - LoggerD("Entered"); + ScopeLogger(); nfc_tag_type_e nfc_type = NFC_UNKNOWN_TARGET; @@ -816,7 +819,7 @@ PlatformResult NFCAdapter::TagTypeGetter(int /*tag_id*/, std::string* type) { } PlatformResult NFCAdapter::TagIsSupportedNDEFGetter(int /*tag_id*/, bool* is_supported) { - LoggerD("Entered"); + ScopeLogger(); int err = nfc_tag_is_support_ndef(m_last_tag_handle, is_supported); if (NFC_ERROR_NONE != err) { @@ -828,7 +831,7 @@ PlatformResult NFCAdapter::TagIsSupportedNDEFGetter(int /*tag_id*/, bool* is_sup } PlatformResult NFCAdapter::TagNDEFSizeGetter(int /*tag_id*/, unsigned int* size) { - LoggerD("Entered"); + ScopeLogger(); int err = nfc_tag_get_ndef_size(m_last_tag_handle, size); if (NFC_ERROR_NONE != err) { @@ -840,7 +843,7 @@ PlatformResult NFCAdapter::TagNDEFSizeGetter(int /*tag_id*/, unsigned int* size) static bool tagPropertiesGetterCb(const char* key, const unsigned char* value, int value_size, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); if (user_data) { UCharVector tag_info = NFCUtil::ToVector(value, value_size); (static_cast(user_data))->push_back(std::make_pair(key, tag_info)); @@ -850,7 +853,7 @@ static bool tagPropertiesGetterCb(const char* key, const unsigned char* value, i } PlatformResult NFCAdapter::TagPropertiesGetter(int /*tag_id*/, NFCTagPropertiesT* properties) { - LoggerD("Entered"); + ScopeLogger(); int err = nfc_tag_foreach_information(m_last_tag_handle, tagPropertiesGetterCb, (void*)properties); @@ -863,7 +866,7 @@ PlatformResult NFCAdapter::TagPropertiesGetter(int /*tag_id*/, NFCTagPropertiesT } PlatformResult NFCAdapter::TagIsConnectedGetter(int tag_id, bool* state) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = PlatformResult(ErrorCode::NO_ERROR); @@ -895,12 +898,12 @@ PlatformResult NFCAdapter::TagIsConnectedGetter(int tag_id, bool* state) { } int NFCAdapter::GetNextTagId() { - LoggerD("Entered"); + ScopeLogger(); return ++m_latest_tag_id; } static void tagEventCallback(nfc_discovered_type_e type, nfc_tag_h tag, void* /*data*/) { - LoggerD("Entered"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); @@ -938,7 +941,7 @@ static void tagEventCallback(nfc_discovered_type_e type, nfc_tag_h tag, void* /* } PlatformResult NFCAdapter::SetTagListener() { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_tag_listener_set) { nfc_manager_set_tag_filter(NFC_TAG_FILTER_ALL_ENABLE); @@ -953,7 +956,7 @@ PlatformResult NFCAdapter::SetTagListener() { } void NFCAdapter::UnsetTagListener() { - LoggerD("Entered"); + ScopeLogger(); if (m_is_tag_listener_set) { nfc_manager_unset_tag_discovered_cb(); @@ -962,12 +965,12 @@ void NFCAdapter::UnsetTagListener() { } void NFCAdapter::SetTagHandle(nfc_tag_h tag) { - LoggerD("Entered"); + ScopeLogger(); m_last_tag_handle = tag; } static void tagReadNDEFCb(nfc_error_e result, nfc_ndef_message_h message, void* data) { - LoggerD("Entered"); + ScopeLogger(); if (!data) { // Can not continue if unable to get callbackId @@ -1016,7 +1019,7 @@ static void tagReadNDEFCb(nfc_error_e result, nfc_ndef_message_h message, void* } PlatformResult NFCAdapter::TagReadNDEF(int tag_id, const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); bool is_connected = false; PlatformResult result = TagIsConnectedGetter(tag_id, &is_connected); @@ -1062,7 +1065,7 @@ PlatformResult NFCAdapter::TagReadNDEF(int tag_id, const picojson::value& args) } PlatformResult NFCAdapter::TagWriteNDEF(int tag_id, const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); bool is_connected = false; PlatformResult result = TagIsConnectedGetter(tag_id, &is_connected); @@ -1129,7 +1132,7 @@ PlatformResult NFCAdapter::TagWriteNDEF(int tag_id, const picojson::value& args) } static void tagTransceiveCb(nfc_error_e err, unsigned char* buffer, int buffer_size, void* data) { - LoggerD("Entered"); + ScopeLogger(); std::unique_ptr buffer_ptr(buffer); buffer = nullptr; @@ -1164,7 +1167,7 @@ static void tagTransceiveCb(nfc_error_e err, unsigned char* buffer, int buffer_s } PlatformResult NFCAdapter::TagTransceive(int tag_id, const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); bool is_connected = false; PlatformResult result = TagIsConnectedGetter(tag_id, &is_connected); if (result.IsError()) { @@ -1221,7 +1224,7 @@ PlatformResult NFCAdapter::TagTransceive(int tag_id, const picojson::value& args } PlatformResult NFCAdapter::GetCachedMessage(picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); nfc_ndef_message_h message_handle = NULL; int result = nfc_manager_get_cached_message(&message_handle); if (NFC_ERROR_INVALID_NDEF_MESSAGE == result || NFC_ERROR_NO_NDEF_MESSAGE == result) { @@ -1254,7 +1257,7 @@ PlatformResult NFCAdapter::GetCachedMessage(picojson::object& out) { } static void peerSentCallback(nfc_error_e result, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); double* callbackId = static_cast(user_data); if (NFC_ERROR_NONE != result) { @@ -1274,13 +1277,13 @@ static void peerSentCallback(nfc_error_e result, void* user_data) { } static gboolean sendNDEFErrorCB(void* user_data) { - LoggerD("Entered"); + ScopeLogger(); peerSentCallback(NFC_ERROR_INVALID_NDEF_MESSAGE, user_data); return false; } PlatformResult NFCAdapter::sendNDEF(int peer_id, const picojson::value& args) { - LoggerD("Entered"); + ScopeLogger(); bool is_connected = false; PlatformResult result = PeerIsConnectedGetter(peer_id, &is_connected); if (result.IsError()) { @@ -1327,17 +1330,17 @@ PlatformResult NFCAdapter::sendNDEF(int peer_id, const picojson::value& args) { } void NFCAdapter::SetSEHandle(nfc_se_h handle) { - LoggerD("Entered"); + ScopeLogger(); m_se_handle = handle; } nfc_se_h NFCAdapter::GetSEHandle() { - LoggerD("Entered"); + ScopeLogger(); return m_se_handle; } PlatformResult NFCAdapter::AddHCEEventListener() { - LoggerD("Entered"); + ScopeLogger(); if (!m_is_hce_listener_set) { int ret = nfc_manager_set_hce_event_cb(HCEEventCallback, nullptr); if (NFC_ERROR_NONE != ret) { @@ -1350,7 +1353,7 @@ PlatformResult NFCAdapter::AddHCEEventListener() { } PlatformResult NFCAdapter::RemoveHCEEventListener() { - LoggerD("Entered"); + ScopeLogger(); if (m_is_hce_listener_set) { nfc_manager_unset_hce_event_cb(); m_is_hce_listener_set = false; @@ -1361,7 +1364,7 @@ PlatformResult NFCAdapter::RemoveHCEEventListener() { void NFCAdapter::SendHostAPDUResponse(const UCharVector& apdu, const std::function& success_cb, const std::function& error_cb) { - LoggerD("Entered"); + ScopeLogger(); if (!nfc_manager_is_supported()) { error_cb(LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "NFC Not Supported")); @@ -1380,8 +1383,8 @@ void NFCAdapter::SendHostAPDUResponse(const UCharVector& apdu, PlatformResult NFCAdapter::IsActivatedHandlerForAID(const std::string& type, const std::string& aid, bool* is_activated_handler) { + ScopeLogger(); AssertMsg(is_activated_handler, "Poiner can not be null!"); - LoggerD("Entered"); nfc_se_type_e se_type; PlatformResult result = NFCUtil::ToSecureElementType(type, &se_type); @@ -1401,7 +1404,7 @@ PlatformResult NFCAdapter::IsActivatedHandlerForAID(const std::string& type, con PlatformResult NFCAdapter::IsActivatedHandlerForCategory( const std::string& type, nfc_card_emulation_category_type_e category, bool* is_activated_handler) { - LoggerD("Entered"); + ScopeLogger(); AssertMsg(is_activated_handler, "Poiner can not be null!"); nfc_se_type_e se_type; @@ -1421,7 +1424,7 @@ PlatformResult NFCAdapter::IsActivatedHandlerForCategory( PlatformResult NFCAdapter::RegisterAID(const std::string& type, const std::string& aid, nfc_card_emulation_category_type_e category) { - LoggerD("Entered"); + ScopeLogger(); nfc_se_type_e se_type; PlatformResult result = NFCUtil::ToSecureElementType(type, &se_type); if (result.IsError()) { @@ -1439,7 +1442,7 @@ PlatformResult NFCAdapter::RegisterAID(const std::string& type, const std::strin PlatformResult NFCAdapter::UnregisterAID(const std::string& type, const std::string& aid, nfc_card_emulation_category_type_e category) { - LoggerD("Entered"); + ScopeLogger(); nfc_se_type_e se_type; PlatformResult result = NFCUtil::ToSecureElementType(type, &se_type); if (result.IsError()) { @@ -1456,7 +1459,7 @@ PlatformResult NFCAdapter::UnregisterAID(const std::string& type, const std::str } static void SaveRow(nfc_se_type_e se_type, const char* aid, bool read_only, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); AssertMsg(aid, "Poiner can not be null!"); AssertMsg(user_data, "Poiner can not be null!"); AIDDataVector* aids = static_cast(user_data); @@ -1468,7 +1471,7 @@ void NFCAdapter::GetAIDsForCategory(const std::string& type, nfc_card_emulation_category_type_e category, const std::function& success_cb, const std::function& error_cb) { - LoggerD("Entered"); + ScopeLogger(); nfc_se_type_e se_type; PlatformResult result = NFCUtil::ToSecureElementType(type, &se_type); if (result.IsError()) { diff --git a/src/nfc/nfc_extension.cc b/src/nfc/nfc_extension.cc index 4d0d0441..b778fed7 100644 --- a/src/nfc/nfc_extension.cc +++ b/src/nfc/nfc_extension.cc @@ -26,7 +26,7 @@ common::Extension* CreateExtension() { } NFCExtension::NFCExtension() { - LoggerD("Entered"); + ScopeLogger(); SetExtensionName("tizen.nfc"); SetJavaScriptAPI(kSource_nfc_api); @@ -37,10 +37,10 @@ NFCExtension::NFCExtension() { } NFCExtension::~NFCExtension() { - LoggerD("Entered"); + ScopeLogger(); } common::Instance* NFCExtension::CreateInstance() { - LoggerD("Entered"); + ScopeLogger(); return new extension::nfc::NFCInstance(); } diff --git a/src/nfc/nfc_instance.cc b/src/nfc/nfc_instance.cc index 337bcd61..70c5dcc4 100644 --- a/src/nfc/nfc_instance.cc +++ b/src/nfc/nfc_instance.cc @@ -47,12 +47,12 @@ const std::string kPrivilegeNfcTag = "http://tizen.org/privilege/nfc.tag"; } // namespace void NFCInstance::RespondAsync(const char* msg) { - LoggerD("Entered"); + ScopeLogger(); Instance::PostMessage(this, msg); } static bool isTagSupported() { - LoggerD("Entered"); + ScopeLogger(); bool supported = true; if (system_info_get_platform_bool("http://tizen.org/feature/network.nfc.tag", &supported) != SYSTEM_INFO_ERROR_NONE) { @@ -62,7 +62,7 @@ static bool isTagSupported() { } static bool isP2PSupported() { - LoggerD("Entered"); + ScopeLogger(); bool supported = true; if (system_info_get_platform_bool("http://tizen.org/feature/network.nfc.p2p", &supported) != SYSTEM_INFO_ERROR_NONE) { @@ -72,7 +72,7 @@ static bool isP2PSupported() { } NFCInstance::NFCInstance() { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&NFCInstance::x, this, _1, _2)); @@ -150,14 +150,14 @@ NFCInstance::NFCInstance() { } NFCInstance::~NFCInstance() { - LoggerD("Entered"); + ScopeLogger(); NFCAdapter::GetInstance()->SetResponder(nullptr); } void NFCInstance::GetDefaultAdapter(const picojson::value& args, picojson::object& out) { // Default NFC adapter is created at JS level // Here there's only check for NFC support - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCommon, &out); @@ -171,7 +171,7 @@ void NFCInstance::GetDefaultAdapter(const picojson::value& args, picojson::objec } void NFCInstance::SetExclusiveMode(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCommon, &out); CHECK_EXIST(args, "exclusiveMode", out); @@ -190,7 +190,7 @@ void NFCInstance::SetExclusiveMode(const picojson::value& args, picojson::object // TODO(g.rynkowski): Rewrite to asynchronous approach void NFCInstance::SetPowered(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: setPowered() is deprecated and will be removed from next release. Let " "the user turn NFC on/off " @@ -207,13 +207,13 @@ void NFCInstance::SetPowered(const picojson::value& args, picojson::object& out) } void NFCInstance::GetPowered(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); bool ret = NFCAdapter::GetInstance()->GetPowered(); ReportSuccess(picojson::value(ret), out); } void NFCInstance::CardEmulationModeSetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, "emulationMode", out); @@ -227,7 +227,7 @@ void NFCInstance::CardEmulationModeSetter(const picojson::value& args, picojson: } void NFCInstance::CardEmulationModeGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); std::string mode = ""; @@ -240,7 +240,7 @@ void NFCInstance::CardEmulationModeGetter(const picojson::value& args, picojson: } void NFCInstance::ActiveSecureElementSetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, "secureElement", out); @@ -254,7 +254,7 @@ void NFCInstance::ActiveSecureElementSetter(const picojson::value& args, picojso } void NFCInstance::ActiveSecureElementGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); std::string ase = ""; @@ -267,7 +267,7 @@ void NFCInstance::ActiveSecureElementGetter(const picojson::value& args, picojso } void NFCInstance::SetTagListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcTag, &out); bool supported = isTagSupported(); if (supported) { @@ -287,7 +287,7 @@ void NFCInstance::SetTagListener(const picojson::value& args, picojson::object& } void NFCInstance::PeerIsConnectedGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "id", out); int peer_id = (int)args.get("id").get(); @@ -302,7 +302,7 @@ void NFCInstance::PeerIsConnectedGetter(const picojson::value& args, picojson::o } void NFCInstance::SetPeerListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcP2P, &out); bool supported = isP2PSupported(); if (supported) { @@ -322,7 +322,7 @@ void NFCInstance::SetPeerListener(const picojson::value& args, picojson::object& } void NFCInstance::UnsetTagListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcTag, &out); bool supported = isTagSupported(); if (supported) { @@ -338,7 +338,7 @@ void NFCInstance::UnsetTagListener(const picojson::value& args, picojson::object } void NFCInstance::UnsetPeerListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcP2P, &out); bool supported = isP2PSupported(); if (supported) { @@ -359,7 +359,7 @@ void NFCInstance::UnsetPeerListener(const picojson::value& args, picojson::objec void NFCInstance::AddCardEmulationModeChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); PlatformResult result = NFCAdapter::GetInstance()->AddCardEmulationModeChangeListener(); @@ -372,7 +372,7 @@ void NFCInstance::AddCardEmulationModeChangeListener(const picojson::value& args void NFCInstance::RemoveCardEmulationModeChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); PlatformResult result = NFCAdapter::GetInstance()->RemoveCardEmulationModeChangeListener(); @@ -384,7 +384,7 @@ void NFCInstance::RemoveCardEmulationModeChangeListener(const picojson::value& a } void NFCInstance::AddTransactionEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); PlatformResult result = NFCAdapter::GetInstance()->AddTransactionEventListener(args); @@ -397,7 +397,7 @@ void NFCInstance::AddTransactionEventListener(const picojson::value& args, picoj void NFCInstance::RemoveTransactionEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); PlatformResult result = NFCAdapter::GetInstance()->RemoveTransactionEventListener(args); @@ -410,7 +410,7 @@ void NFCInstance::RemoveTransactionEventListener(const picojson::value& args, void NFCInstance::AddActiveSecureElementChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); PlatformResult result = NFCAdapter::GetInstance()->AddActiveSecureElementChangeListener(); @@ -423,7 +423,7 @@ void NFCInstance::AddActiveSecureElementChangeListener(const picojson::value& ar void NFCInstance::RemoveActiveSecureElementChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); PlatformResult result = NFCAdapter::GetInstance()->RemoveActiveSecureElementChangeListener(); @@ -435,7 +435,7 @@ void NFCInstance::RemoveActiveSecureElementChangeListener(const picojson::value& } void NFCInstance::GetCachedMessage(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCommon, &out); picojson::value result = picojson::value(picojson::object()); @@ -451,7 +451,7 @@ void NFCInstance::GetCachedMessage(const picojson::value& args, picojson::object void NFCInstance::SetExclusiveModeForTransaction(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, "transactionMode", out); @@ -468,7 +468,7 @@ void NFCInstance::SetExclusiveModeForTransaction(const picojson::value& args, // TODO(g.rynkowski): Rewrite to asynchronous approach void NFCInstance::ReadNDEF(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcTag, &out); CHECK_EXIST(args, "id", out); @@ -486,7 +486,7 @@ void NFCInstance::ReadNDEF(const picojson::value& args, picojson::object& out) { // TODO(g.rynkowski): Rewrite to asynchronous approach void NFCInstance::WriteNDEF(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcTag, &out); CHECK_EXIST(args, "id", out); @@ -504,7 +504,7 @@ void NFCInstance::WriteNDEF(const picojson::value& args, picojson::object& out) // TODO(g.rynkowski): Rewrite to asynchronous approach void NFCInstance::Transceive(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcTag, &out); CHECK_EXIST(args, "id", out); @@ -520,7 +520,7 @@ void NFCInstance::Transceive(const picojson::value& args, picojson::object& out) } void NFCInstance::SetReceiveNDEFListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcP2P, &out); CHECK_EXIST(args, "id", out); @@ -535,7 +535,7 @@ void NFCInstance::SetReceiveNDEFListener(const picojson::value& args, picojson:: } void NFCInstance::UnsetReceiveNDEFListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcP2P, &out); CHECK_EXIST(args, "id", out); @@ -551,7 +551,7 @@ void NFCInstance::UnsetReceiveNDEFListener(const picojson::value& args, picojson // TODO(g.rynkowski): Rewrite to asynchronous approach void NFCInstance::SendNDEF(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcP2P, &out); CHECK_EXIST(args, "id", out); @@ -569,7 +569,7 @@ void NFCInstance::SendNDEF(const picojson::value& args, picojson::object& out) { } void NFCInstance::ToByte(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -584,7 +584,7 @@ void NFCInstance::ToByte(const picojson::value& args, picojson::object& out) { // Message related methods void NFCInstance::NDEFMessageContructor(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); PlatformResult ret = NFCMessageUtils::ReportNDEFMessage(args, result_obj); @@ -597,7 +597,7 @@ void NFCInstance::NDEFMessageContructor(const picojson::value& args, picojson::o } void NFCInstance::NDEFRecordContructor(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); PlatformResult ret = NFCMessageUtils::ReportNDEFRecord(args, result_obj); @@ -610,7 +610,7 @@ void NFCInstance::NDEFRecordContructor(const picojson::value& args, picojson::ob } void NFCInstance::NDEFRecordTextContructor(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -624,7 +624,7 @@ void NFCInstance::NDEFRecordTextContructor(const picojson::value& args, picojson } void NFCInstance::NDEFRecordURIContructor(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); PlatformResult ret = NFCMessageUtils::ReportNDEFRecordURI(args, result_obj); @@ -637,7 +637,7 @@ void NFCInstance::NDEFRecordURIContructor(const picojson::value& args, picojson: } void NFCInstance::NDEFRecordMediaContructor(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -652,7 +652,7 @@ void NFCInstance::NDEFRecordMediaContructor(const picojson::value& args, picojso // NFCTag attributes getters void NFCInstance::TagTypeGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "id", out); int tag_id = (int)args.get("id").get(); @@ -686,7 +686,7 @@ void NFCInstance::TagTypeGetter(const picojson::value& args, picojson::object& o } void NFCInstance::TagIsSupportedNDEFGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); int tag_id = (int)args.get("id").get(); LoggerD("Tag id: %d", tag_id); @@ -718,7 +718,7 @@ void NFCInstance::TagIsSupportedNDEFGetter(const picojson::value& args, picojson } void NFCInstance::TagNDEFSizeGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); int tag_id = (int)args.get("id").get(); LoggerD("Tag id: %d", tag_id); @@ -751,7 +751,7 @@ void NFCInstance::TagNDEFSizeGetter(const picojson::value& args, picojson::objec } void NFCInstance::TagPropertiesGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); int tag_id = (int)args.get("id").get(); LoggerD("Tag id: %d", tag_id); @@ -800,7 +800,7 @@ void NFCInstance::TagPropertiesGetter(const picojson::value& args, picojson::obj } void NFCInstance::TagIsConnectedGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "id", out); int tag_id = (int)args.get("id").get(); @@ -817,7 +817,7 @@ void NFCInstance::TagIsConnectedGetter(const picojson::value& args, picojson::ob } void NFCInstance::AddHCEEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); PlatformResult result = NFCAdapter::GetInstance()->AddHCEEventListener(); @@ -829,7 +829,7 @@ void NFCInstance::AddHCEEventListener(const picojson::value& args, picojson::obj } void NFCInstance::RemoveHCEEventListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); PlatformResult result = NFCAdapter::GetInstance()->RemoveHCEEventListener(); @@ -841,7 +841,7 @@ void NFCInstance::RemoveHCEEventListener(const picojson::value& args, picojson:: } void NFCInstance::SendHostAPDUResponse(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, JSON_APDU, out); @@ -851,7 +851,7 @@ void NFCInstance::SendHostAPDUResponse(const picojson::value& args, picojson::ob const double& callback_id = args.get(JSON_CALLBACK_ID).get(); auto success_cb = [this, callback_id]() -> void { - LoggerD("Entered"); + ScopeLogger("Entered into asynchronous function, success_cb"); picojson::value response = picojson::value(picojson::object()); picojson::object& response_obj = response.get(); response_obj[JSON_CALLBACK_ID] = picojson::value(callback_id); @@ -860,7 +860,7 @@ void NFCInstance::SendHostAPDUResponse(const picojson::value& args, picojson::ob }; auto error_cb = [this, callback_id](const PlatformResult& error) -> void { - LoggerD("Entered error_cb: %s", error.message().c_str()); + ScopeLogger("Entered into asynchronous function, error_cb: %s", error.message().c_str()); picojson::value response = picojson::value(picojson::object()); picojson::object& response_obj = response.get(); response_obj[JSON_CALLBACK_ID] = picojson::value(callback_id); @@ -873,7 +873,7 @@ void NFCInstance::SendHostAPDUResponse(const picojson::value& args, picojson::ob } void NFCInstance::IsActivatedHandlerForAID(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, JSON_TYPE, out); @@ -893,7 +893,7 @@ void NFCInstance::IsActivatedHandlerForAID(const picojson::value& args, picojson void NFCInstance::IsActivatedHandlerForCategory(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, JSON_TYPE, out); @@ -913,7 +913,7 @@ void NFCInstance::IsActivatedHandlerForCategory(const picojson::value& args, } void NFCInstance::RegisterAID(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, JSON_TYPE, out); @@ -933,7 +933,7 @@ void NFCInstance::RegisterAID(const picojson::value& args, picojson::object& out } void NFCInstance::UnregisterAID(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, JSON_TYPE, out); @@ -953,7 +953,7 @@ void NFCInstance::UnregisterAID(const picojson::value& args, picojson::object& o } void NFCInstance::GetAIDsForCategory(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNfcCardEmulation, &out); CHECK_EXIST(args, JSON_TYPE, out); @@ -964,7 +964,7 @@ void NFCInstance::GetAIDsForCategory(const picojson::value& args, picojson::obje const double& callback_id = args.get(JSON_CALLBACK_ID).get(); auto success_cb = [this, callback_id](const AIDDataVector& data) -> void { - LoggerD("enter"); + ScopeLogger("Entered into asynchronous function, success_cb"); picojson::array aids; aids.reserve(data.size()); for (const auto& aid : data) { @@ -978,7 +978,7 @@ void NFCInstance::GetAIDsForCategory(const picojson::value& args, picojson::obje }; auto error_cb = [this, callback_id](const PlatformResult& error) -> void { - LoggerD("entered error_cb: %s", error.message().c_str()); + ScopeLogger("Entered into asynchronous function, error_cb: %s", error.message().c_str()); picojson::value response = picojson::value(picojson::object()); picojson::object& response_obj = response.get(); response_obj[JSON_CALLBACK_ID] = picojson::value(callback_id); diff --git a/src/nfc/nfc_message_utils.cc b/src/nfc/nfc_message_utils.cc index cc1d0769..4581c5e6 100644 --- a/src/nfc/nfc_message_utils.cc +++ b/src/nfc/nfc_message_utils.cc @@ -51,7 +51,7 @@ enum nfcTNF { /* -------------------------------COMMON FUNCTIONS------------------------------------ */ void NFCMessageUtils::RemoveMessageHandle(nfc_ndef_message_h message_handle) { - LoggerD("Entered"); + ScopeLogger(); if (message_handle) { int result = nfc_ndef_message_destroy(message_handle); if (NFC_ERROR_NONE != result) { @@ -63,7 +63,7 @@ void NFCMessageUtils::RemoveMessageHandle(nfc_ndef_message_h message_handle) { } static void removeRecordHandle(nfc_ndef_record_h record_handle) { - LoggerD("Entered"); + ScopeLogger(); if (record_handle) { int result = nfc_ndef_record_destroy(record_handle); if (NFC_ERROR_NONE != result) { @@ -76,7 +76,7 @@ static void removeRecordHandle(nfc_ndef_record_h record_handle) { static PlatformResult getTnfFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, short* tnf) { - LoggerD("Entered"); + ScopeLogger(); nfc_record_tnf_e record_tnf; int result = nfc_ndef_record_get_tnf(handle, &record_tnf); if (NFC_ERROR_NONE != result) { @@ -98,7 +98,7 @@ static PlatformResult getTnfFromHandle(nfc_ndef_record_h handle, nfc_ndef_messag static PlatformResult getTypeNameFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, UCharVector* type) { - LoggerD("Entered"); + ScopeLogger(); unsigned char* type_name; int type_size, result; @@ -120,7 +120,7 @@ static PlatformResult getTypeNameFromHandle(nfc_ndef_record_h handle, static PlatformResult getIdFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, UCharVector* id) { - LoggerD("Entered"); + ScopeLogger(); unsigned char* tmp_id; int id_size, result; @@ -144,7 +144,7 @@ static PlatformResult getIdFromHandle(nfc_ndef_record_h handle, nfc_ndef_message static PlatformResult getPayloadFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, UCharVector* payload) { - LoggerD("Entered"); + ScopeLogger(); unsigned char* tmp_payload; unsigned int payload_size; int result; @@ -168,7 +168,7 @@ static PlatformResult getPayloadFromHandle(nfc_ndef_record_h handle, } static nfc_encode_type_e convertToNfcEncodeUTF(const std::string& encode_string) { - LoggerD("Entered"); + ScopeLogger(); if (NFC_TEXT_UTF16 == encode_string) { return NFC_ENCODE_UTF_16; } else { @@ -177,7 +177,7 @@ static nfc_encode_type_e convertToNfcEncodeUTF(const std::string& encode_string) } static std::string convertEncodingToString(nfc_encode_type_e encoding) { - LoggerD("Entered"); + ScopeLogger(); if (encoding == NFC_ENCODE_UTF_16) { return NFC_TEXT_UTF16; } else { @@ -188,7 +188,7 @@ static std::string convertEncodingToString(nfc_encode_type_e encoding) { /* -------------------------------MESSAGE FUNCTIONS------------------------------------ */ PlatformResult NFCMessageUtils::ToNdefRecords(const nfc_ndef_message_h message, picojson::array& array) { - LoggerD("Entered"); + ScopeLogger(); if (NULL != message) { int count; int result = nfc_ndef_message_get_record_count(message, &count); @@ -266,7 +266,7 @@ PlatformResult NFCMessageUtils::ToNdefRecords(const nfc_ndef_message_h message, PlatformResult NFCMessageUtils::ReportNdefMessageFromData(unsigned char* data, unsigned long size, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); nfc_ndef_message_h message = NULL; int result = nfc_ndef_message_create_from_rawdata(&message, data, size); @@ -293,7 +293,7 @@ PlatformResult NFCMessageUtils::ReportNdefMessageFromData(unsigned char* data, u PlatformResult NFCMessageUtils::ReportNDEFMessage(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const picojson::array& raw_data = FromJson(args.get(), "rawData"); const int size = static_cast(args.get("rawDataSize").get()); @@ -309,7 +309,7 @@ PlatformResult NFCMessageUtils::ReportNDEFMessage(const picojson::value& args, static PlatformResult NdefRecordGetHandle(picojson::value& record, nfc_ndef_record_h* record_handle) { - LoggerD("Entered"); + ScopeLogger(); if (!record.is() || !record.contains("tnf") || !record.contains("type") || !record.contains("id") || !record.contains("payload")) { return LogAndCreateResult(ErrorCode::TYPE_MISMATCH_ERR, "Record is empty"); @@ -355,7 +355,7 @@ static PlatformResult NdefRecordGetHandle(picojson::value& record, PlatformResult NFCMessageUtils::NDEFMessageToStruct(const picojson::array& records_array, const int size, nfc_ndef_message_h* message) { - LoggerD("Entered"); + ScopeLogger(); if (!size) { LoggerE("No records in message"); return PlatformResult(ErrorCode::NO_ERROR); @@ -396,7 +396,7 @@ PlatformResult NFCMessageUtils::NDEFMessageToStruct(const picojson::array& recor PlatformResult NFCMessageUtils::NDEFMessageToByte(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); // input const picojson::array& records_array = FromJson(args.get(), "records"); @@ -447,7 +447,7 @@ PlatformResult NFCMessageUtils::NDEFMessageToByte(const picojson::value& args, /* -------------------------------RECORD FUNCTIONS------------------------------------ */ static void ConstructRecordJson(short _tnf, const UCharVector& _type_name, const UCharVector& _id, const UCharVector& _payload, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); out.insert(std::make_pair("tnf", picojson::value(std::to_string(_tnf)))); picojson::value type_array = picojson::value(picojson::array()); @@ -474,7 +474,7 @@ static void ConstructRecordJson(short _tnf, const UCharVector& _type_name, const PlatformResult NFCMessageUtils::ConstructNdefRecordFromRecordHandle(nfc_ndef_record_h record_handle, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); short _tnf; PlatformResult ret = getTnfFromHandle(record_handle, NULL, &_tnf); @@ -509,7 +509,7 @@ PlatformResult NFCMessageUtils::ConstructNdefRecordFromRecordHandle(nfc_ndef_rec PlatformResult NFCMessageUtils::ReportNdefRecordFromMessage(nfc_ndef_message_h message_handle, const int index, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); nfc_ndef_record_h record_handle = NULL; int result = nfc_ndef_message_get_record(message_handle, index, &record_handle); if (NFC_ERROR_NONE != result) { @@ -523,7 +523,7 @@ PlatformResult NFCMessageUtils::ReportNdefRecordFromMessage(nfc_ndef_message_h m PlatformResult NFCMessageUtils::ReportNDEFRecord(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const picojson::array& raw_data = FromJson(args.get(), "rawData"); const int size = static_cast(args.get("rawDataSize").get()); @@ -565,7 +565,7 @@ PlatformResult NFCMessageUtils::ReportNDEFRecord(const picojson::value& args, /* -------------------------------RECORD TEXT FUNCTIONS------------------------------------ */ static PlatformResult getTextFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, std::string* text) { - LoggerD("Entered"); + ScopeLogger(); char* tmp_text = NULL; int result = nfc_ndef_record_get_text(handle, &tmp_text); if (NFC_ERROR_NONE != result) { @@ -584,7 +584,7 @@ static PlatformResult getTextFromHandle(nfc_ndef_record_h handle, nfc_ndef_messa static PlatformResult getLanguageCodeFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, std::string* language) { - LoggerD("Entered"); + ScopeLogger(); char* language_code = NULL; int result = nfc_ndef_record_get_langcode(handle, &language_code); if (NFC_ERROR_NONE != result) { @@ -604,7 +604,7 @@ static PlatformResult getLanguageCodeFromHandle(nfc_ndef_record_h handle, static PlatformResult getEncodingFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, nfc_encode_type_e* encoding_type) { - LoggerD("Entered"); + ScopeLogger(); nfc_encode_type_e encoding; int result = nfc_ndef_record_get_encode_type(handle, &encoding); if (NFC_ERROR_NONE != result) { @@ -622,7 +622,7 @@ static PlatformResult ReportNDEFRecordTextFromText(const std::string& text, const std::string& language_code, const std::string& encoding_str, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); nfc_encode_type_e encoding = convertToNfcEncodeUTF(encoding_str); nfc_ndef_record_h handle = NULL; @@ -668,7 +668,7 @@ static PlatformResult ReportNDEFRecordTextFromText(const std::string& text, PlatformResult NFCMessageUtils::ReportNdefRecordTextFromMessage(nfc_ndef_message_h message_handle, const int index, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); nfc_ndef_record_h record_handle = NULL; // This function just return the pointer of record. int result = nfc_ndef_message_get_record(message_handle, index, &record_handle); @@ -714,7 +714,7 @@ PlatformResult NFCMessageUtils::ReportNdefRecordTextFromMessage(nfc_ndef_message PlatformResult NFCMessageUtils::ReportNDEFRecordText(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string& text = args.get("text").get(); const std::string& language_code = args.get("languageCode").get(); const std::string& encoding_str = args.get("encoding").get(); @@ -725,7 +725,7 @@ PlatformResult NFCMessageUtils::ReportNDEFRecordText(const picojson::value& args /* -------------------------------RECORD URI FUNCTIONS------------------------------------ */ static PlatformResult getURIFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, std::string* uri_handle) { - LoggerD("Entered"); + ScopeLogger(); char* uri = NULL; int result = nfc_ndef_record_get_uri(handle, &uri); if (NFC_ERROR_NONE != result || !uri) { @@ -742,7 +742,7 @@ static PlatformResult getURIFromHandle(nfc_ndef_record_h handle, nfc_ndef_messag } static PlatformResult ReportNDEFRecordURIFromURI(const std::string& uri, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); nfc_ndef_record_h handle = NULL; int result = nfc_ndef_record_create_uri(&handle, uri.c_str()); @@ -787,7 +787,7 @@ static PlatformResult ReportNDEFRecordURIFromURI(const std::string& uri, picojso PlatformResult NFCMessageUtils::ReportNdefRecordURIFromMessage(nfc_ndef_message_h message_handle, const int index, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); nfc_ndef_record_h record_handle = NULL; // This function just return the pointer of record. int result = nfc_ndef_message_get_record(message_handle, index, &record_handle); @@ -814,7 +814,7 @@ PlatformResult NFCMessageUtils::ReportNdefRecordURIFromMessage(nfc_ndef_message_ PlatformResult NFCMessageUtils::ReportNDEFRecordURI(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string& uri = args.get("uri").get(); return ReportNDEFRecordURIFromURI(uri, out); @@ -823,7 +823,7 @@ PlatformResult NFCMessageUtils::ReportNDEFRecordURI(const picojson::value& args, /* -------------------------------RECORD MEDIA FUNCTIONS------------------------------------ */ static PlatformResult getMimeTypeFromHandle(nfc_ndef_record_h handle, nfc_ndef_message_h message_handle, std::string* mime) { - LoggerD("Entered"); + ScopeLogger(); char* mime_type = NULL; int result = nfc_ndef_record_get_mime_type(handle, &mime_type); if (NFC_ERROR_NONE != result) { @@ -843,7 +843,7 @@ static PlatformResult getMimeTypeFromHandle(nfc_ndef_record_h handle, PlatformResult NFCMessageUtils::ReportNdefRecordMediaFromMessage(nfc_ndef_message_h message_handle, const int index, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); nfc_ndef_record_h record_handle = NULL; // This function just return the pointer of record. int result = nfc_ndef_message_get_record(message_handle, index, &record_handle); @@ -892,7 +892,7 @@ PlatformResult NFCMessageUtils::ReportNdefRecordMediaFromMessage(nfc_ndef_messag PlatformResult NFCMessageUtils::ReportNDEFRecordMedia(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string& mime_type = args.get("mimeType").get(); const picojson::array& raw_data = FromJson(args.get(), "data"); diff --git a/src/nfc/nfc_util.cc b/src/nfc/nfc_util.cc index 33f0990c..46be48be 100644 --- a/src/nfc/nfc_util.cc +++ b/src/nfc/nfc_util.cc @@ -27,13 +27,13 @@ namespace extension { namespace nfc { UCharVector NFCUtil::ToVector(const unsigned char* ch, const int size) { - LoggerD("Entered"); + ScopeLogger(); UCharVector vec(ch, ch + size / sizeof(char)); return vec; } PlatformResult NFCUtil::CodeToResult(const int errorCode, const std::string& message) { - LoggerD("Entered"); + ScopeLogger(); switch (errorCode) { case NFC_ERROR_INVALID_PARAMETER: case NFC_ERROR_INVALID_NDEF_MESSAGE: @@ -59,7 +59,7 @@ PlatformResult NFCUtil::CodeToResult(const int errorCode, const std::string& mes } std::string NFCUtil::getNFCErrorString(const int error_code) { - LoggerD("Error code : %d", error_code); + ScopeLogger("Error code : %d", error_code); switch (error_code) { case NFC_ERROR_ALREADY_ACTIVATED: case NFC_ERROR_ALREADY_DEACTIVATED: @@ -85,7 +85,7 @@ std::string NFCUtil::getNFCErrorString(const int error_code) { } const std::string NFCUtil::getNFCErrorMessage(const int error_code) { - LoggerD("Error code : %d", error_code); + ScopeLogger("Error code : %d", error_code); switch (error_code) { case NFC_ERROR_ALREADY_ACTIVATED: case NFC_ERROR_ALREADY_DEACTIVATED: @@ -126,7 +126,7 @@ const std::string NFCUtil::getNFCErrorMessage(const int error_code) { } std::string NFCUtil::ToStringNFCTag(nfc_tag_type_e tag_type) { - LoggerD("Entered"); + ScopeLogger(); switch (tag_type) { case NFC_GENERIC_PICC: return GENERIC_TARGET; @@ -165,7 +165,7 @@ std::string NFCUtil::ToStringNFCTag(nfc_tag_type_e tag_type) { } PlatformResult NFCUtil::ToNfcTagString(const std::string& type_string, nfc_tag_type_e* tag_type) { - LoggerD("Entered"); + ScopeLogger(); if (GENERIC_TARGET == type_string) { *tag_type = NFC_GENERIC_PICC; } else if (ISO14443_A == type_string) { @@ -206,7 +206,7 @@ PlatformResult NFCUtil::ToNfcTagString(const std::string& type_string, nfc_tag_t PlatformResult NFCUtil::ToStringCardEmulationMode(const nfc_se_card_emulation_mode_type_e card_mode, std::string* mode) { - LoggerD("Entered"); + ScopeLogger(); switch (card_mode) { case NFC_SE_CARD_EMULATION_MODE_OFF: *mode = OFF; @@ -223,7 +223,7 @@ PlatformResult NFCUtil::ToStringCardEmulationMode(const nfc_se_card_emulation_mo PlatformResult NFCUtil::ToCardEmulationMode(const std::string& mode_string, nfc_se_card_emulation_mode_type_e* mode) { - LoggerD("Entered"); + ScopeLogger(); if (mode_string == ALWAYS_ON) { *mode = NFC_SE_CARD_EMULATION_MODE_ON; } else if (mode_string == OFF) { @@ -236,7 +236,7 @@ PlatformResult NFCUtil::ToCardEmulationMode(const std::string& mode_string, } PlatformResult NFCUtil::ToStringSecureElementType(const nfc_se_type_e se_type, std::string* type) { - LoggerD("Entered"); + ScopeLogger(); switch (se_type) { case NFC_SE_TYPE_ESE: *type = DATA_NFC_SE_TYPE_ESE; @@ -255,7 +255,7 @@ PlatformResult NFCUtil::ToStringSecureElementType(const nfc_se_type_e se_type, s } PlatformResult NFCUtil::ToSecureElementType(const std::string& type_string, nfc_se_type_e* type) { - LoggerD("Entered"); + ScopeLogger(); if (type_string == DATA_NFC_SE_TYPE_ESE) { *type = NFC_SE_TYPE_ESE; } else if (type_string == DATA_NFC_SE_TYPE_UICC) { @@ -270,7 +270,7 @@ PlatformResult NFCUtil::ToSecureElementType(const std::string& type_string, nfc_ } void NFCUtil::setDefaultFilterValues(std::vector& filter) { - LoggerD("Entered"); + ScopeLogger(); filter.push_back(NFC_GENERIC_PICC); filter.push_back(NFC_ISO14443_A_PICC); filter.push_back(NFC_ISO14443_3A_PICC); @@ -291,7 +291,7 @@ void NFCUtil::setDefaultFilterValues(std::vector& filter) { // Convertion of enum to HCEEventType(characters sequence). const char* NFCUtil::ToStr(nfc_hce_event_type_e event_type) { - LoggerD("Entered"); + ScopeLogger(); switch (event_type) { case NFC_HCE_EVENT_DEACTIVATED: return "DEACTIVATED"; @@ -307,7 +307,7 @@ const char* NFCUtil::ToStr(nfc_hce_event_type_e event_type) { // Convertion of enum to SecureElementType(characters sequence). // Warning! DISABLE and SDCARD are not mentioned at widl spec. const char* NFCUtil::ToStr(nfc_se_type_e se_type) { - LoggerD("Entered"); + ScopeLogger(); switch (se_type) { case NFC_SE_TYPE_DISABLE: return "DISABLE"; @@ -326,14 +326,14 @@ const char* NFCUtil::ToStr(nfc_se_type_e se_type) { // Convertion CardEmulationCategoryType(characters sequence) to enum. nfc_card_emulation_category_type_e NFCUtil::StringToCategory(const std::string& category_type) { - LoggerD("Entered"); + ScopeLogger(); if (category_type == "PAYMENT") return NFC_CARD_EMULATION_CATEGORY_PAYMENT; if (category_type == "OTHER") return NFC_CARD_EMULATION_CATEGORY_OTHER; AssertMsg(false, "That category type is incorrect."); } unsigned char* NFCUtil::DoubleArrayToUCharArray(const picojson::array& array_in) { - LoggerD("Entered"); + ScopeLogger(); unsigned char* result_array = new unsigned char[array_in.size()]; for (std::size_t i = 0; i < array_in.size(); ++i) { result_array[i] = static_cast(array_in.at(i).get()); @@ -342,12 +342,12 @@ unsigned char* NFCUtil::DoubleArrayToUCharArray(const picojson::array& array_in) } UCharVector NFCUtil::DoubleArrayToUCharVector(const picojson::array& array_in) { - LoggerD("Entered"); + ScopeLogger(); return ToVector(NFCUtil::DoubleArrayToUCharArray(array_in), array_in.size()); } picojson::array NFCUtil::FromUCharArray(unsigned char* array, unsigned int apdu_len) { - LoggerD("Entered"); + ScopeLogger(); picojson::array apdu_array; apdu_array.reserve(apdu_len); for (unsigned int i = 0; i < apdu_len; ++i) diff --git a/src/notification/notification_instance.cc b/src/notification/notification_instance.cc index 8e8e3566..a75aafa5 100644 --- a/src/notification/notification_instance.cc +++ b/src/notification/notification_instance.cc @@ -37,7 +37,7 @@ const std::string kPrivilegeLED = "http://tizen.org/privilege/led"; using namespace common; NotificationInstance::NotificationInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; #define REGISTER_SYNC(c, x) \ @@ -56,7 +56,7 @@ NotificationInstance::NotificationInstance() { } NotificationInstance::~NotificationInstance() { - LoggerD("Enter"); + ScopeLogger(); } #define CHECK_EXIST(args, name, out) \ @@ -67,9 +67,9 @@ NotificationInstance::~NotificationInstance() { void NotificationInstance::NotificationManagerPost(const picojson::value& args, picojson::object& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); - LoggerD("Enter"); picojson::value val{picojson::object{}}; PlatformResult status = manager_->Post(args.get(), val.get()); @@ -82,9 +82,9 @@ void NotificationInstance::NotificationManagerPost(const picojson::value& args, void NotificationInstance::NotificationManagerUpdate(const picojson::value& args, picojson::object& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); - LoggerD("Enter"); PlatformResult status = manager_->Update(args.get()); if (status.IsSuccess()) { @@ -96,9 +96,9 @@ void NotificationInstance::NotificationManagerUpdate(const picojson::value& args void NotificationInstance::NotificationManagerRemove(const picojson::value& args, picojson::object& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); - LoggerD("Enter"); PlatformResult status = manager_->Remove(args.get()); if (status.IsSuccess()) { @@ -110,9 +110,9 @@ void NotificationInstance::NotificationManagerRemove(const picojson::value& args void NotificationInstance::NotificationManagerRemoveAll(const picojson::value& args, picojson::object& out) { + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeNotification, &out); - LoggerD("Enter"); PlatformResult status = manager_->RemoveAll(); if (status.IsSuccess()) { @@ -124,7 +124,7 @@ void NotificationInstance::NotificationManagerRemoveAll(const picojson::value& a void NotificationInstance::NotificationManagerGet(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); picojson::value val{picojson::object{}}; PlatformResult status = manager_->Get(args.get(), val.get()); @@ -138,7 +138,7 @@ void NotificationInstance::NotificationManagerGet(const picojson::value& args, void NotificationInstance::NotificationManagerGetAll(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); picojson::value val{picojson::array{}}; PlatformResult status = manager_->GetAll(val.get()); @@ -152,7 +152,7 @@ void NotificationInstance::NotificationManagerGetAll(const picojson::value& args void NotificationInstance::NotificationManagerPlayLEDCustomEffect(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeLED, &out); PlatformResult status = manager_->PlayLEDCustomEffect(args.get()); @@ -166,7 +166,7 @@ void NotificationInstance::NotificationManagerPlayLEDCustomEffect(const picojson void NotificationInstance::NotificationManagerStopLEDCustomEffect(const picojson::value& /*args*/, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeLED, &out); PlatformResult status = manager_->StopLEDCustomEffect(); diff --git a/src/notification/notification_manager.cc b/src/notification/notification_manager.cc index 8af92a81..47cedad2 100644 --- a/src/notification/notification_manager.cc +++ b/src/notification/notification_manager.cc @@ -36,31 +36,31 @@ namespace notification { using namespace common; NotificationManager::NotificationManager() { - LoggerD("Enter"); + ScopeLogger(); } NotificationManager::~NotificationManager() { - LoggerD("Enter"); + ScopeLogger(); } NotificationManager* NotificationManager::GetInstance() { - LoggerD("Enter"); + ScopeLogger(); static NotificationManager instance; return &instance; } PlatformResult NotificationManager::Post(const picojson::object& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); return StatusNotification::FromJson(args, false, &out); } PlatformResult NotificationManager::Update(const picojson::object& args) { - LoggerD("Enter"); + ScopeLogger(); return StatusNotification::FromJson(args, true, NULL); } PlatformResult NotificationManager::Remove(const picojson::object& args) { - LoggerD("Enter"); + ScopeLogger(); int id = std::stoi(FromJson(args, "id")); int ret = notification_delete_by_priv_id(NULL, NOTIFICATION_TYPE_NONE, id); @@ -73,7 +73,7 @@ PlatformResult NotificationManager::Remove(const picojson::object& args) { } PlatformResult NotificationManager::RemoveAll() { - LoggerD("Enter"); + ScopeLogger(); int ret = notification_delete_all(NOTIFICATION_TYPE_NOTI); if (ret != NOTIFICATION_ERROR_NONE) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Notification noti remove all failed", @@ -90,7 +90,7 @@ PlatformResult NotificationManager::RemoveAll() { } PlatformResult NotificationManager::Get(const picojson::object& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); int id; try { id = std::stoi(FromJson(args, "id")); @@ -129,7 +129,7 @@ PlatformResult NotificationManager::Get(const picojson::object& args, picojson:: } PlatformResult NotificationManager::GetAll(picojson::array& out) { - LoggerD("Enter"); + ScopeLogger(); notification_h noti = nullptr; notification_list_h noti_list = nullptr; notification_list_h noti_list_iter = nullptr; @@ -192,7 +192,7 @@ PlatformResult NotificationManager::GetAll(picojson::array& out) { } PlatformResult NotificationManager::PlayLEDCustomEffect(const picojson::object& args) { - LoggerD("Enter"); + ScopeLogger(); int timeOn = FromJson(args, "timeOn"); int timeOff = FromJson(args, "timeOff"); @@ -219,7 +219,7 @@ PlatformResult NotificationManager::PlayLEDCustomEffect(const picojson::object& } PlatformResult NotificationManager::StopLEDCustomEffect() { - LoggerD("Enter"); + ScopeLogger(); int ret = device_led_stop_custom(); if (ret != DEVICE_ERROR_NONE) { diff --git a/src/notification/status_notification.cc b/src/notification/status_notification.cc index 3fd34969..d0182550 100644 --- a/src/notification/status_notification.cc +++ b/src/notification/status_notification.cc @@ -48,13 +48,15 @@ const ImageEnumMap StatusNotification::thumbnails_map_ = {{0, NOTIFICATION_IMAGE {3, NOTIFICATION_IMAGE_TYPE_LIST_4}}; StatusNotification::StatusNotification() { + ScopeLogger(); } StatusNotification::~StatusNotification() { + ScopeLogger(); } bool StatusNotification::IsColorFormatNumberic(const std::string& color) { - LoggerD("Enter"); + ScopeLogger(); std::string hexCode = "0123456789abcdef"; if (color.length() != 7 || '#' != color[0]) { return false; @@ -71,7 +73,7 @@ bool StatusNotification::IsColorFormatNumberic(const std::string& color) { PlatformResult StatusNotification::SetLayout(notification_h noti_handle, const std::string& noti_type) { - LoggerD("Enter"); + ScopeLogger(); notification_ly_type_e noti_layout = NOTIFICATION_LY_NONE; if (noti_type == "SIMPLE") { @@ -103,7 +105,7 @@ PlatformResult StatusNotification::SetLayout(notification_h noti_handle, } static bool ServiceExtraDataCb(app_control_h service, const char* key, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); if (nullptr == user_data || nullptr == key) { LoggerE("User data or key not exist"); return true; @@ -144,7 +146,7 @@ static bool ServiceExtraDataCb(app_control_h service, const char* key, void* use PlatformResult StatusNotification::Create(notification_type_e noti_type, notification_h* noti_handle) { - LoggerD("Enter"); + ScopeLogger(); *noti_handle = notification_create(noti_type); if (!*noti_handle) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Cannot make new notification object"); @@ -166,7 +168,7 @@ PlatformResult StatusNotification::Create(notification_type_e noti_type, PlatformResult StatusNotification::StatusTypeFromPlatform(notification_type_e noti_type, notification_ly_type_e noti_layout, std::string* type) { - LoggerD("Enter"); + ScopeLogger(); if (noti_type == NOTIFICATION_TYPE_NOTI) { if (noti_layout == NOTIFICATION_LY_NOTI_EVENT_SINGLE || noti_layout == NOTIFICATION_LY_NOTI_EVENT_MULTIPLE) { @@ -189,7 +191,7 @@ PlatformResult StatusNotification::StatusTypeFromPlatform(notification_type_e no PlatformResult StatusNotification::StatusTypeToPlatform(const std::string& type, notification_type_e* noti_type) { - LoggerD("Enter"); + ScopeLogger(); if (type == "SIMPLE" || type == "THUMBNAIL") { *noti_type = NOTIFICATION_TYPE_NOTI; } else if (type == "ONGOING" || type == "PROGRESS") { @@ -205,7 +207,7 @@ PlatformResult StatusNotification::StatusTypeToPlatform(const std::string& type, PlatformResult StatusNotification::GetImage(notification_h noti_handle, notification_image_type_e image_type, std::string* image_path) { - LoggerD("Enter"); + ScopeLogger(); char* path = NULL; *image_path = ""; @@ -224,7 +226,7 @@ PlatformResult StatusNotification::GetImage(notification_h noti_handle, PlatformResult StatusNotification::SetImage(notification_h noti_handle, notification_image_type_e image_type, const std::string& image_path) { - LoggerD("Enter"); + ScopeLogger(); int ret = notification_set_image(noti_handle, image_type, image_path.c_str()); if (ret != NOTIFICATION_ERROR_NONE) { return LogAndCreateResult( @@ -238,7 +240,7 @@ PlatformResult StatusNotification::SetImage(notification_h noti_handle, PlatformResult StatusNotification::GetText(notification_h noti_handle, notification_text_type_e text_type, std::string* noti_text) { - LoggerD("Enter"); + ScopeLogger(); char* text = NULL; *noti_text = ""; @@ -256,7 +258,7 @@ PlatformResult StatusNotification::GetText(notification_h noti_handle, PlatformResult StatusNotification::SetText(notification_h noti_handle, notification_text_type_e text_type, const std::string& noti_text) { - LoggerD("Enter"); + ScopeLogger(); int ret = notification_set_text(noti_handle, text_type, noti_text.c_str(), NULL, NOTIFICATION_VARIABLE_TYPE_NONE); if (ret != NOTIFICATION_ERROR_NONE) { @@ -270,7 +272,7 @@ PlatformResult StatusNotification::SetText(notification_h noti_handle, PlatformResult StatusNotification::GetNumber(notification_h noti_handle, notification_text_type_e text_type, long* number) { - LoggerD("Enter"); + ScopeLogger(); std::string text; PlatformResult status = GetText(noti_handle, text_type, &text); if (status.IsError()) return status; @@ -285,7 +287,7 @@ PlatformResult StatusNotification::GetNumber(notification_h noti_handle, PlatformResult StatusNotification::GetDetailInfos(notification_h noti_handle, picojson::array* out) { - LoggerD("Enter"); + ScopeLogger(); if (info_map_.size() != info_sub_map_.size()) { return LogAndCreateResult(ErrorCode::VALIDATION_ERR, "Different notification information types element size"); @@ -319,7 +321,7 @@ PlatformResult StatusNotification::GetDetailInfos(notification_h noti_handle, PlatformResult StatusNotification::SetDetailInfos(notification_h noti_handle, const picojson::array& value) { - LoggerD("Enter"); + ScopeLogger(); size_t idx = 0; size_t info_map_size = info_map_.size(); @@ -348,7 +350,7 @@ PlatformResult StatusNotification::SetDetailInfos(notification_h noti_handle, } PlatformResult StatusNotification::GetLedColor(notification_h noti_handle, std::string* led_color) { - LoggerD("Enter"); + ScopeLogger(); unsigned int color = 0; notification_led_op_e type = NOTIFICATION_LED_OP_ON; @@ -379,7 +381,7 @@ PlatformResult StatusNotification::GetLedColor(notification_h noti_handle, std:: PlatformResult StatusNotification::SetLedColor(notification_h noti_handle, const std::string& led_color) { - LoggerD("Enter"); + ScopeLogger(); std::string color_str = led_color; std::transform(color_str.begin(), color_str.end(), color_str.begin(), ::tolower); @@ -413,7 +415,7 @@ PlatformResult StatusNotification::SetLedColor(notification_h noti_handle, PlatformResult StatusNotification::GetLedPeriod(notification_h noti_handle, unsigned long* on_period, unsigned long* off_period) { - LoggerD("Enter"); + ScopeLogger(); int on_time = 0; int off_time = 0; @@ -430,7 +432,7 @@ PlatformResult StatusNotification::GetLedPeriod(notification_h noti_handle, PlatformResult StatusNotification::SetLedOnPeriod(notification_h noti_handle, unsigned long on_period) { - LoggerD("Enter"); + ScopeLogger(); unsigned long off_period = 0; PlatformResult status = GetLedPeriod(noti_handle, nullptr, &off_period); if (status.IsError()) return status; @@ -446,7 +448,7 @@ PlatformResult StatusNotification::SetLedOnPeriod(notification_h noti_handle, PlatformResult StatusNotification::SetLedOffPeriod(notification_h noti_handle, unsigned long off_period) { - LoggerD("Enter"); + ScopeLogger(); unsigned long on_period = 0; PlatformResult status = GetLedPeriod(noti_handle, &on_period, nullptr); if (status.IsError()) return status; @@ -461,7 +463,7 @@ PlatformResult StatusNotification::SetLedOffPeriod(notification_h noti_handle, } PlatformResult StatusNotification::GetThumbnails(notification_h noti_handle, picojson::array* out) { - LoggerD("Enter"); + ScopeLogger(); std::string text; size_t thumbnails_map_size = thumbnails_map_.size(); for (size_t idx = 0; idx < thumbnails_map_size; ++idx) { @@ -479,7 +481,7 @@ PlatformResult StatusNotification::GetThumbnails(notification_h noti_handle, pic PlatformResult StatusNotification::SetThumbnails(notification_h noti_handle, const picojson::array& value) { - LoggerD("Enter"); + ScopeLogger(); size_t idx = 0; size_t thumbnails_map_size = thumbnails_map_.size(); @@ -503,7 +505,7 @@ PlatformResult StatusNotification::SetThumbnails(notification_h noti_handle, PlatformResult StatusNotification::GetSoundPath(notification_h noti_handle, std::string* sound_path) { - LoggerD("Enter"); + ScopeLogger(); *sound_path = ""; const char* path = NULL; @@ -526,7 +528,7 @@ PlatformResult StatusNotification::GetSoundPath(notification_h noti_handle, PlatformResult StatusNotification::SetSoundPath(notification_h noti_handle, const std::string& sound_path) { - LoggerD("Enter"); + ScopeLogger(); int ret = notification_set_sound(noti_handle, NOTIFICATION_SOUND_TYPE_USER_DATA, sound_path.c_str()); if (ret != NOTIFICATION_ERROR_NONE) { @@ -540,7 +542,7 @@ PlatformResult StatusNotification::SetSoundPath(notification_h noti_handle, } PlatformResult StatusNotification::GetVibration(notification_h noti_handle, bool* vibration) { - LoggerD("Enter"); + ScopeLogger(); notification_vibration_type_e vib_type = NOTIFICATION_VIBRATION_TYPE_NONE; if (notification_get_vibration(noti_handle, &vib_type, NULL) != NOTIFICATION_ERROR_NONE) { @@ -558,7 +560,7 @@ PlatformResult StatusNotification::GetVibration(notification_h noti_handle, bool } PlatformResult StatusNotification::SetVibration(notification_h noti_handle, bool vibration) { - LoggerD("Enter"); + ScopeLogger(); bool platform_vibration; PlatformResult status = GetVibration(noti_handle, &platform_vibration); if (status.IsError()) return status; @@ -582,7 +584,7 @@ PlatformResult StatusNotification::SetVibration(notification_h noti_handle, bool PlatformResult StatusNotification::GetApplicationControl(app_control_h app_handle, picojson::object* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); picojson::object& out = *out_ptr; char* operation = NULL; @@ -642,7 +644,7 @@ PlatformResult StatusNotification::GetApplicationControl(app_control_h app_handl PlatformResult StatusNotification::SetApplicationControl(app_control_h app_handle, const picojson::object& app_ctrl) { - LoggerD("Enter"); + ScopeLogger(); picojson::value val(app_ctrl); const std::string& operation = common::FromJson(app_ctrl, "operation"); @@ -716,7 +718,7 @@ PlatformResult StatusNotification::SetApplicationControl(app_control_h app_handl } PlatformResult StatusNotification::GetApplicationId(app_control_h app_handle, std::string* app_id) { - LoggerD("Enter"); + ScopeLogger(); char* app_id_str = NULL; SCOPE_EXIT { free(app_id_str); @@ -739,7 +741,7 @@ PlatformResult StatusNotification::GetApplicationId(app_control_h app_handle, st PlatformResult StatusNotification::SetApplicationId(app_control_h app_handle, const std::string& app_id) { - LoggerD("Enter"); + ScopeLogger(); int ret = app_control_set_app_id(app_handle, app_id.c_str()); if (ret != APP_CONTROL_ERROR_NONE) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Set applicaiton ID error", @@ -754,7 +756,7 @@ PlatformResult StatusNotification::SetApplicationId(app_control_h app_handle, PlatformResult StatusNotification::GetProgressValue(notification_h noti_handle, const std::string& progess_type, double* progress_value) { - LoggerD("Enter"); + ScopeLogger(); double tmp_progress_value = 0.0; if (progess_type == kProgressTypeByte) { @@ -781,7 +783,7 @@ PlatformResult StatusNotification::GetProgressValue(notification_h noti_handle, PlatformResult StatusNotification::SetProgressValue(notification_h noti_handle, const std::string& progress_type, double progress_value, bool is_update) { - LoggerD("Enter"); + ScopeLogger(); int ret; if (progress_type == kProgressTypeByte) { @@ -811,7 +813,7 @@ PlatformResult StatusNotification::SetProgressValue(notification_h noti_handle, } PlatformResult StatusNotification::GetPostedTime(notification_h noti_handle, time_t* posted_time) { - LoggerD("Enter"); + ScopeLogger(); *posted_time = 0; if (notification_get_insert_time(noti_handle, posted_time) != NOTIFICATION_ERROR_NONE) { @@ -822,7 +824,7 @@ PlatformResult StatusNotification::GetPostedTime(notification_h noti_handle, tim } PlatformResult StatusNotification::GetNotiHandle(int id, notification_h* noti_handle) { - LoggerD("Enter"); + ScopeLogger(); *noti_handle = notification_load(NULL, id); if (NULL == *noti_handle) { return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Not found or removed notification id"); @@ -833,7 +835,7 @@ PlatformResult StatusNotification::GetNotiHandle(int id, notification_h* noti_ha PlatformResult StatusNotification::GetAppControl(notification_h noti_handle, app_control_h* app_control) { - LoggerD("Enter"); + ScopeLogger(); int ret = notification_get_launch_option(noti_handle, NOTIFICATION_LAUNCH_OPTION_APP_CONTROL, static_cast(app_control)); if (ret != NOTIFICATION_ERROR_NONE) { @@ -845,7 +847,7 @@ PlatformResult StatusNotification::GetAppControl(notification_h noti_handle, } PlatformResult StatusNotification::CreateAppControl(app_control_h* app_control) { - LoggerD("Enter"); + ScopeLogger(); int ret = app_control_create(app_control); if (ret != APP_CONTROL_ERROR_NONE) { return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "Application create error", @@ -857,7 +859,7 @@ PlatformResult StatusNotification::CreateAppControl(app_control_h* app_control) PlatformResult StatusNotification::SetAppControl(notification_h noti_handle, app_control_h app_control) { - LoggerD("Enter"); + ScopeLogger(); int ret = notification_set_launch_option(noti_handle, NOTIFICATION_LAUNCH_OPTION_APP_CONTROL, static_cast(app_control)); if (ret != APP_CONTROL_ERROR_NONE) { @@ -870,7 +872,7 @@ PlatformResult StatusNotification::SetAppControl(notification_h noti_handle, PlatformResult StatusNotification::ToJson(int id, notification_h noti_handle, app_control_h app_handle, picojson::object* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); picojson::object& out = *out_ptr; out["id"] = picojson::value(std::to_string(id)); @@ -1013,7 +1015,7 @@ PlatformResult StatusNotification::ToJson(int id, notification_h noti_handle, PlatformResult StatusNotification::FromJson(const picojson::object& args, bool is_update, picojson::object* out_ptr) { - LoggerD("Enter"); + ScopeLogger(); picojson::object noti_obj = common::FromJson(args, "notification"); const std::string& status_type = common::FromJson(noti_obj, "statusType"); diff --git a/src/package/package_extension.cc b/src/package/package_extension.cc index ecdd4349..f8dae54f 100644 --- a/src/package/package_extension.cc +++ b/src/package/package_extension.cc @@ -23,21 +23,21 @@ extern const char kSource_package_api[]; common::Extension* CreateExtension() { - LoggerD("Enter"); + ScopeLogger(); return new PackageExtension; } PackageExtension::PackageExtension() { - LoggerD("Enter"); + ScopeLogger(); SetExtensionName("tizen.package"); SetJavaScriptAPI(kSource_package_api); } PackageExtension::~PackageExtension() { - LoggerD("Enter"); + ScopeLogger(); } common::Instance* PackageExtension::CreateInstance() { - LoggerD("Enter"); + ScopeLogger(); return new extension::package::PackageInstance; } diff --git a/src/package/package_info_provider.cc b/src/package/package_info_provider.cc index f89fc091..e478cdce 100644 --- a/src/package/package_info_provider.cc +++ b/src/package/package_info_provider.cc @@ -46,7 +46,7 @@ using common::tools::ReportSuccess; out["error"] = exception.ToJSON(); static int PackageInfoGetListCb(const pkgmgrinfo_pkginfo_h info, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array* array_data = static_cast(user_data); if (!array_data) { @@ -63,7 +63,7 @@ static int PackageInfoGetListCb(const pkgmgrinfo_pkginfo_h info, void* user_data } void PackageInfoProvider::GetPackagesInfo(picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); clock_t start_time, end_time; start_time = clock(); @@ -86,7 +86,7 @@ void PackageInfoProvider::GetPackagesInfo(picojson::object& out) { } void PackageInfoProvider::GetPackageInfo(picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); char* package_id = NULL; if (GetCurrentPackageId(&package_id)) { @@ -99,7 +99,7 @@ void PackageInfoProvider::GetPackageInfo(picojson::object& out) { } void PackageInfoProvider::GetPackageInfo(const char* package_id, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); if (strlen(package_id) <= 0) { LoggerE("Wrong Package ID"); @@ -129,7 +129,7 @@ void PackageInfoProvider::GetPackageInfo(const char* package_id, picojson::objec static bool PackageAppInfoCb(package_info_app_component_type_e comp_type, const char* app_id, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::array* array_data = static_cast(user_data); if (!array_data) { @@ -143,6 +143,7 @@ static bool PackageAppInfoCb(package_info_app_component_type_e comp_type, const bool PackageInfoProvider::ConvertToPackageToObject(const pkgmgrinfo_pkginfo_h info, picojson::object& out) { + ScopeLogger(); int ret = 0; char* id = NULL; @@ -231,7 +232,7 @@ bool PackageInfoProvider::ConvertToPackageToObject(const pkgmgrinfo_pkginfo_h in namespace { void GetSize(const std::string& id, int service_mode, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); pkgmgr_client* pc = pkgmgr_client_new(PC_REQUEST); int size = pkgmgr_client_usr_request_service(PM_REQUEST_GET_SIZE, service_mode, pc, NULL, id.c_str(), getuid(), NULL, NULL, NULL); @@ -248,17 +249,17 @@ void GetSize(const std::string& id, int service_mode, picojson::object* out) { } // namespace void PackageInfoProvider::GetTotalSize(const std::string& id, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); GetSize(id, PM_GET_TOTAL_SIZE, out); } void PackageInfoProvider::GetDataSize(const std::string& id, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); GetSize(id, PM_GET_DATA_SIZE, out); } bool PackageInfoProvider::GetCurrentPackageId(char** package_id) { - LoggerD("Enter"); + ScopeLogger(); int ret = 0; char* app_id = NULL; diff --git a/src/package/package_instance.cc b/src/package/package_instance.cc index 4467ae65..0bf31f7d 100644 --- a/src/package/package_instance.cc +++ b/src/package/package_instance.cc @@ -52,6 +52,7 @@ typedef enum _PackageThreadWorkType { class PackageUserData { public: PackageUserData(PackageInstance* ins, int id, PackageThreadWorkType task) { + ScopeLogger(); instance_ = ins; callback_id_ = id; work_ = task; @@ -65,7 +66,7 @@ class PackageUserData { typedef std::shared_ptr PackageUserDataPtr; static void* PackageThreadWork(const PackageUserDataPtr& userData) { - LoggerD("Enter"); + ScopeLogger(); switch (userData->work_) { case PackageThreadWorkGetPackagesInfo: { @@ -81,7 +82,7 @@ static void* PackageThreadWork(const PackageUserDataPtr& userData) { } static gboolean PackageAfterWork(const PackageUserDataPtr& userData) { - LoggerD("Enter"); + ScopeLogger(); userData->data_["callbackId"] = picojson::value(static_cast(userData->callback_id_)); picojson::value result = picojson::value(userData->data_); @@ -94,7 +95,7 @@ static void PackageRequestCb(int id, const char* type, const char* package, package_manager_event_type_e event_type, package_manager_event_state_e event_state, int progress, package_manager_error_e error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); PackageInstance* instance = static_cast(user_data); if (!instance) { @@ -135,7 +136,7 @@ static void PackageListenerCb(const char* type, const char* package, package_manager_event_type_e event_type, package_manager_event_state_e event_state, int progress, package_manager_error_e error, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); PackageInstance* instance = static_cast(user_data); if (!instance) { @@ -178,6 +179,7 @@ static void PackageListenerCb(const char* type, const char* package, } static std::string ltrim(const std::string& s) { + ScopeLogger(); std::string str = s; std::string::iterator i; for (i = str.begin(); i != str.end(); ++i) { @@ -194,6 +196,7 @@ static std::string ltrim(const std::string& s) { } static std::string convertUriToPath(const std::string& uri) { + ScopeLogger(); std::string result; std::string schema("file://"); std::string str = ltrim(uri); @@ -209,7 +212,7 @@ static std::string convertUriToPath(const std::string& uri) { } PackageInstance::PackageInstance() { - LoggerD("Enter"); + ScopeLogger(); int ret = package_manager_request_create(&request_); if (ret != PACKAGE_MANAGER_ERROR_NONE) { @@ -250,7 +253,7 @@ PackageInstance::PackageInstance() { } PackageInstance::~PackageInstance() { - LoggerD("Enter"); + ScopeLogger(); package_manager_request_unset_event_cb(request_); package_manager_request_destroy(request_); package_manager_destroy(manager_); @@ -263,17 +266,17 @@ PackageInstance::~PackageInstance() { } void PackageInstance::RegisterCallback(int request_id, int callback_id) { - LoggerD("Enter"); + ScopeLogger(); callbacks_map_[request_id] = callback_id; } void PackageInstance::DeregisterCallback(int request_id) { - LoggerD("Enter"); + ScopeLogger(); callbacks_map_.erase(request_id); } void PackageInstance::InvokeCallback(int request_id, picojson::object& param) { - LoggerD("Enter"); + ScopeLogger(); int callback_id = callbacks_map_[request_id]; @@ -283,7 +286,7 @@ void PackageInstance::InvokeCallback(int request_id, picojson::object& param) { } void PackageInstance::PackageManagerInstall(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInstall, &out); @@ -323,7 +326,7 @@ void PackageInstance::PackageManagerInstall(const picojson::value& args, picojso } void PackageInstance::PackageManagerUninstall(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInstall, &out); @@ -373,7 +376,7 @@ void PackageInstance::PackageManagerUninstall(const picojson::value& args, picoj } void PackageInstance::PackageManagerGetpackagesinfo(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInfo, &out); @@ -387,7 +390,7 @@ void PackageInstance::PackageManagerGetpackagesinfo(const picojson::value& args, } void PackageInstance::PackageManagerGetpackageinfo(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInfo, &out); @@ -401,7 +404,7 @@ void PackageInstance::PackageManagerGetpackageinfo(const picojson::value& args, void PackageInstance::PackageManagerGetTotalSize(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const auto& id = args.get("id"); @@ -414,7 +417,7 @@ void PackageInstance::PackageManagerGetTotalSize(const picojson::value& args, void PackageInstance::PackageManagerGetDataSize(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const auto& id = args.get("id"); @@ -426,14 +429,14 @@ void PackageInstance::PackageManagerGetDataSize(const picojson::value& args, } void PackageInstance::InvokeListener(picojson::object& param) { - LoggerD("Enter"); + ScopeLogger(); picojson::value result = picojson::value(param); Instance::PostMessage(this, result.serialize().c_str()); } void PackageInstance::PackageManagerSetpackageinfoeventlistener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInfo, &out); @@ -466,7 +469,7 @@ void PackageInstance::PackageManagerSetpackageinfoeventlistener(const picojson:: void PackageInstance::PackageManagerUnsetpackageinfoeventlistener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInfo, &out); @@ -497,7 +500,7 @@ void PackageInstance::PackageManagerUnsetpackageinfoeventlistener(const picojson } void PackageInstance::InvokeErrorCallbackAsync(int callback_id, const PlatformException& ex) { - LoggerD("Enter"); + ScopeLogger(); picojson::object param; LogAndReportError(ex, param); diff --git a/src/power/power_extension.cc b/src/power/power_extension.cc index 6f7d3afb..c0270717 100644 --- a/src/power/power_extension.cc +++ b/src/power/power_extension.cc @@ -26,11 +26,13 @@ common::Extension* CreateExtension() { } PowerExtension::PowerExtension() { + ScopeLogger(); SetExtensionName("tizen.power"); SetJavaScriptAPI(kSource_power_api); } PowerExtension::~PowerExtension() { + ScopeLogger(); } common::Instance* PowerExtension::CreateInstance() { diff --git a/src/power/power_instance.cc b/src/power/power_instance.cc index 8027ba17..b1e69681 100644 --- a/src/power/power_instance.cc +++ b/src/power/power_instance.cc @@ -51,7 +51,7 @@ using namespace common; using namespace extension::power; PowerInstance::PowerInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -69,7 +69,7 @@ PowerInstance::PowerInstance() { } PowerInstance::~PowerInstance() { - LoggerD("Enter"); + ScopeLogger(); PowerManager::GetInstance()->RemoveListener(this); @@ -99,7 +99,7 @@ enum PowerCallbacks { } void PowerInstance::PowerManagerRequest(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out); const std::string& resource = args.get("resource").get(); @@ -114,7 +114,7 @@ void PowerInstance::PowerManagerRequest(const picojson::value& args, picojson::o } void PowerInstance::PowerManagerRelease(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const std::string& resource = args.get("resource").get(); PlatformResult result = PowerManager::GetInstance()->Release(kPowerResourceMap.at(resource)); if (result.IsError()) @@ -125,7 +125,7 @@ void PowerInstance::PowerManagerRelease(const picojson::value& args, picojson::o void PowerInstance::PowerManagerGetscreenbrightness(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); double brightness; PlatformResult result = PowerManager::GetInstance()->GetScreenBrightness(&brightness); if (result.IsError()) @@ -136,7 +136,7 @@ void PowerInstance::PowerManagerGetscreenbrightness(const picojson::value& args, void PowerInstance::PowerManagerSetscreenbrightness(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePower, &out); CHECK_EXIST(args, "brightness", out) @@ -150,7 +150,7 @@ void PowerInstance::PowerManagerSetscreenbrightness(const picojson::value& args, } void PowerInstance::PowerManagerIsscreenon(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); bool state = false; PlatformResult result = PowerManager::GetInstance()->IsScreenOn(&state); if (result.IsError()) @@ -161,7 +161,7 @@ void PowerInstance::PowerManagerIsscreenon(const picojson::value& args, picojson void PowerInstance::PowerManagerRestorescreenbrightness(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result = PowerManager::GetInstance()->RestoreScreenBrightness(); if (result.IsError()) LogAndReportError(result, &out); @@ -170,7 +170,7 @@ void PowerInstance::PowerManagerRestorescreenbrightness(const picojson::value& a } void PowerInstance::PowerManagerTurnscreenon(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: turnScreenOn() is deprecated and will be removed from next release. " "Use request() instead."); @@ -185,7 +185,7 @@ void PowerInstance::PowerManagerTurnscreenon(const picojson::value& args, picojs } void PowerInstance::PowerManagerTurnscreenoff(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: turnScreenOff() is deprecated and will be removed from next release. " "Use release() instead."); @@ -200,7 +200,7 @@ void PowerInstance::PowerManagerTurnscreenoff(const picojson::value& args, picoj } void PowerInstance::OnScreenStateChanged(PowerState prev_state, PowerState new_state) { - LoggerD("Enter"); + ScopeLogger(); 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 946b6009..cf50a592 100644 --- a/src/power/power_manager.cc +++ b/src/power/power_manager.cc @@ -42,7 +42,7 @@ PowerManager::PowerManager() should_be_read_from_cache_(false), set_custom_brightness_(false), current_requested_state_(POWER_STATE_NONE) { - LoggerD("Enter"); + ScopeLogger(); display_state_e platform_state = DISPLAY_STATE_NORMAL; int ret = device_display_get_state(&platform_state); @@ -69,20 +69,20 @@ PowerManager::PowerManager() } PowerManager::~PowerManager() { - LoggerD("Enter"); + ScopeLogger(); int ret = device_remove_callback(DEVICE_CALLBACK_DISPLAY_STATE, PowerManager::OnPlatformStateChangedCB); if (DEVICE_ERROR_NONE != ret) LoggerE("device_remove_callback failed (%d)", ret); } PowerManager* PowerManager::GetInstance() { - LoggerD("Enter"); + ScopeLogger(); static PowerManager instance; return &instance; } void PowerManager::OnPlatformStateChangedCB(device_callback_e type, void* value, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); PowerManager* object = static_cast(user_data); if (object == NULL) { LoggerE("User data is NULL"); @@ -127,18 +127,18 @@ void PowerManager::OnPlatformStateChangedCB(device_callback_e type, void* value, } void PowerManager::AddListener(PowerManagerListener* listener) { - LoggerD("Enter"); + ScopeLogger(); auto it = std::find(listeners_.begin(), listeners_.end(), listener); if (it == listeners_.end()) listeners_.push_back(listener); } void PowerManager::RemoveListener(PowerManagerListener* listener) { - LoggerD("Enter"); + ScopeLogger(); listeners_.remove(listener); } PlatformResult PowerManager::Request(PowerResource resource, PowerState state) { - LoggerD("Enter"); + ScopeLogger(); if (resource == POWER_RESOURCE_SCREEN && state == POWER_STATE_CPU_AWAKE) return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "invalid PowerState"); if (resource == POWER_RESOURCE_CPU && state != POWER_STATE_CPU_AWAKE) @@ -236,7 +236,7 @@ PlatformResult PowerManager::Request(PowerResource resource, PowerState state) { } PlatformResult PowerManager::Release(PowerResource resource) { - LoggerD("Enter"); + ScopeLogger(); int ret; if (POWER_RESOURCE_SCREEN == resource) { ret = device_power_release_lock(POWER_LOCK_DISPLAY); @@ -280,7 +280,7 @@ PlatformResult PowerManager::Release(PowerResource resource) { } PlatformResult PowerManager::GetScreenBrightness(double* output) { - LoggerD("Enter"); + ScopeLogger(); int brightness = 0; auto error_code = GetPlatformBrightness(&brightness); @@ -303,7 +303,7 @@ PlatformResult PowerManager::GetScreenBrightness(double* output) { } PlatformResult PowerManager::SetScreenBrightness(double brightness) { - LoggerD("Enter"); + ScopeLogger(); if (brightness > 1 || brightness < 0) return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, "brightness should be 0 <= brightness <= 1"); @@ -325,7 +325,7 @@ PlatformResult PowerManager::SetScreenBrightness(double brightness) { } PlatformResult PowerManager::IsScreenOn(bool* state) { - LoggerD("Enter"); + ScopeLogger(); display_state_e platform_state = DISPLAY_STATE_NORMAL; int ret = device_display_get_state(&platform_state); @@ -339,7 +339,7 @@ PlatformResult PowerManager::IsScreenOn(bool* state) { } PlatformResult PowerManager::SetScreenState(bool onoff) { - LoggerD("Enter"); + ScopeLogger(); int ret = device_display_change_state(onoff ? DISPLAY_STATE_NORMAL : DISPLAY_STATE_SCREEN_OFF); if (DEVICE_ERROR_NONE != ret) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Platform error while changing screen state", @@ -366,7 +366,7 @@ PlatformResult PowerManager::SetScreenState(bool onoff) { } PlatformResult PowerManager::RestoreScreenBrightness() { - LoggerD("Enter"); + ScopeLogger(); int result = 0; auto error_code = PowerPlatformProxy::GetInstance().SetBrightnessFromSettings(&result); if (!error_code || DEVICE_ERROR_NONE != result) { @@ -377,7 +377,7 @@ PlatformResult PowerManager::RestoreScreenBrightness() { } PlatformResult PowerManager::SetPlatformBrightness(int brightness) { - LoggerD("Enter"); + ScopeLogger(); 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); @@ -408,7 +408,7 @@ PlatformResult PowerManager::SetPlatformBrightness(int brightness) { } PlatformResult PowerManager::GetPlatformBrightness(int* result) { - LoggerD("Entered"); + ScopeLogger(); int brightness = 0; @@ -454,7 +454,7 @@ PlatformResult PowerManager::GetPlatformBrightness(int* result) { } PlatformResult PowerManager::RestoreSettedBrightness() { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result(ErrorCode::NO_ERROR); int is_custom_mode = 0; vconf_get_int(VCONFKEY_PM_CUSTOM_BRIGHTNESS_STATUS, &is_custom_mode); @@ -471,7 +471,7 @@ PlatformResult PowerManager::RestoreSettedBrightness() { } void PowerManager::BroadcastScreenState(PowerState current) { - LoggerD("Enter"); + ScopeLogger(); if (current_state_ == current) return; PowerState prev_state = current_state_; diff --git a/src/power/power_platform_proxy.cc b/src/power/power_platform_proxy.cc index f23f4a0a..59478051 100644 --- a/src/power/power_platform_proxy.cc +++ b/src/power/power_platform_proxy.cc @@ -28,21 +28,21 @@ namespace power { PowerPlatformProxy::PowerPlatformProxy() : gdbus_op_(common::gdbus::GDBusPowerWrapper::kDefaultBusName, common::gdbus::GDBusPowerWrapper::kDefaultObjectPath) { - LoggerD("Entered"); + ScopeLogger(); } PowerPlatformProxy::~PowerPlatformProxy() { - LoggerD("Entered"); + ScopeLogger(); } PowerPlatformProxy& PowerPlatformProxy::GetInstance() { - LoggerD("Entered"); + ScopeLogger(); static PowerPlatformProxy instance; return instance; } common::PlatformResult PowerPlatformProxy::LockState(int* result) { - LoggerD("Entered PPP LockState"); + ScopeLogger(); if (!gdbus_op_.LockState(result)) { LoggerE("%s", gdbus_op_.GetLastError().c_str()); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get reply from gdbus"); @@ -51,7 +51,7 @@ common::PlatformResult PowerPlatformProxy::LockState(int* result) { } common::PlatformResult PowerPlatformProxy::UnlockState(int* result) { - LoggerD("Entered PPP UnlockState"); + ScopeLogger(); if (!gdbus_op_.UnlockState(result)) { LoggerE("%s", gdbus_op_.GetLastError().c_str()); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get reply from gdbus"); @@ -60,7 +60,7 @@ common::PlatformResult PowerPlatformProxy::UnlockState(int* result) { } common::PlatformResult PowerPlatformProxy::SetBrightnessFromSettings(int* result) { - LoggerD("Entered PPP SetBrightnessFromSettings"); + ScopeLogger(); if (!gdbus_op_.ReleaseBrightness(result)) { LoggerE("%s", gdbus_op_.GetLastError().c_str()); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get reply from gdbus"); @@ -69,7 +69,7 @@ common::PlatformResult PowerPlatformProxy::SetBrightnessFromSettings(int* result } common::PlatformResult PowerPlatformProxy::SetBrightness(int val, int* result) { - LoggerD("Entered PPP SetBrightness"); + ScopeLogger(); if (!gdbus_op_.HoldBrightness(val, result)) { LoggerE("%s", gdbus_op_.GetLastError().c_str()); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get reply from gdbus"); @@ -78,7 +78,7 @@ common::PlatformResult PowerPlatformProxy::SetBrightness(int val, int* result) { } common::PlatformResult PowerPlatformProxy::GetBrightness(int* result) { - LoggerD("Entered PPP GetBrightness"); + ScopeLogger(); if (!gdbus_op_.CurrentBrightness(result)) { LoggerE("%s", gdbus_op_.GetLastError().c_str()); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get reply from gdbus"); @@ -87,7 +87,7 @@ common::PlatformResult PowerPlatformProxy::GetBrightness(int* result) { } common::PlatformResult PowerPlatformProxy::IsCustomBrightness(int* result) { - LoggerD("Entered PPP IsCustomBrightness"); + ScopeLogger(); if (!gdbus_op_.CustomBrightness(result)) { LoggerE("%s", gdbus_op_.GetLastError().c_str()); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get reply from gdbus"); diff --git a/src/preference/preference_instance.cc b/src/preference/preference_instance.cc index c7ebe804..f7a24a67 100644 --- a/src/preference/preference_instance.cc +++ b/src/preference/preference_instance.cc @@ -114,6 +114,7 @@ common::TizenResult PreferenceInstance::SetChangeListener(const picojson::object const auto& key = args.find(kKey)->second.get(); common::PostCallback callback = [this](const common::TizenResult&, const picojson::value& v) { + ScopeLogger("Entered into asynchronous function, callback"); Post(kPreferenceChangeListenerToken, common::TizenSuccess{v}); }; diff --git a/src/preference/preference_manager.cc b/src/preference/preference_manager.cc index b00b3176..ecd9665e 100644 --- a/src/preference/preference_manager.cc +++ b/src/preference/preference_manager.cc @@ -33,6 +33,7 @@ const char* kKey = "key"; const char* kValue = "value"; common::TizenResult MakeErrResult(int ret, const char* err_msg) { + ScopeLogger(); LoggerE("%s", err_msg); switch (ret) { case PREFERENCE_ERROR_INVALID_PARAMETER: @@ -53,6 +54,7 @@ common::TizenResult MakeErrResult(int ret, const char* err_msg) { } int GetValueInternal(const std::string& key, picojson::value* val) { + ScopeLogger(); char* result_str = nullptr; int ret = preference_get_string(key.c_str(), &result_str); @@ -156,6 +158,7 @@ common::TizenResult PreferenceManager::GetAll(const common::PostCallback& callba ScopeLogger(); auto get_all = [](const common::PostCallback& callback) -> void { + ScopeLogger("Entered into asynchronous function, get_all"); picojson::value response{picojson::array{}}; auto* array = &response.get(); diff --git a/src/push/push_instance.cc b/src/push/push_instance.cc index bc321f9e..f7b277d3 100644 --- a/src/push/push_instance.cc +++ b/src/push/push_instance.cc @@ -31,7 +31,7 @@ const std::string kPrivilegePush = "http://tizen.org/privilege/push"; } // namespace PushInstance::PushInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -63,7 +63,7 @@ PushInstance::PushInstance() { } void PushInstance::registerService(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); common::PlatformResult result = impl->registerService(args.get("callbackId").get()); @@ -75,7 +75,7 @@ void PushInstance::registerService(const picojson::value& args, picojson::object } void PushInstance::registerApplication(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); common::PlatformResult result = impl->registerApplication(args.get("callbackId").get()); @@ -87,7 +87,7 @@ void PushInstance::registerApplication(const picojson::value& args, picojson::ob } void PushInstance::unregisterService(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -100,7 +100,7 @@ void PushInstance::unregisterService(const picojson::value& args, picojson::obje } void PushInstance::unregisterApplication(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -113,7 +113,7 @@ void PushInstance::unregisterApplication(const picojson::value& args, picojson:: } void PushInstance::connectService(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -126,7 +126,7 @@ void PushInstance::connectService(const picojson::value& args, picojson::object& } void PushInstance::connect(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -139,7 +139,7 @@ void PushInstance::connect(const picojson::value& args, picojson::object& out) { } void PushInstance::disconnectService(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -152,7 +152,7 @@ void PushInstance::disconnectService(const picojson::value& args, picojson::obje } void PushInstance::disconnect(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -165,7 +165,7 @@ void PushInstance::disconnect(const picojson::value& args, picojson::object& out } void PushInstance::getRegistrationId(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -182,7 +182,7 @@ void PushInstance::getRegistrationId(const picojson::value& args, picojson::obje } void PushInstance::getUnreadNotifications(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -195,7 +195,7 @@ void PushInstance::getUnreadNotifications(const picojson::value& args, picojson: } void PushInstance::getPushMessage(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegePush, &out); @@ -211,7 +211,7 @@ void PushInstance::getPushMessage(const picojson::value& args, picojson::object& } void PushInstance::onPushState(push_service_state_e state, common::PlatformResult result) { - LoggerD("Enter"); + ScopeLogger(); picojson::value res{picojson::object()}; picojson::object& dict = res.get(); @@ -226,6 +226,7 @@ void PushInstance::onPushState(push_service_state_e state, common::PlatformResul void PushInstance::onPushRegister(double callbackId, common::PlatformResult result, const std::string& id) { + ScopeLogger(); picojson::value res{picojson::object()}; picojson::object& dict = res.get(); @@ -239,7 +240,7 @@ void PushInstance::onPushRegister(double callbackId, common::PlatformResult resu } void PushInstance::onPushNotify(push_service_notification_h noti) { - LoggerD("Enter"); + ScopeLogger(); picojson::value res{picojson::object()}; picojson::object& dict = res.get(); @@ -254,7 +255,7 @@ void PushInstance::onPushNotify(push_service_notification_h noti) { } void PushInstance::onDeregister(double callbackId, common::PlatformResult result) { - LoggerD("Enter"); + ScopeLogger(); picojson::value res{picojson::object()}; picojson::object& dict = res.get(); @@ -266,7 +267,7 @@ void PushInstance::onDeregister(double callbackId, common::PlatformResult result } PushInstance::~PushInstance() { - LoggerD("Enter"); + ScopeLogger(); if (impl) { delete impl; impl = nullptr; diff --git a/src/push/push_manager.cc b/src/push/push_manager.cc index 3851c4cb..7d669ef2 100644 --- a/src/push/push_manager.cc +++ b/src/push/push_manager.cc @@ -54,13 +54,13 @@ PushManager::PushManager(EventListener* listener) app_control_(nullptr), operation_(nullptr), m_ignoreNotificationEvents(true) { - LoggerD("Enter"); + ScopeLogger(); initPkgId(); InitAppControl(); } PushManager::~PushManager() { - LoggerD("Enter"); + ScopeLogger(); m_listener = nullptr; if (m_handle) { @@ -78,7 +78,7 @@ PushManager::~PushManager() { } void PushManager::initPkgId() { - LoggerD("Enter"); + ScopeLogger(); int pid = getpid(); char* temp = nullptr; int ret = app_manager_get_app_id(pid, &temp); @@ -109,7 +109,7 @@ void PushManager::initPkgId() { } void PushManager::InitAppControl() { - LoggerD("Enter"); + ScopeLogger(); const auto encoded_bundle = PushManagerCommon::GetEncodedBundle(); @@ -133,7 +133,7 @@ void PushManager::InitAppControl() { } bool PushManager::checkRegistered_2_4() { - LoggerD("Enter"); + ScopeLogger(); bool result = false; char* temp = NULL; int ret = push_service_get_registration_id(m_handle, &temp); @@ -146,14 +146,14 @@ bool PushManager::checkRegistered_2_4() { } PlatformResult PushManager::connectService() { - LoggerD("Enter"); + ScopeLogger(); CHECK_CONNECTION(); m_ignoreNotificationEvents = false; return common::PlatformResult(ErrorCode::NO_ERROR); } PlatformResult PushManager::connect() { - LoggerD("Enter"); + ScopeLogger(); if (!m_handle) { int ret = push_service_connect(m_pkgId.c_str(), onPushState, onPushNotify, this, &m_handle); @@ -167,7 +167,7 @@ PlatformResult PushManager::connect() { } PlatformResult PushManager::disconnectService() { - LoggerD("Enter"); + ScopeLogger(); // disconnecting from push server if (m_handle) { push_service_disconnect(m_handle); @@ -178,7 +178,7 @@ PlatformResult PushManager::disconnectService() { } PlatformResult PushManager::disconnect() { - LoggerD("Enter"); + ScopeLogger(); if (m_handle) { push_service_disconnect(m_handle); m_handle = nullptr; @@ -187,7 +187,7 @@ PlatformResult PushManager::disconnect() { } PlatformResult PushManager::registerService(double callbackId) { - LoggerD("Enter"); + ScopeLogger(); CHECK_CONNECTION(); PushManagerHolder* holder = new PushManagerHolder{this, callbackId}; @@ -203,7 +203,7 @@ PlatformResult PushManager::registerService(double callbackId) { } PlatformResult PushManager::registerApplication(double callbackId) { - LoggerD("Enter"); + ScopeLogger(); PushManagerHolder* holder = new PushManagerHolder{this, callbackId}; @@ -218,7 +218,7 @@ PlatformResult PushManager::registerApplication(double callbackId) { } common::PlatformResult PushManager::unregisterService(double callbackId) { - LoggerD("Enter"); + ScopeLogger(); CHECK_CONNECTION(); PushManagerHolder* holder = new PushManagerHolder{this, callbackId}; @@ -249,7 +249,7 @@ common::PlatformResult PushManager::unregisterService(double callbackId) { } common::PlatformResult PushManager::unregisterApplication(double callbackId) { - LoggerD("Enter"); + ScopeLogger(); PushManagerHolder* holder = new PushManagerHolder{this, callbackId}; int ret = push_service_deregister(m_handle, onDeregister, holder); @@ -263,7 +263,7 @@ common::PlatformResult PushManager::unregisterApplication(double callbackId) { } common::PlatformResult PushManager::getRegistrationId(std::string& id) { - LoggerD("Enter"); + ScopeLogger(); char* temp = nullptr; int ret = push_service_get_registration_id(m_handle, &temp); if (PUSH_SERVICE_ERROR_NONE != ret) { @@ -277,7 +277,7 @@ common::PlatformResult PushManager::getRegistrationId(std::string& id) { } common::PlatformResult PushManager::getUnreadNotifications() { - LoggerD("Enter"); + ScopeLogger(); if (!m_handle) { return LogAndCreateResult(ErrorCode::SERVICE_NOT_AVAILABLE_ERR, "Not connected with push service"); @@ -293,7 +293,7 @@ common::PlatformResult PushManager::getUnreadNotifications() { } PlatformResult PushManager::getPushMessage(picojson::value* out) { - LoggerD("Enter"); + ScopeLogger(); push_service_notification_h handle = nullptr; int ret = push_service_app_control_to_notification(app_control_, operation_, &handle); @@ -320,7 +320,7 @@ PlatformResult PushManager::getPushMessage(picojson::value* out) { } void PushManager::onPushState(push_service_state_e state, const char* err, void* user_data) { - LoggerD("Enter %d, err: %s", state, err); + ScopeLogger("state: %d; err: %s", (int)state, err); PushManager* impl = static_cast(user_data); if (nullptr == impl || !impl->m_listener) { LoggerW("Listener not set, ignoring"); @@ -336,7 +336,7 @@ void PushManager::onPushState(push_service_state_e state, const char* err, void* } void PushManager::onPushNotify(push_service_notification_h noti, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); PushManager* impl = static_cast(user_data); if (nullptr == impl || !impl->m_listener) { LoggerW("Listener not set, ignoring"); @@ -347,7 +347,7 @@ void PushManager::onPushNotify(push_service_notification_h noti, void* user_data void PushManager::onApplicationRegister(push_service_result_e result, const char* msg, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); PushManagerHolder* holder = static_cast(user_data); // automatically releases memory @@ -390,7 +390,7 @@ void PushManager::onApplicationRegister(push_service_result_e result, const char // TODO duplicated code due to different error handling in 2.4 API. remove on next release void PushManager::onApplicationRegister_2_4(push_service_result_e result, const char* msg, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); PushManagerHolder* holder = static_cast(user_data); // automatically releases memory @@ -434,7 +434,7 @@ void PushManager::onApplicationRegister_2_4(push_service_result_e result, const } void PushManager::onDeregister(push_service_result_e result, const char* msg, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); PushManagerHolder* holder = static_cast(user_data); // automatically releases memory PushManager* impl = dynamic_cast(holder->impl); @@ -460,7 +460,7 @@ void PushManager::onDeregister(push_service_result_e result, const char* msg, vo // TODO duplicated code due to different error handling in 2.4 API. remove on next release void PushManager::onDeregister_2_4(push_service_result_e result, const char* msg, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); PushManagerHolder* holder = static_cast(user_data); // automatically releases memory PushManager* impl = dynamic_cast(holder->impl); @@ -481,7 +481,7 @@ void PushManager::onDeregister_2_4(push_service_result_e result, const char* msg } gboolean PushManager::onFakeDeregister_2_4(gpointer user_data) { - LoggerD("Enter"); + ScopeLogger(); PushManagerHolder* holder = static_cast(user_data); // automatically releases memory std::unique_ptr holder_ptr(holder); diff --git a/src/push/push_manager_common.cc b/src/push/push_manager_common.cc index c8feaced..406eb4c4 100644 --- a/src/push/push_manager_common.cc +++ b/src/push/push_manager_common.cc @@ -33,7 +33,7 @@ using common::PlatformResult; using common::ErrorCode; std::string PushManagerCommon::StateToString(push_service_state_e state) { - LoggerD("Entered"); + ScopeLogger(); switch (state) { case PUSH_SERVICE_STATE_REGISTERED: @@ -44,7 +44,7 @@ std::string PushManagerCommon::StateToString(push_service_state_e state) { } std::string PushManagerCommon::GetEncodedBundle() { - LoggerD("Entered"); + ScopeLogger(); std::string result; std::size_t size = 512; @@ -61,7 +61,7 @@ std::string PushManagerCommon::GetEncodedBundle() { void PushManagerCommon::notificationToJson(push_service_notification_h noti, picojson::object* obj) { - LoggerD("Enter"); + ScopeLogger(); char* temp = nullptr; int ret = push_service_get_notification_data(noti, &temp); @@ -151,7 +151,7 @@ void PushManagerCommon::notificationToJson(push_service_notification_h noti, // 3.0 version errors mappings ErrorCode PushManagerCommon::ConvertPushError(int e) { - LoggerD("Enter"); + ScopeLogger(); ErrorCode error; switch (e) { @@ -173,7 +173,7 @@ ErrorCode PushManagerCommon::ConvertPushError(int e) { // Different error code mappings for 2.4 implementation ErrorCode PushManagerCommon::ConvertPushError_2_4(int e) { - LoggerD("Enter"); + ScopeLogger(); ErrorCode error; switch (e) { diff --git a/src/radio/radio_instance.cc b/src/radio/radio_instance.cc index d506196a..1066c46a 100644 --- a/src/radio/radio_instance.cc +++ b/src/radio/radio_instance.cc @@ -29,7 +29,7 @@ using namespace common; using namespace extension::radio; RadioInstance::RadioInstance() : manager_(*this) { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -54,59 +54,57 @@ RadioInstance::RadioInstance() : manager_(*this) { REGISTER_ASYNC("FMRadio_ScanStart", ScanStart); REGISTER_ASYNC("FMRadio_ScanStop", ScanStop); #undef REGISTER_ASYNC - - LoggerD("RadioInstance()"); } RadioInstance::~RadioInstance() { - LoggerD("Enter"); + ScopeLogger(); } void RadioInstance::MuteGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); ReportSuccess(picojson::value(manager_.IsMuted()), out); } void RadioInstance::MuteSetter(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.SetMute(args.get("mute").get()); ReportSuccess(out); } void RadioInstance::AntennaGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); ReportSuccess(picojson::value(manager_.HasAntenna()), out); } void RadioInstance::StateGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); ReportSuccess(picojson::value(manager_.GetState()), out); } void RadioInstance::FrequencyGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); ReportSuccess(picojson::value(manager_.GetFrequency()), out); } void RadioInstance::SignalStrengthGetter(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); ReportSuccess(picojson::value(manager_.GetSignalStrength()), out); } void RadioInstance::SeekUp(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.SeekUp(args.get("callbackId").get()); ReportSuccess(out); } void RadioInstance::SeekDown(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.SeekDown(args.get("callbackId").get()); ReportSuccess(out); } void RadioInstance::Start(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result = manager_.Start(args.get("frequency").get()); @@ -118,7 +116,7 @@ void RadioInstance::Start(const picojson::value& args, picojson::object& out) { } void RadioInstance::Stop(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result = manager_.Stop(); @@ -130,20 +128,20 @@ void RadioInstance::Stop(const picojson::value& args, picojson::object& out) { } void RadioInstance::ScanStart(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.ScanStart(args.get("callbackId").get()); ReportSuccess(out); } void RadioInstance::ScanStop(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.ScanStop(args.get("callbackId").get()); ReportSuccess(out); } void RadioInstance::SetFMRadioInterruptedListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result = manager_.SetFMRadioInterruptedListener(); @@ -156,7 +154,7 @@ void RadioInstance::SetFMRadioInterruptedListener(const picojson::value& args, void RadioInstance::UnsetFMRadioInterruptedListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result = manager_.UnsetFMRadioInterruptedListener(); @@ -168,7 +166,7 @@ void RadioInstance::UnsetFMRadioInterruptedListener(const picojson::value& args, } void RadioInstance::SetAntennaChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result = manager_.SetAntennaChangeListener(); @@ -180,7 +178,7 @@ void RadioInstance::SetAntennaChangeListener(const picojson::value& args, picojs } void RadioInstance::UnsetAntennaChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult result = manager_.UnsetAntennaChangeListener(); diff --git a/src/radio/radio_manager.cc b/src/radio/radio_manager.cc index f348b370..e33cd4cf 100644 --- a/src/radio/radio_manager.cc +++ b/src/radio/radio_manager.cc @@ -51,11 +51,12 @@ std::map radio_state = { static const double FREQ_LOWER = 87.5; static void AddCallbackID(double callbackId, picojson::object* obj) { + ScopeLogger(); obj->insert(std::make_pair("callbackId", picojson::value(callbackId))); } PlatformResult GetPlatformResult(const std::string& str, int err) { - LoggerD("Enter"); + ScopeLogger(); string message = str + " : " + to_string(err); @@ -75,6 +76,7 @@ PlatformResult GetPlatformResult(const std::string& str, int err) { } PlatformResult CheckError(const std::string& str, int err) { + ScopeLogger(); LoggerE("%s() error %d", str.c_str(), err); switch (err) { @@ -87,7 +89,7 @@ PlatformResult CheckError(const std::string& str, int err) { } string TranslateInterruptedCode(int code) { - LoggerD("Enter"); + ScopeLogger(); #define STRINGIFY(c) \ case c: \ return #c @@ -115,7 +117,7 @@ double ToMHz(int frequency) { } void RadioSeekCallback(int frequency, void* user_data) { - LoggerD("Enter, freq: %d", frequency); + ScopeLogger("freq: %d", frequency); RadioData* data = static_cast(user_data); @@ -131,7 +133,7 @@ void RadioSeekCallback(int frequency, void* user_data) { } void ScanStartCallback(int frequency, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); RadioScanData* data = static_cast(user_data); data->frequencies_.push_back(frequency); @@ -145,12 +147,13 @@ void ScanStartCallback(int frequency, void* user_data) { } void PostAsyncSuccess(FMRadioManager* manager, double callbackId, picojson::value* event) { + ScopeLogger(); manager->PostResultSuccess(callbackId, event); delete event; } void ScanCompleteCallback(void* user_data) { - LoggerD("Enter"); + ScopeLogger(); RadioScanData* data = static_cast(user_data); @@ -172,7 +175,7 @@ void ScanCompleteCallback(void* user_data) { } void ScanStopCallback(void* user_data) { - LoggerD("Enter"); + ScopeLogger(); RadioData* data = static_cast(user_data); common::TaskQueue::GetInstance().Async( @@ -183,7 +186,7 @@ void ScanStopCallback(void* user_data) { } void RadioInterruptedCallback(radio_interrupted_code_e code, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); picojson::value event{picojson::object()}; auto& obj = event.get(); @@ -203,7 +206,7 @@ void RadioInterruptedCallback(radio_interrupted_code_e code, void* user_data) { } void RadioAntennaCallback(runtime_info_key_e key, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); bool connected = false; const auto err = runtime_info_get_value_bool(key, &connected); @@ -225,7 +228,7 @@ void RadioAntennaCallback(runtime_info_key_e key, void* user_data) { } // namespace bool FMRadioManager::IsMuted() { - LoggerD("Enter"); + ScopeLogger(); bool muted = false; const auto err = radio_is_muted(radio_instance_, &muted); @@ -246,7 +249,7 @@ void FMRadioManager::SetScanData(RadioScanData* scan_data) { } void FMRadioManager::SetMute(bool mute) { - LoggerD("Enter"); + ScopeLogger(); const auto err = radio_set_mute(radio_instance_, mute); @@ -256,7 +259,7 @@ void FMRadioManager::SetMute(bool mute) { } bool FMRadioManager::HasAntenna() { - LoggerD("Enter"); + ScopeLogger(); bool connected = false; const auto err = runtime_info_get_value_bool(RUNTIME_INFO_KEY_AUDIO_JACK_CONNECTED, &connected); @@ -269,7 +272,7 @@ bool FMRadioManager::HasAntenna() { } const char* FMRadioManager::GetState() { - LoggerD("Enter"); + ScopeLogger(); radio_state_e state; @@ -291,12 +294,12 @@ const char* FMRadioManager::GetState() { } PlatformResult FMRadioManager::SetFrequency(double frequency) { - LoggerD("Enter"); + ScopeLogger(); return CheckError("radio_set_frequency", radio_set_frequency(radio_instance_, TokHz(frequency))); } double FMRadioManager::GetFrequency() { - LoggerD("Enter"); + ScopeLogger(); int frequency = 0; const auto err = radio_get_frequency(radio_instance_, &frequency); @@ -311,7 +314,7 @@ double FMRadioManager::GetFrequency() { } double FMRadioManager::GetSignalStrength() { - LoggerD("Enter"); + ScopeLogger(); int strength = 0; const auto err = radio_get_signal_strength(radio_instance_, &strength); @@ -326,7 +329,7 @@ double FMRadioManager::GetSignalStrength() { FMRadioManager::FMRadioManager(RadioInstance& instance) : instance_(instance), radio_instance_(nullptr), scan_data(nullptr) { - LoggerD("Enter"); + ScopeLogger(); const auto err = radio_create(&radio_instance_); @@ -337,7 +340,7 @@ FMRadioManager::FMRadioManager(RadioInstance& instance) } FMRadioManager::~FMRadioManager() { - LoggerD("Enter"); + ScopeLogger(); if (radio_instance_) { const auto err = radio_destroy(radio_instance_); @@ -350,7 +353,7 @@ FMRadioManager::~FMRadioManager() { } PlatformResult FMRadioManager::Start(double frequency) { - LoggerD("Enter, frequency: %f", frequency); + ScopeLogger("freq: %d", frequency); radio_state_e state; const auto err = radio_get_state(radio_instance_, &state); @@ -378,7 +381,7 @@ PlatformResult FMRadioManager::Start(double frequency) { } PlatformResult FMRadioManager::Stop() { - LoggerD("Enter"); + ScopeLogger(); radio_state_e state; const auto err = radio_get_state(radio_instance_, &state); @@ -396,7 +399,7 @@ PlatformResult FMRadioManager::Stop() { } void FMRadioManager::SeekUp(double callback_id) { - LoggerD("Enter"); + ScopeLogger(); RadioData* user_data = new RadioData(*this); user_data->callback_id_ = callback_id; @@ -411,7 +414,7 @@ void FMRadioManager::SeekUp(double callback_id) { } void FMRadioManager::SeekDown(double callback_id) { - LoggerD("Enter"); + ScopeLogger(); RadioData* user_data = new RadioData(*this); user_data->callback_id_ = callback_id; @@ -426,7 +429,7 @@ void FMRadioManager::SeekDown(double callback_id) { } void FMRadioManager::ScanStart(double callback_id) { - LoggerD("Enter"); + ScopeLogger(); radio_state_e state; auto err = radio_get_state(radio_instance_, &state); @@ -464,7 +467,7 @@ void FMRadioManager::ScanStart(double callback_id) { } void FMRadioManager::ScanStop(double callback_id) { - LoggerD("Enter"); + ScopeLogger(); RadioScanData* user_data = new RadioScanData(*this); user_data->callback_id_ = callback_id; @@ -490,21 +493,21 @@ void FMRadioManager::ScanStop(double callback_id) { } common::PlatformResult FMRadioManager::SetFMRadioInterruptedListener() { - LoggerD("Enter"); + ScopeLogger(); const auto err = radio_set_interrupted_cb(radio_instance_, RadioInterruptedCallback, this); return CheckError("radio_set_interrupted_cb", err); } common::PlatformResult FMRadioManager::UnsetFMRadioInterruptedListener() { - LoggerD("Enter"); + ScopeLogger(); const auto err = radio_unset_interrupted_cb(radio_instance_); return CheckError("radio_unset_interrupted_cb", err); } common::PlatformResult FMRadioManager::SetAntennaChangeListener() { - LoggerD("Enter"); + ScopeLogger(); const auto err = runtime_info_set_changed_cb(RUNTIME_INFO_KEY_AUDIO_JACK_CONNECTED, RadioAntennaCallback, this); @@ -512,18 +515,19 @@ common::PlatformResult FMRadioManager::SetAntennaChangeListener() { } common::PlatformResult FMRadioManager::UnsetAntennaChangeListener() { - LoggerD("Enter"); + ScopeLogger(); const auto err = runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_AUDIO_JACK_CONNECTED); return CheckError("runtime_info_unset_changed_cb", err); } void FMRadioManager::PostMessage(const std::string& msg) const { - LoggerD("Enter"); + ScopeLogger(); Instance::PostMessage(&instance_, msg.c_str()); } void FMRadioManager::PostResultSuccess(double callbackId, picojson::value* event) const { + ScopeLogger(); auto& obj = event->get(); tools::ReportSuccess(obj); @@ -533,12 +537,14 @@ void FMRadioManager::PostResultSuccess(double callbackId, picojson::value* event } void FMRadioManager::PostResultCallbackSuccess(double callbackId) const { + ScopeLogger(); picojson::value event{picojson::object()}; PostResultSuccess(callbackId, &event); } void FMRadioManager::PostResultFailure(double callbackId, const PlatformResult& result) const { + ScopeLogger(); picojson::value event{picojson::object()}; auto& obj = event.get(); diff --git a/src/secureelement/secureelement_instance.cc b/src/secureelement/secureelement_instance.cc index 4dbff5ea..ac4139af 100644 --- a/src/secureelement/secureelement_instance.cc +++ b/src/secureelement/secureelement_instance.cc @@ -154,6 +154,7 @@ TizenResult SecureElementInstance::GetReaders(picojson::object const& args, CHECK_PRIVILEGE(kPrivilegeSecureElement); auto get_readers = [this](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, get_readers"); TizenResult result = TizenSuccess(); int* readers = nullptr; @@ -299,6 +300,7 @@ TizenResult SecureElementInstance::OpenSession(picojson::object const& args, int reader = static_cast(args.find(kHandle)->second.get()); auto open_session = [this, reader](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, open_session"); TizenResult result = TizenSuccess(); int session = 0; @@ -364,6 +366,7 @@ TizenResult SecureElementInstance::OpenBasicChannel(picojson::object const& args const picojson::array v_aid = args.find(kAid)->second.get(); auto open_basic_channel = [this, session, v_aid](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, open_basic_channel"); TizenResult result = TizenSuccess(); int channel = 0; unsigned char P2 = 0; @@ -408,6 +411,7 @@ TizenResult SecureElementInstance::OpenLogicalChannel(picojson::object const& ar const picojson::array v_aid = args.find(kAid)->second.get(); auto open_basic_logical = [this, session, v_aid](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, open_basic_logical"); TizenResult result = TizenSuccess(); int channel = 0; unsigned char P2 = 0; @@ -540,6 +544,7 @@ TizenResult SecureElementInstance::Transmit(picojson::object const& args, const auto& v_cmd = args.find(kCommand)->second.get(); auto transmit = [this, channel, v_cmd](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, transmit"); TizenResult result = TizenSuccess(); size_t v_cmd_size = v_cmd.size(); diff --git a/src/sensor/sensor_instance.cc b/src/sensor/sensor_instance.cc index 1165487e..b137ef0f 100644 --- a/src/sensor/sensor_instance.cc +++ b/src/sensor/sensor_instance.cc @@ -26,7 +26,7 @@ namespace sensor { using namespace common; SensorInstance::SensorInstance() : service_(*this) { - LoggerD("Entered"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -44,42 +44,42 @@ SensorInstance::SensorInstance() : service_(*this) { } SensorInstance::~SensorInstance() { - LoggerD("Entered"); + ScopeLogger(); } void SensorInstance::GetAvailableSensors(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); service_.GetAvailableSensors(out); } void SensorInstance::SensorStop(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); service_.SensorStop(args, out); } void SensorInstance::SensorSetChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); service_.SensorSetChangeListener(args, out); } void SensorInstance::SensorUnsetChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); service_.SensorUnsetChangeListener(args, out); } void SensorInstance::SensorStart(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); service_.SensorStart(args, out); } void SensorInstance::SensorGetData(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); service_.GetSensorData(args, out); } void SensorInstance::GetSensorHardwareInfo(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); service_.GetSensorHardwareInfo(args, out); } diff --git a/src/sensor/sensor_service.cc b/src/sensor/sensor_service.cc index 2cd3ed6e..b6b87fe8 100644 --- a/src/sensor/sensor_service.cc +++ b/src/sensor/sensor_service.cc @@ -46,7 +46,7 @@ static std::map type_to_string_map; static std::map string_to_type_map; static std::string GetAccuracyString(int accuracy) { - LoggerD("Entered"); + ScopeLogger(); switch (static_cast(accuracy)) { case SENSOR_DATA_ACCURACY_BAD: return "ACCURACY_BAD"; @@ -69,7 +69,7 @@ static const std::string kSensorChangedListener = "SensorChangedListener"; void ReportSensorData(sensor_type_e sensor_type, sensor_event_s* sensor_event, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); switch (sensor_type) { case SENSOR_LIGHT: { @@ -138,7 +138,7 @@ void ReportSensorData(sensor_type_e sensor_type, sensor_event_s* sensor_event, } std::string GetSensorErrorMessage(const int error_code) { - LoggerD("Entered"); + ScopeLogger(); switch (error_code) { case SENSOR_ERROR_IO_ERROR: @@ -161,7 +161,7 @@ std::string GetSensorErrorMessage(const int error_code) { } PlatformResult GetSensorPlatformResult(const int error_code, const std::string& hint) { - LoggerD("Entered"); + ScopeLogger(); std::string message = hint + " : " + GetSensorErrorMessage(error_code); @@ -176,6 +176,7 @@ PlatformResult GetSensorPlatformResult(const int error_code, const std::string& } bool DefaultEventComparator(sensor_event_s* l, sensor_event_s* r, const unsigned int value_count) { + ScopeLogger(); for (unsigned int i = 0; i < value_count; ++i) { if (l->values[i] != r->values[i]) { return false; @@ -252,14 +253,14 @@ SensorData::SensorData(SensorInstance& instance, sensor_type_e type_enum, const instance_(instance), is_change_listener_set_(false), is_starting_(false) { + ScopeLogger(); type_to_string_map.insert(std::make_pair(type_enum, name)); string_to_type_map.insert(std::make_pair(name, type_enum)); - - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + LoggerD("type_to_string_map is: %s", type_to_string_map[type()].c_str()); } SensorData::~SensorData() { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); if (listener_) { sensor_destroy_listener(listener_); @@ -267,7 +268,7 @@ SensorData::~SensorData() { } void SensorData::SensorCallback(sensor_h sensor, sensor_event_s* event, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); SensorData* that = static_cast(user_data); @@ -276,14 +277,15 @@ void SensorData::SensorCallback(sensor_h sensor, sensor_event_s* event, void* us return; } - LoggerD("Entered: %s", type_to_string_map[that->type()].c_str()); + LoggerD("sensor type: %s", type_to_string_map[that->type()].c_str()); { std::lock_guard lock(that->change_listener_mutex_); if (!that->delayed_success_callbacks_.empty()) { for_each(that->delayed_success_callbacks_.begin(), that->delayed_success_callbacks_.end(), [](std::function& callback) { - LoggerD("Calling delayed start succcess callback"); + ScopeLogger( + "Entered into asynchronous function, calling delayed start succcess callback"); callback(); }); that->delayed_success_callbacks_.erase(that->delayed_success_callbacks_.begin(), @@ -311,7 +313,7 @@ void SensorData::SensorCallback(sensor_h sensor, sensor_event_s* event, void* us } PlatformResult SensorData::CheckInitialization() { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); std::lock_guard lock(initialization_mutex_); if (!handle_) { @@ -334,7 +336,7 @@ PlatformResult SensorData::CheckInitialization() { } PlatformResult SensorData::IsSupported(bool* supported) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); if (!is_supported_) { bool is_supported = false; @@ -351,7 +353,7 @@ PlatformResult SensorData::IsSupported(bool* supported) { } PlatformResult SensorData::IsSupportedImpl(bool* supported) const { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); bool is_supported = false; int ret = sensor_is_supported(type_enum_, &is_supported); @@ -366,7 +368,7 @@ PlatformResult SensorData::IsSupportedImpl(bool* supported) const { } bool SensorData::is_supported() { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); if (!is_supported_) { bool is_supported = false; @@ -382,7 +384,7 @@ bool SensorData::is_supported() { } bool SensorData::UpdateEvent(sensor_event_s* event) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); if (comparator_(&previous_event_, event, sensor_value_count_)) { // previous and current events are the same -> no update @@ -394,7 +396,7 @@ bool SensorData::UpdateEvent(sensor_event_s* event) { } PlatformResult SensorData::AddDelayedStartSuccessCb(const std::function& successCb) { - LoggerD("Entered"); + ScopeLogger("Entered"); delayed_success_callbacks_.push_back(successCb); if (!is_change_listener_set_ && !is_starting_) { @@ -418,7 +420,7 @@ PlatformResult SensorData::AddDelayedStartSuccessCb(const std::function& PlatformResult SensorData::Start( const std::shared_ptr& result, const std::function&)>& report_result) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); auto res = CheckInitialization(); if (!res) { @@ -427,7 +429,7 @@ PlatformResult SensorData::Start( } auto delayed_success_callback = [this, result, report_result]() { - LoggerD("Delayed success callback"); + ScopeLogger("Entered into asynchronous function, delayed succcess callback"); ReportSuccess(result->get()); report_result(result); }; @@ -458,7 +460,7 @@ PlatformResult SensorData::Start( } PlatformResult SensorData::Stop() { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); auto res = CheckInitialization(); @@ -487,7 +489,7 @@ PlatformResult SensorData::Stop() { } PlatformResult SensorData::SetChangeListener(unsigned int interval, unsigned int batch_latency) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); auto res = CheckInitialization(); @@ -518,7 +520,7 @@ PlatformResult SensorData::SetChangeListener(unsigned int interval, unsigned int } PlatformResult SensorData::UnsetChangeListener() { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); auto res = CheckInitialization(); @@ -542,7 +544,7 @@ PlatformResult SensorData::UnsetChangeListener() { } PlatformResult SensorData::GetSensorData(picojson::object* data) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); auto res = CheckInitialization(); @@ -564,7 +566,7 @@ PlatformResult SensorData::GetSensorData(picojson::object* data) { } PlatformResult SensorData::GetHardwareInfo(picojson::object* data) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); auto res = CheckInitialization(); @@ -588,6 +590,7 @@ PlatformResult SensorData::GetHardwareInfo(picojson::object* data) { }; auto native_result = [](int ret) -> PlatformResult { + ScopeLogger("Entered into asynchronous function, native_result"); switch (ret) { case SENSOR_ERROR_IO_ERROR: return PlatformResult(ErrorCode::IO_ERR); @@ -683,7 +686,7 @@ class HrmSensorData : public SensorData { HrmSensorData::HrmSensorData(SensorInstance& instance) : SensorData(instance, SENSOR_CUSTOM, "HRM_RAW", 1) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); // For amount of retrieved values from sensors please refer to native guides. AddSensor(new SensorData(instance, SENSOR_HRM_LED_IR, "LED_IR", 1)); AddSensor(new SensorData(instance, SENSOR_HRM_LED_RED, "LED_RED", 1)); @@ -691,16 +694,16 @@ HrmSensorData::HrmSensorData(SensorInstance& instance) } HrmSensorData::~HrmSensorData() { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); } void HrmSensorData::AddSensor(SensorData* sensor) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); hrm_sensors_.insert(std::make_pair(sensor->type(), std::shared_ptr(sensor))); } PlatformResult HrmSensorData::CallMember(PlatformResult (SensorData::*member)()) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); bool is_any_supported = false; for (const auto& sensor : hrm_sensors_) { if (sensor.second->is_supported()) { @@ -724,7 +727,7 @@ PlatformResult HrmSensorData::CallMember( const std::function&)>&), const std::shared_ptr& result, const std::function&)>& work) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); bool is_any_supported = false; for (const auto& sensor : hrm_sensors_) { if (sensor.second->is_supported()) { @@ -743,7 +746,7 @@ PlatformResult HrmSensorData::CallMember( } PlatformResult HrmSensorData::IsSupportedImpl(bool* supported) const { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); bool result = false; bool hrm_supported = false; @@ -770,17 +773,17 @@ PlatformResult HrmSensorData::IsSupportedImpl(bool* supported) const { PlatformResult HrmSensorData::Start( const std::shared_ptr& result, const std::function&)>& work) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); return CallMember(&SensorData::Start, result, work); } PlatformResult HrmSensorData::Stop() { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); return CallMember(&SensorData::Stop); } PlatformResult HrmSensorData::SetChangeListener(unsigned int interval, unsigned int batch_latency) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); for (const auto& sensor : hrm_sensors_) { if (sensor.second->is_supported()) { auto res = sensor.second->SetChangeListener(interval, batch_latency); @@ -793,12 +796,12 @@ PlatformResult HrmSensorData::SetChangeListener(unsigned int interval, unsigned } PlatformResult HrmSensorData::UnsetChangeListener() { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); return CallMember(&SensorData::UnsetChangeListener); } PlatformResult HrmSensorData::GetSensorData(picojson::object* data) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); for (const auto& sensor : hrm_sensors_) { if (sensor.second->is_supported()) { // HRMRawSensor.getHRMRawSensorData() can return only one value, @@ -820,7 +823,7 @@ PlatformResult HrmSensorData::GetSensorData(picojson::object* data) { } PlatformResult HrmSensorData::GetHardwareInfo(picojson::object* data) { - LoggerD("Entered: %s", type_to_string_map[type()].c_str()); + ScopeLogger(type_to_string_map[type()]); for (const auto& sensor : hrm_sensors_) { if (sensor.second->is_supported()) { return sensor.second->GetHardwareInfo(data); @@ -831,7 +834,7 @@ PlatformResult HrmSensorData::GetHardwareInfo(picojson::object* data) { } SensorService::SensorService(SensorInstance& instance) : instance_(instance) { - LoggerD("Entered"); + ScopeLogger(); // For amount of retrieved values from sensors please refer to native guides. AddSensor(new SensorData(instance, SENSOR_LIGHT, "LIGHT", 1)); @@ -848,11 +851,11 @@ SensorService::SensorService(SensorInstance& instance) : instance_(instance) { } SensorService::~SensorService() { - LoggerD("Entered"); + ScopeLogger(); } void SensorService::GetAvailableSensors(picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); bool is_supported = false; @@ -876,7 +879,7 @@ void SensorService::GetAvailableSensors(picojson::object& out) { } void SensorService::SensorStart(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out) int callback_id = static_cast(args.get("callbackId").get()); const std::string type_str = @@ -886,7 +889,7 @@ void SensorService::SensorStart(const picojson::value& args, picojson::object& o sensor_type_e type_enum = string_to_type_map[type_str]; auto start_result = [this, callback_id](const std::shared_ptr& result) { - LoggerD("Entered"); + ScopeLogger("Entered into asynchronous function, start_result"); result->get()["callbackId"] = picojson::value{static_cast(callback_id)}; Instance::PostMessage(&instance_, result->serialize().c_str()); @@ -894,7 +897,8 @@ void SensorService::SensorStart(const picojson::value& args, picojson::object& o auto start = [this, type_enum, type_str, start_result](const std::shared_ptr& result) { - LoggerD("Entered"); + + ScopeLogger("Entered into asynchronous function, start"); auto sensor_data = GetSensor(type_enum); if (!sensor_data) { LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Sensor data is null"), @@ -917,7 +921,7 @@ void SensorService::SensorStart(const picojson::value& args, picojson::object& o } void SensorService::SensorStop(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string type_str = args.contains(kSensorTypeTag) ? args.get(kSensorTypeTag).get() : ""; LoggerD("input type: %s", type_str.c_str()); @@ -939,7 +943,7 @@ void SensorService::SensorStop(const picojson::value& args, picojson::object& ou } void SensorService::SensorSetChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string type_str = args.contains(kSensorTypeTag) ? args.get(kSensorTypeTag).get() : ""; const auto interval = args.contains(kInterval) ? args.get(kInterval).get() : 100.0; @@ -968,7 +972,7 @@ void SensorService::SensorSetChangeListener(const picojson::value& args, picojso } void SensorService::SensorUnsetChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const std::string type_str = args.contains(kSensorTypeTag) ? args.get(kSensorTypeTag).get() : ""; LoggerD("input type: %s", type_str.c_str()); @@ -991,7 +995,7 @@ void SensorService::SensorUnsetChangeListener(const picojson::value& args, picoj } std::shared_ptr SensorService::GetSensor(sensor_type_e type_enum) { - LoggerD("Entered"); + ScopeLogger(); auto sensor = sensors_.find(type_enum); if (sensors_.end() == sensor) { @@ -1002,12 +1006,12 @@ std::shared_ptr SensorService::GetSensor(sensor_type_e type_enum) { } void SensorService::AddSensor(SensorData* sensor) { - LoggerD("Entered"); + ScopeLogger(); sensors_.insert(std::make_pair(sensor->type(), std::shared_ptr(sensor))); } void SensorService::GetSensorData(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out); CHECK_EXIST(args, "type", out); @@ -1016,6 +1020,7 @@ void SensorService::GetSensorData(const picojson::value& args, picojson::object& sensor_type_e sensor_type = string_to_type_map[args.get("type").get()]; auto get_data = [this, sensor_type](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_data"); picojson::object& object = result->get(); auto sensor_data = this->GetSensor(sensor_type); @@ -1034,6 +1039,7 @@ void SensorService::GetSensorData(const picojson::value& args, picojson::object& }; auto get_data_result = [this, callback_id](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_data_result"); result->get()["callbackId"] = picojson::value{static_cast(callback_id)}; @@ -1048,7 +1054,7 @@ void SensorService::GetSensorData(const picojson::value& args, picojson::object& } void SensorService::GetSensorHardwareInfo(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out); CHECK_EXIST(args, "type", out); @@ -1057,6 +1063,7 @@ void SensorService::GetSensorHardwareInfo(const picojson::value& args, picojson: sensor_type_e sensor_type = string_to_type_map[args.get("type").get()]; auto get_info = [this, sensor_type](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_info"); picojson::object& object = result->get(); auto sensor_data = this->GetSensor(sensor_type); @@ -1079,6 +1086,7 @@ void SensorService::GetSensorHardwareInfo(const picojson::value& args, picojson: }; auto get_info_result = [this, callback_id](const std::shared_ptr& result) { + ScopeLogger("Entered into asynchronous function, get_info_result"); result->get()["callbackId"] = picojson::value{static_cast(callback_id)}; Instance::PostMessage(&instance_, result->serialize().c_str()); diff --git a/src/sound/sound_instance.cc b/src/sound/sound_instance.cc index 3b99ef36..89e0b868 100644 --- a/src/sound/sound_instance.cc +++ b/src/sound/sound_instance.cc @@ -37,7 +37,7 @@ using namespace common; using namespace extension::sound; SoundInstance::SoundInstance() : manager_(*this) { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -60,7 +60,7 @@ SoundInstance::SoundInstance() : manager_(*this) { } SoundInstance::~SoundInstance() { - LoggerD("Enter"); + ScopeLogger(); } #define CHECK_EXIST(args, name, out) \ @@ -70,7 +70,7 @@ SoundInstance::~SoundInstance() { } void SoundInstance::SoundManagerGetSoundMode(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); std::string sound_mode_type; PlatformResult status = manager_.GetSoundMode(&sound_mode_type); @@ -82,7 +82,7 @@ void SoundInstance::SoundManagerGetSoundMode(const picojson::value& args, picojs } void SoundInstance::SoundManagerSetVolume(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeSound, &out); PlatformResult status = manager_.SetVolume(args.get()); @@ -94,7 +94,7 @@ void SoundInstance::SoundManagerSetVolume(const picojson::value& args, picojson: } void SoundInstance::SoundManagerGetVolume(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); double volume; PlatformResult status = manager_.GetVolume(args.get(), &volume); @@ -107,7 +107,7 @@ void SoundInstance::SoundManagerGetVolume(const picojson::value& args, picojson: void SoundInstance::SoundManagerSetSoundModeChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = manager_.SetSoundModeChangeListener(this); if (status.IsSuccess()) { @@ -121,7 +121,7 @@ void SoundInstance::SoundManagerUnsetSoundModeChangeListener(const picojson::val picojson::object& out) { PlatformResult status = manager_.UnsetSoundModeChangeListener(); - LoggerD("Enter"); + ScopeLogger(); if (status.IsSuccess()) { ReportSuccess(out); @@ -131,7 +131,7 @@ void SoundInstance::SoundManagerUnsetSoundModeChangeListener(const picojson::val } void SoundInstance::OnSoundModeChange(const std::string& newmode) { - LoggerD("Enter"); + ScopeLogger(); picojson::value event = picojson::value(picojson::object()); picojson::object& obj = event.get(); picojson::value result = picojson::value(newmode); @@ -143,7 +143,7 @@ void SoundInstance::OnSoundModeChange(const std::string& newmode) { void SoundInstance::SoundManagerSetVolumeChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = manager_.SetVolumeChangeListener(); if (status.IsSuccess()) { @@ -155,7 +155,7 @@ void SoundInstance::SoundManagerSetVolumeChangeListener(const picojson::value& a void SoundInstance::SoundManagerUnsetVolumeChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); PlatformResult status = manager_.UnsetVolumeChangeListener(); if (status.IsSuccess()) { @@ -167,19 +167,19 @@ void SoundInstance::SoundManagerUnsetVolumeChangeListener(const picojson::value& void SoundInstance::SoundManagerGetConnectedDeviceList(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.GetDeviceList(SOUND_DEVICE_ALL_MASK, out); } void SoundInstance::SoundManagerGetActivatedDeviceList(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); manager_.GetDeviceList(SOUND_DEVICE_STATE_ACTIVATED_MASK, out); } void SoundInstance::SoundManagerAddDeviceStateChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = manager_.AddDeviceStateChangeListener(); if (result.IsSuccess()) { @@ -191,7 +191,7 @@ void SoundInstance::SoundManagerAddDeviceStateChangeListener(const picojson::val void SoundInstance::SoundManagerRemoveDeviceStateChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult result = manager_.RemoveDeviceStateChangeListener(); if (result.IsSuccess()) { diff --git a/src/sound/sound_manager.cc b/src/sound/sound_manager.cc index 794e9c4b..31744363 100644 --- a/src/sound/sound_manager.cc +++ b/src/sound/sound_manager.cc @@ -50,7 +50,7 @@ const std::map SoundManager::platform_enum_map_ = { {"VOICE", SOUND_TYPE_VOICE}, {"RINGTONE", SOUND_TYPE_RINGTONE}}; PlatformResult SoundManager::StrToPlatformEnum(const std::string& key, sound_type_e* sound_type) { - LoggerD("Enter"); + ScopeLogger(); if (platform_enum_map_.find(key) == platform_enum_map_.end()) { std::string message = "Platform enum value not found for key " + key; return LogAndCreateResult(ErrorCode::INVALID_VALUES_ERR, message); @@ -62,7 +62,7 @@ PlatformResult SoundManager::StrToPlatformEnum(const std::string& key, sound_typ } PlatformResult SoundManager::PlatformEnumToStr(const sound_type_e value, std::string* sound_type) { - LoggerD("Enter"); + ScopeLogger(); for (auto& item : platform_enum_map_) { if (item.second == value) { *sound_type = item.first; @@ -77,7 +77,7 @@ PlatformResult SoundManager::PlatformEnumToStr(const sound_type_e value, std::st } std::string SoundManager::SoundDeviceTypeToString(sound_device_type_e type) { - LoggerD("Enter"); + ScopeLogger(); switch (type) { case SOUND_DEVICE_BUILTIN_SPEAKER: return "SPEAKER"; @@ -102,7 +102,7 @@ std::string SoundManager::SoundDeviceTypeToString(sound_device_type_e type) { } std::string SoundManager::SoundIOTypeToString(sound_device_io_direction_e type) { - LoggerD("Enter"); + ScopeLogger(); switch (type) { case SOUND_DEVICE_IO_DIRECTION_IN: return "IN"; @@ -125,11 +125,12 @@ SoundManager::SoundManager(SoundInstance& instance) sound_device_state_listener_id_(0), instance_(instance), soundModeListener(nullptr) { + ScopeLogger(); FillMaxVolumeMap(); } SoundManager::~SoundManager() { - LoggerD("Enter"); + ScopeLogger(); UnsetSoundModeChangeListener(); @@ -155,7 +156,7 @@ SoundManager::~SoundManager() { } void SoundManager::FillMaxVolumeMap() { - LoggerD("Enter"); + ScopeLogger(); int max = 100; int ret; @@ -174,7 +175,7 @@ void SoundManager::FillMaxVolumeMap() { } PlatformResult SoundManager::GetMaxVolume(sound_type_e type, int* max_volume) { - LoggerD("Enter"); + ScopeLogger(); auto it = max_volume_map_.find(type); if (it == max_volume_map_.end()) { std::string sound_type; @@ -191,12 +192,12 @@ PlatformResult SoundManager::GetMaxVolume(sound_type_e type, int* max_volume) { } double SoundManager::ConvertToSystemVolume(int max_volume, int volume) { - LoggerD("Enter"); + ScopeLogger(); return round(static_cast(volume) * 100 / max_volume) / 100; } void SoundManager::VolumeChangeCallback(sound_type_e type, unsigned int value) { - LoggerD("VolumeChangeCallback: type: %d, value: %d", type, value); + ScopeLogger("VolumeChangeCallback: type: %d, value: %d", type, value); // Prepare response picojson::value response = picojson::value(picojson::object()); @@ -221,7 +222,7 @@ void SoundManager::VolumeChangeCallback(sound_type_e type, unsigned int value) { } PlatformResult SoundManager::GetSoundMode(std::string* sound_mode_type) { - LoggerD("Enter"); + ScopeLogger(); int isEnableSound = 0; int isEnableVibrate = 0; @@ -254,7 +255,7 @@ PlatformResult SoundManager::GetSoundMode(std::string* sound_mode_type) { } PlatformResult SoundManager::SetVolume(const picojson::object& args) { - LoggerD("Enter"); + ScopeLogger(); const std::string& type = FromJson(args, "type"); double volume = FromJson(args, "volume"); @@ -290,7 +291,7 @@ PlatformResult SoundManager::SetVolume(const picojson::object& args) { } PlatformResult SoundManager::GetVolume(const picojson::object& args, double* volume) { - LoggerD("Enter"); + ScopeLogger(); const std::string& type = FromJson(args, "type"); int value = 0; @@ -315,7 +316,7 @@ PlatformResult SoundManager::GetVolume(const picojson::object& args, double* vol } void SoundManager::soundModeChangedCb(keynode_t*, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); if (nullptr == user_data) { LoggerE("Invalid callback data!"); @@ -338,7 +339,7 @@ void SoundManager::soundModeChangedCb(keynode_t*, void* user_data) { PlatformResult SoundManager::SetSoundModeChangeListener( SoundManagerSoundModeChangedListener* listener) { - LoggerD("Enter"); + ScopeLogger(); soundModeListener = listener; if (soundModeChangeListening) return PlatformResult(ErrorCode::NO_ERROR); @@ -359,7 +360,7 @@ PlatformResult SoundManager::SetSoundModeChangeListener( } PlatformResult SoundManager::UnsetSoundModeChangeListener() { - LoggerD("Enter"); + ScopeLogger(); soundModeListener = nullptr; if (!soundModeChangeListening) { return PlatformResult(ErrorCode::NO_ERROR); @@ -382,10 +383,12 @@ PlatformResult SoundManager::UnsetSoundModeChangeListener() { } PlatformResult SoundManager::SetVolumeChangeListener() { - LoggerD("Enter"); + ScopeLogger(); if (!is_volume_change_listener_) { int ret = sound_manager_add_volume_changed_cb( [](sound_type_e type, unsigned int value, void* ud) { + ScopeLogger( + "Entered into asynchronous function, sound_manager_add_volume_changed_cb's argument"); return static_cast(ud)->VolumeChangeCallback(type, value); }, static_cast(this), &volume_change_listener_id_); @@ -403,7 +406,7 @@ PlatformResult SoundManager::SetVolumeChangeListener() { } PlatformResult SoundManager::UnsetVolumeChangeListener() { - LoggerD("Enter"); + ScopeLogger(); if (!is_volume_change_listener_) { return PlatformResult(ErrorCode::NO_ERROR); } @@ -421,7 +424,7 @@ PlatformResult SoundManager::UnsetVolumeChangeListener() { } void SoundManager::GetDeviceList(sound_device_mask_e mask, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); sound_device_list_h device_list = nullptr; sound_device_h device = nullptr; @@ -460,7 +463,7 @@ void SoundManager::GetDeviceList(sound_device_mask_e mask, picojson::object& out PlatformResult SoundManager::GetDeviceInfo(sound_device_h device, bool is_connected, bool check_connection, picojson::object* obj) { - LoggerD("Entered"); + ScopeLogger(); // get id int id = 0; @@ -524,7 +527,7 @@ PlatformResult SoundManager::GetDeviceInfo(sound_device_h device, bool is_connec PlatformResult SoundManager::IsDeviceConnected(sound_device_type_e type, sound_device_io_direction_e direction, picojson::object* obj) { - LoggerD("Entered"); + ScopeLogger(); sound_device_mask_e mask = SOUND_DEVICE_ALL_MASK; switch (direction) { @@ -578,7 +581,7 @@ PlatformResult SoundManager::IsDeviceConnected(sound_device_type_e type, } void SoundManager::DeviceChangeCB(sound_device_h device, bool is_connected, bool check_connection) { - LoggerD("Entered"); + ScopeLogger(); picojson::value response = picojson::value(picojson::object()); picojson::object& response_obj = response.get(); @@ -590,6 +593,7 @@ void SoundManager::DeviceChangeCB(sound_device_h device, bool is_connected, bool std::make_pair("listenerId", picojson::value("SoundDeviceStateChangeCallback"))); auto call_response = [this, response]() -> void { + ScopeLogger("Entered into asynchronous function, call_response"); Instance::PostMessage(&instance_, response.serialize().c_str()); }; @@ -598,21 +602,21 @@ void SoundManager::DeviceChangeCB(sound_device_h device, bool is_connected, bool } void DeviceConnectionChangedCB(sound_device_h device, bool is_connected, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); SoundManager* h = static_cast(user_data); h->DeviceChangeCB(device, is_connected, false); } void DeviceStateChangedCB(sound_device_h device, sound_device_state_e unused, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); SoundManager* h = static_cast(user_data); h->DeviceChangeCB(device, false, true); } PlatformResult SoundManager::AddDeviceStateChangeListener() { - LoggerD("Entered"); + ScopeLogger(); int ret = SOUND_MANAGER_ERROR_NONE; sound_device_mask_e mask = SOUND_DEVICE_ALL_MASK; @@ -643,7 +647,7 @@ PlatformResult SoundManager::AddDeviceStateChangeListener() { } PlatformResult SoundManager::RemoveDeviceStateChangeListener() { - LoggerD("Entered"); + ScopeLogger(); if (is_sound_device_change_listener_) { int ret = diff --git a/src/systeminfo/systeminfo-utils.cpp b/src/systeminfo/systeminfo-utils.cpp index d273da34..88822809 100644 --- a/src/systeminfo/systeminfo-utils.cpp +++ b/src/systeminfo/systeminfo-utils.cpp @@ -37,6 +37,7 @@ using common::PlatformResult; using common::ErrorCode; PlatformResult SysteminfoUtils::GetVconfInt(const char *key, int *value) { + ScopeLogger(); if (0 == vconf_get_int(key, value)) { LoggerD("value[%s]: %d", key, *value); return PlatformResult(ErrorCode::NO_ERROR); @@ -47,6 +48,7 @@ PlatformResult SysteminfoUtils::GetVconfInt(const char *key, int *value) { PlatformResult SysteminfoUtils::GetRuntimeInfoString(system_settings_key_e key, std::string *platform_string) { + ScopeLogger(); char *platform_c_string; int err = system_settings_get_value_string(key, &platform_c_string); if (SYSTEM_SETTINGS_ERROR_NONE == err) { @@ -62,6 +64,7 @@ PlatformResult SysteminfoUtils::GetRuntimeInfoString(system_settings_key_e key, } PlatformResult SysteminfoUtils::CheckTelephonySupport() { + ScopeLogger(); bool supported = false; PlatformResult ret = SystemInfoDeviceCapability::GetValueBool("tizen.org/feature/network.telephony", &supported); @@ -76,6 +79,7 @@ PlatformResult SysteminfoUtils::CheckTelephonySupport() { } PlatformResult SysteminfoUtils::CheckCameraFlashSupport() { + ScopeLogger(); bool supported = false; PlatformResult ret = SystemInfoDeviceCapability::GetValueBool("tizen.org/feature/camera.back.flash", &supported); @@ -90,7 +94,7 @@ PlatformResult SysteminfoUtils::CheckCameraFlashSupport() { } PlatformResult SysteminfoUtils::CheckIfEthernetNetworkSupported() { - LoggerD("Entered"); + ScopeLogger(); connection_h connection_handle = nullptr; connection_ethernet_state_e connection_state = CONNECTION_ETHERNET_STATE_DEACTIVATED; @@ -115,7 +119,7 @@ PlatformResult SysteminfoUtils::CheckIfEthernetNetworkSupported() { } PlatformResult SysteminfoUtils::GetTotalMemory(long long *result) { - LoggerD("Entered"); + ScopeLogger(); unsigned int value = 0; @@ -133,7 +137,7 @@ PlatformResult SysteminfoUtils::GetTotalMemory(long long *result) { } PlatformResult SysteminfoUtils::GetAvailableMemory(long long *result) { - LoggerD("Entered"); + ScopeLogger(); unsigned int value = 0; @@ -151,6 +155,7 @@ PlatformResult SysteminfoUtils::GetAvailableMemory(long long *result) { PlatformResult SysteminfoUtils::RegisterVconfCallback(const char *in_key, vconf_callback_fn cb, void *event_ptr) { + ScopeLogger(); if (0 != vconf_notify_key_changed(in_key, cb, event_ptr)) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to register vconf callback", ("Failed to register vconf callback: %s", in_key)); @@ -159,6 +164,7 @@ PlatformResult SysteminfoUtils::RegisterVconfCallback(const char *in_key, vconf_ } PlatformResult SysteminfoUtils::UnregisterVconfCallback(const char *in_key, vconf_callback_fn cb) { + ScopeLogger(); if (0 != vconf_ignore_key_changed(in_key, cb)) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to unregister vconf callback", ("Failed to unregister vconf callback: %s", in_key)); @@ -169,6 +175,7 @@ PlatformResult SysteminfoUtils::UnregisterVconfCallback(const char *in_key, vcon PlatformResult SysteminfoUtils::RegisterTapiChangeCallback(TapiHandle *handle, const char *noti_id, tapi_notification_cb callback, void *user_data) { + ScopeLogger(); int ntv_ret = tel_register_noti_event(handle, noti_id, callback, user_data); if (TAPI_API_SUCCESS != ntv_ret) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to register tapi callback", @@ -180,6 +187,7 @@ PlatformResult SysteminfoUtils::RegisterTapiChangeCallback(TapiHandle *handle, c PlatformResult SysteminfoUtils::UnregisterTapiChangeCallback(TapiHandle *handle, const char *noti_id) { + ScopeLogger(); int ntv_ret = tel_deregister_noti_event(handle, noti_id); if (TAPI_API_SUCCESS != ntv_ret) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Failed to unregister tapi callback", diff --git a/src/systeminfo/systeminfo_device_capability.cc b/src/systeminfo/systeminfo_device_capability.cc index ad3a61a9..5f537ee1 100644 --- a/src/systeminfo/systeminfo_device_capability.cc +++ b/src/systeminfo/systeminfo_device_capability.cc @@ -86,6 +86,7 @@ const char* kTizenFeaturePlatformVersionName = "http://tizen.org/feature/platfor } // namespace PlatformResult SystemInfoDeviceCapability::GetValueBool(const char* key, bool* value) { + ScopeLogger(); bool platform_result = false; int ret = system_info_get_platform_bool(key, &platform_result); if (SYSTEM_INFO_ERROR_NONE != ret) { @@ -105,6 +106,7 @@ PlatformResult SystemInfoDeviceCapability::GetValueBool(const char* key, bool* v } PlatformResult SystemInfoDeviceCapability::GetValueInt(const char* key, int* value) { + ScopeLogger(); int platform_result = 0; int ret = system_info_get_platform_int(key, &platform_result); if (SYSTEM_INFO_ERROR_NONE != ret) { @@ -124,6 +126,7 @@ PlatformResult SystemInfoDeviceCapability::GetValueInt(const char* key, int* val } PlatformResult SystemInfoDeviceCapability::GetValueString(const char* key, std::string* str_value) { + ScopeLogger(); char* value = nullptr; int ret = system_info_get_platform_string(key, &value); @@ -150,7 +153,7 @@ PlatformResult SystemInfoDeviceCapability::GetValueString(const char* key, std:: static PlatformResult CheckStringCapability(const std::string& key, std::string* value, bool* fetched) { - LoggerD("Entered CheckStringCapability"); + ScopeLogger(); *fetched = false; if (kTizenFeatureOpenglesTextureFormat == key) { PlatformResult ret = SystemInfoDeviceCapability::GetOpenglesTextureFormat(value); @@ -203,7 +206,7 @@ static PlatformResult CheckStringCapability(const std::string& key, std::string* } static PlatformResult CheckBoolCapability(const std::string& key, bool* bool_value, bool* fetched) { - LoggerD("Entered CheckBoolCapability"); + ScopeLogger(); *fetched = false; if (kTizenFeatureBluetoothAlwaysOn == key) { *bool_value = SystemInfoDeviceCapability::IsBluetoothAlwaysOn(); @@ -233,7 +236,7 @@ static PlatformResult CheckBoolCapability(const std::string& key, bool* bool_val static PlatformResult CheckIntCapability(const std::string& key, std::string* value, bool* fetched) { - LoggerD("Entered CheckIntCapability"); + ScopeLogger(); int result = 0; if (key == kTizenFeatureCpuFrequency) { PlatformResult ret = SystemInfoDeviceCapability::GetPlatformCoreCpuFrequency(&result); @@ -260,7 +263,7 @@ static PlatformResult CheckIntCapability(const std::string& key, std::string* va PlatformResult SystemInfoDeviceCapability::GetCapability(const std::string& key, picojson::value* result) { - LoggerD("Entered"); + ScopeLogger(); picojson::object& result_obj = result->get(); std::string value = ""; @@ -305,6 +308,7 @@ PlatformResult SystemInfoDeviceCapability::GetCapability(const std::string& key, } PlatformResult SystemInfoDeviceCapability::IsInputKeyboardLayout(bool* result) { + ScopeLogger(); std::string input_keyboard_layout = ""; PlatformResult ret = GetValueString("tizen.org/feature/input.keyboard.layout", &input_keyboard_layout); @@ -329,6 +333,7 @@ PlatformResult SystemInfoDeviceCapability::IsInputKeyboardLayout(bool* result) { } PlatformResult SystemInfoDeviceCapability::GetOpenglesTextureFormat(std::string* result) { + ScopeLogger(); bool bool_result = false; PlatformResult ret = GetValueBool("tizen.org/feature/opengles", &bool_result); if (!bool_result) { @@ -411,6 +416,7 @@ PlatformResult SystemInfoDeviceCapability::GetOpenglesTextureFormat(std::string* } PlatformResult SystemInfoDeviceCapability::GetPlatfomCoreCpuArch(std::string* return_value) { + ScopeLogger(); std::string result; bool bool_result = false; std::string arch = ""; @@ -468,6 +474,7 @@ PlatformResult SystemInfoDeviceCapability::GetPlatfomCoreCpuArch(std::string* re } PlatformResult SystemInfoDeviceCapability::GetPlatfomCoreFpuArch(std::string* return_value) { + ScopeLogger(); std::string result; bool bool_result = false; PlatformResult ret = GetValueBool("tizen.org/feature/platform.core.fpu.arch.sse2", &bool_result); @@ -529,6 +536,7 @@ PlatformResult SystemInfoDeviceCapability::GetPlatfomCoreFpuArch(std::string* re } PlatformResult SystemInfoDeviceCapability::GetProfile(std::string* return_value) { + ScopeLogger(); std::string profile = ""; PlatformResult ret = GetValueString("tizen.org/feature/profile", &profile); if (ret.IsError()) { @@ -552,6 +560,7 @@ PlatformResult SystemInfoDeviceCapability::GetProfile(std::string* return_value) } bool SystemInfoDeviceCapability::IsBluetoothAlwaysOn() { + ScopeLogger(); #ifdef PROFILE_MOBILE_FULL return false; #elif PROFILE_MOBILE @@ -570,7 +579,7 @@ bool SystemInfoDeviceCapability::IsScreen() { } PlatformResult SystemInfoDeviceCapability::GetPlatformCoreCpuFrequency(int* return_value) { - LoggerD("Entered"); + ScopeLogger(); std::string freq; std::string file_name; @@ -613,17 +622,17 @@ PlatformResult SystemInfoDeviceCapability::GetPlatformCoreCpuFrequency(int* retu } PlatformResult SystemInfoDeviceCapability::IsNativeOspCompatible(bool* result) { - LoggerD("Enter"); + ScopeLogger(); return GetValueBool(kTizenFeaturePlatformNativeOspCompatible, result); } PlatformResult SystemInfoDeviceCapability::GetNativeAPIVersion(std::string* return_value) { - LoggerD("Enter"); + ScopeLogger(); return GetValueString(kTizenFeaturePlatformNativeApiVersion, return_value); } PlatformResult SystemInfoDeviceCapability::GetPlatformVersionName(std::string* result) { - LoggerD("Enter"); + ScopeLogger(); // Because of lack of 'http://tizen.org/feature/platform.version.name' // key on platform we use 'http://tizen.org/system/platform.name'. diff --git a/src/systeminfo/systeminfo_instance.cc b/src/systeminfo/systeminfo_instance.cc index 56cbc77d..f8818d79 100644 --- a/src/systeminfo/systeminfo_instance.cc +++ b/src/systeminfo/systeminfo_instance.cc @@ -50,7 +50,7 @@ const std::string kPrivilegeLED = "http://tizen.org/privilege/led"; } SysteminfoInstance::SysteminfoInstance() : manager_(this) { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -75,11 +75,11 @@ SysteminfoInstance::SysteminfoInstance() : manager_(this) { } SysteminfoInstance::~SysteminfoInstance() { - LoggerD("Entered"); + ScopeLogger(); } void SysteminfoInstance::GetCapabilities(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: getCapabilities() is deprecated and will be removed from next release. " "Use getCapability() instead."); @@ -88,49 +88,49 @@ void SysteminfoInstance::GetCapabilities(const picojson::value& args, picojson:: } void SysteminfoInstance::GetCapability(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.GetCapability(args, &out); } void SysteminfoInstance::GetPropertyValue(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.GetPropertyValue(args, &out); } void SysteminfoInstance::GetPropertyValueArray(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.GetPropertyValueArray(args, &out); } void SysteminfoInstance::AddPropertyValueChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.AddPropertyValueChangeListener(args, &out); } void SysteminfoInstance::RemovePropertyValueChangeListener(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.RemovePropertyValueChangeListener(args, &out); } void SysteminfoInstance::GetTotalMemory(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.GetTotalMemory(args, &out); } void SysteminfoInstance::GetAvailableMemory(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.GetAvailableMemory(args, &out); } void SysteminfoInstance::GetCount(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); manager_.GetCount(args, &out); } void SysteminfoInstance::SetBrightness(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeLED, &out); CHECK_EXIST(args, "brightness", out) @@ -154,7 +154,7 @@ void SysteminfoInstance::SetBrightness(const picojson::value& args, picojson::ob } void SysteminfoInstance::GetBrightness(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeLED, &out); int brightness = 0; @@ -170,7 +170,7 @@ void SysteminfoInstance::GetBrightness(const picojson::value& args, picojson::ob } void SysteminfoInstance::GetMaxBrightness(const picojson::value& args, picojson::object& out) { - LoggerD("entered"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeLED, &out); int brightness = 0; diff --git a/src/systeminfo/systeminfo_manager.cc b/src/systeminfo/systeminfo_manager.cc index d816bae3..147b8848 100644 --- a/src/systeminfo/systeminfo_manager.cc +++ b/src/systeminfo/systeminfo_manager.cc @@ -123,65 +123,65 @@ const std::string kPropertyIdCameraFlash = "CAMERA_FLASH"; // Callback static functions static void OnBatteryChangedCb(keynode_t* node, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdBattery); } static gboolean OnCpuChangedCb(gpointer event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallCpuListenerCallback(); return G_SOURCE_CONTINUE; } static gboolean OnStorageChangedCb(gpointer event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallStorageListenerCallback(); return G_SOURCE_CONTINUE; } static void OnMmcChangedCb(keynode_t* node, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdStorage); } static void OnDisplayChangedCb(keynode_t* node, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdDisplay); } static void OnDeviceAutoRotationChangedCb(keynode_t* node, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdDeviceOrientation); } static void OnDeviceOrientationChangedCb(sensor_t sensor, unsigned int event_type, sensor_data_t* data, void* user_data) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(user_data); manager->CallListenerCallback(kPropertyIdDeviceOrientation); } static void OnLocaleChangedCb(keynode_t* node, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdLocale); } static void OnNetworkChangedCb(connection_type_e type, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdNetwork); } static void OnNetworkValueChangedCb(const char* ipv4_address, const char* ipv6_address, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdWifiNetwork); manager->CallListenerCallback(kPropertyIdEthernetNetwork); @@ -189,15 +189,14 @@ static void OnNetworkValueChangedCb(const char* ipv4_address, const char* ipv6_a } static void OnCellularNetworkValueChangedCb(keynode_t* node, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdCellularNetwork, kDefaultListenerIndex); } static void OnTapiValueChangedCb(TapiHandle* handle, const char* noti_id, void* data, void* user_data) { - LoggerD("Enter"); - LoggerD("Changed key: %s", noti_id); + ScopeLogger("Changed key: %s", noti_id); SysteminfoManager* manager = static_cast(user_data); int index = manager->GetChangedTapiIndex(handle); LoggerD("Changed SIM index is: %d", index); @@ -205,19 +204,19 @@ static void OnTapiValueChangedCb(TapiHandle* handle, const char* noti_id, void* } static void OnPeripheralChangedCb(keynode_t* node, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdPeripheral); } static void OnMemoryChangedCb(keynode_t* node, void* event_ptr) { - LoggerD("Enter"); + ScopeLogger(); SysteminfoManager* manager = static_cast(event_ptr); manager->CallListenerCallback(kPropertyIdMemory); } static void OnBrightnessChangedCb(device_callback_e type, void* value, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); if (type == DEVICE_CALLBACK_FLASH_BRIGHTNESS) { SysteminfoManager* manager = static_cast(user_data); manager->CallListenerCallback(kPropertyIdCameraFlash); @@ -225,7 +224,7 @@ static void OnBrightnessChangedCb(device_callback_e type, void* value, void* use } static void OnWifiLevelChangedCb(wifi_manager_rssi_level_e rssi_level, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); LoggerD("Level %d", rssi_level); SysteminfoManager* manager = static_cast(user_data); manager->SetWifiLevel(rssi_level); @@ -417,9 +416,11 @@ class SysteminfoManager::TapiManager { class SysteminfoManager::AsynchronousOperation { public: AsynchronousOperation(int count_ = 0) : count_(count_) { + ScopeLogger(); } ~AsynchronousOperation() { + ScopeLogger(); std::unique_lock lock(mutex_); while (0 != count_) { @@ -462,7 +463,7 @@ SysteminfoManager::SysteminfoManager(SysteminfoInstance* instance) storage_event_id_(0), connection_handle_(nullptr), async_op_(new AsynchronousOperation()) { - LoggerD("Entered"); + ScopeLogger(); int error = wifi_manager_initialize(&wifi_manager_); if (WIFI_MANAGER_ERROR_NONE != error) { @@ -482,7 +483,7 @@ SysteminfoManager::SysteminfoManager(SysteminfoInstance* instance) } SysteminfoManager::~SysteminfoManager() { - LoggerD("Enter"); + ScopeLogger(); DisconnectSensor(sensor_handle_); if (IsListenerRegistered(kPropertyIdBattery)) { @@ -541,7 +542,7 @@ SysteminfoManager::~SysteminfoManager() { } void SysteminfoManager::GetCapabilities(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -635,7 +636,7 @@ void SysteminfoManager::GetCapabilities(const picojson::value& args, picojson::o } void SysteminfoManager::GetCapability(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "key", out) const std::string& key = args.get("key").get(); LoggerD("Getting capability with key: %s ", key.c_str()); @@ -651,7 +652,7 @@ void SysteminfoManager::GetCapability(const picojson::value& args, picojson::obj } void SysteminfoManager::GetPropertyValue(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "property", out) const double callback_id = args.get("callbackId").get(); @@ -660,7 +661,7 @@ void SysteminfoManager::GetPropertyValue(const picojson::value& args, picojson:: auto get = [this, prop_id, callback_id](const std::shared_ptr& response) -> void { - LoggerD("Getting"); + ScopeLogger("Entered into asynchronous function, get"); picojson::value result = picojson::value(picojson::object()); PlatformResult ret = prop_manager_.GetPropertyValue(prop_id, false, &result); async_op_->finish(); @@ -673,7 +674,7 @@ void SysteminfoManager::GetPropertyValue(const picojson::value& args, picojson:: auto get_response = [this, callback_id](const std::shared_ptr& response) -> void { - LoggerD("Getting response"); + ScopeLogger("Entered into asynchronous function, get_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value{static_cast(callback_id)})); LoggerD("message: %s", response->serialize().c_str()); @@ -688,7 +689,7 @@ void SysteminfoManager::GetPropertyValue(const picojson::value& args, picojson:: } void SysteminfoManager::GetPropertyValueArray(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "property", out) const double callback_id = args.get("callbackId").get(); @@ -697,7 +698,7 @@ void SysteminfoManager::GetPropertyValueArray(const picojson::value& args, picoj auto get = [this, prop_id, callback_id](const std::shared_ptr& response) -> void { - LoggerD("Getting"); + ScopeLogger("Entered into asynchronous function, get"); picojson::value result = picojson::value(picojson::object()); PlatformResult ret = prop_manager_.GetPropertyValue(prop_id, true, &result); @@ -711,7 +712,7 @@ void SysteminfoManager::GetPropertyValueArray(const picojson::value& args, picoj auto get_response = [this, callback_id](const std::shared_ptr& response) -> void { - LoggerD("Getting response"); + ScopeLogger("Entered into asynchronous function, get_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(instance_, response->serialize().c_str()); @@ -725,7 +726,7 @@ void SysteminfoManager::GetPropertyValueArray(const picojson::value& args, picoj } void SysteminfoManager::GetTotalMemory(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -743,7 +744,7 @@ void SysteminfoManager::GetTotalMemory(const picojson::value& args, picojson::ob } void SysteminfoManager::GetAvailableMemory(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -761,7 +762,7 @@ void SysteminfoManager::GetAvailableMemory(const picojson::value& args, picojson } void SysteminfoManager::GetCount(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_EXIST(args, "property", out) const std::string& property = args.get("property").get(); LoggerD("Getting count of property with id: %s ", property.c_str()); @@ -782,7 +783,7 @@ void SysteminfoManager::GetCount(const picojson::value& args, picojson::object* void SysteminfoManager::AddPropertyValueChangeListener(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); // Check type of property for which listener should be registered CHECK_EXIST(args, "property", out) const std::string& property_name = args.get("property").get(); @@ -843,7 +844,7 @@ void SysteminfoManager::AddPropertyValueChangeListener(const picojson::value& ar void SysteminfoManager::RemovePropertyValueChangeListener(const picojson::value& args, picojson::object* out) { - LoggerD("Enter"); + ScopeLogger(); // Check type of property for which listener should be removed CHECK_EXIST(args, "property", out) @@ -909,14 +910,14 @@ void SysteminfoManager::RemovePropertyValueChangeListener(const picojson::value& } bool SysteminfoManager::IsIpChangeCallbackNotRegistered() { - LoggerD("Entered"); + ScopeLogger(); return !(IsListenerRegistered(kPropertyIdWifiNetwork) || IsListenerRegistered(kPropertyIdEthernetNetwork) || IsListenerRegistered(kPropertyIdCellularNetwork)); } PlatformResult SysteminfoManager::RegisterIpChangeCallback() { - LoggerD("Entered"); + ScopeLogger(); connection_h handle; PlatformResult ret(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(GetConnectionHandle(handle)) @@ -931,7 +932,7 @@ PlatformResult SysteminfoManager::RegisterIpChangeCallback() { } PlatformResult SysteminfoManager::UnregisterIpChangeCallback() { - LoggerD("Entered"); + ScopeLogger(); connection_h handle; PlatformResult ret(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(GetConnectionHandle(handle)) @@ -945,7 +946,7 @@ PlatformResult SysteminfoManager::UnregisterIpChangeCallback() { } PlatformResult SysteminfoManager::RegisterBatteryListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(SysteminfoUtils::RegisterVconfCallback(VCONFKEY_SYSMAN_BATTERY_CAPACITY, OnBatteryChangedCb, this)) @@ -956,7 +957,7 @@ PlatformResult SysteminfoManager::RegisterBatteryListener() { } PlatformResult SysteminfoManager::UnregisterBatteryListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_SYSMAN_BATTERY_CAPACITY, OnBatteryChangedCb)) @@ -967,7 +968,7 @@ PlatformResult SysteminfoManager::UnregisterBatteryListener() { } PlatformResult SysteminfoManager::RegisterCpuListener() { - LoggerD("Entered"); + ScopeLogger(); cpu_event_id_ = g_timeout_add_seconds(kPropertyWatcherTime, OnCpuChangedCb, static_cast(this)); LoggerD("Added callback for CPU"); @@ -975,7 +976,7 @@ PlatformResult SysteminfoManager::RegisterCpuListener() { } PlatformResult SysteminfoManager::UnregisterCpuListener() { - LoggerD("Entered"); + ScopeLogger(); g_source_remove(cpu_event_id_); cpu_event_id_ = 0; LoggerD("Removed callback for CPU"); @@ -983,7 +984,7 @@ PlatformResult SysteminfoManager::UnregisterCpuListener() { } PlatformResult SysteminfoManager::RegisterStorageListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR( SysteminfoUtils::RegisterVconfCallback(VCONFKEY_SYSMAN_MMC_STATUS, OnMmcChangedCb, this)) @@ -995,7 +996,7 @@ PlatformResult SysteminfoManager::RegisterStorageListener() { } PlatformResult SysteminfoManager::UnregisterStorageListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR( SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_SYSMAN_MMC_STATUS, OnMmcChangedCb)) @@ -1007,7 +1008,7 @@ PlatformResult SysteminfoManager::UnregisterStorageListener() { } PlatformResult SysteminfoManager::RegisterDisplayListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(SysteminfoUtils::RegisterVconfCallback(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, OnDisplayChangedCb, this)) @@ -1016,7 +1017,7 @@ PlatformResult SysteminfoManager::RegisterDisplayListener() { } PlatformResult SysteminfoManager::UnregisterDisplayListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR( SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_SETAPPL_LCD_BRIGHTNESS, OnDisplayChangedCb)) @@ -1025,7 +1026,7 @@ PlatformResult SysteminfoManager::UnregisterDisplayListener() { } PlatformResult SysteminfoManager::RegisterDeviceOrientationListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(SysteminfoUtils::RegisterVconfCallback( VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, OnDeviceAutoRotationChangedCb, this)) @@ -1044,7 +1045,7 @@ PlatformResult SysteminfoManager::RegisterDeviceOrientationListener() { } PlatformResult SysteminfoManager::UnregisterDeviceOrientationListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(SysteminfoUtils::UnregisterVconfCallback( VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, OnDeviceAutoRotationChangedCb)) @@ -1060,7 +1061,7 @@ PlatformResult SysteminfoManager::UnregisterDeviceOrientationListener() { } PlatformResult SysteminfoManager::RegisterLocaleListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR( SysteminfoUtils::RegisterVconfCallback(VCONFKEY_REGIONFORMAT, OnLocaleChangedCb, this)) @@ -1071,7 +1072,7 @@ PlatformResult SysteminfoManager::RegisterLocaleListener() { } PlatformResult SysteminfoManager::UnregisterLocaleListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR( SysteminfoUtils::UnregisterVconfCallback(VCONFKEY_REGIONFORMAT, OnLocaleChangedCb)) @@ -1083,7 +1084,7 @@ PlatformResult SysteminfoManager::UnregisterLocaleListener() { } PlatformResult SysteminfoManager::RegisterNetworkListener() { - LoggerD("Entered"); + ScopeLogger(); connection_h handle; PlatformResult ret(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(GetConnectionHandle(handle)) @@ -1099,7 +1100,7 @@ PlatformResult SysteminfoManager::RegisterNetworkListener() { } PlatformResult SysteminfoManager::UnregisterNetworkListener() { - LoggerD("Entered"); + ScopeLogger(); connection_h handle; PlatformResult ret(ErrorCode::NO_ERROR); CHECK_LISTENER_ERROR(GetConnectionHandle(handle)) @@ -1114,7 +1115,7 @@ PlatformResult SysteminfoManager::UnregisterNetworkListener() { } PlatformResult SysteminfoManager::RegisterWifiNetworkListener() { - LoggerD("Entered"); + ScopeLogger(); if (IsIpChangeCallbackNotRegistered()) { PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); @@ -1127,7 +1128,7 @@ PlatformResult SysteminfoManager::RegisterWifiNetworkListener() { } PlatformResult SysteminfoManager::UnregisterWifiNetworkListener() { - LoggerD("Entered"); + ScopeLogger(); // if there is no other ip-relateded listeners left, unregister if (IsIpChangeCallbackNotRegistered()) { PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); @@ -1141,7 +1142,7 @@ PlatformResult SysteminfoManager::UnregisterWifiNetworkListener() { } PlatformResult SysteminfoManager::RegisterEthernetNetworkListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = SysteminfoUtils::CheckIfEthernetNetworkSupported(); if (ret.IsError()) { return ret; @@ -1159,7 +1160,7 @@ PlatformResult SysteminfoManager::RegisterEthernetNetworkListener() { } PlatformResult SysteminfoManager::UnregisterEthernetNetworkListener() { - LoggerD("Entered"); + ScopeLogger(); if (IsIpChangeCallbackNotRegistered()) { PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); @@ -1173,7 +1174,7 @@ PlatformResult SysteminfoManager::UnregisterEthernetNetworkListener() { } PlatformResult SysteminfoManager::RegisterCellularNetworkListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = SysteminfoUtils::CheckTelephonySupport(); if (ret.IsError()) { return ret; @@ -1198,7 +1199,7 @@ PlatformResult SysteminfoManager::RegisterCellularNetworkListener() { } PlatformResult SysteminfoManager::UnregisterCellularNetworkListener() { - LoggerD("Entered"); + ScopeLogger(); // if there is no other ip-relateded listeners left, unregister if (!IsListenerRegistered(kPropertyIdCellularNetwork)) { @@ -1221,7 +1222,7 @@ PlatformResult SysteminfoManager::UnregisterCellularNetworkListener() { } PlatformResult SysteminfoManager::RegisterPeripheralListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); int value = 0; /* if (-1 != vconf_get_int(VCONFKEY_MIRACAST_WFD_SOURCE_STATUS, &value)) { @@ -1238,7 +1239,7 @@ PlatformResult SysteminfoManager::RegisterPeripheralListener() { } PlatformResult SysteminfoManager::UnregisterPeripheralListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); int value = 0; /* if (-1 != vconf_get_int(VCONFKEY_MIRACAST_WFD_SOURCE_STATUS, &value)) { @@ -1255,7 +1256,7 @@ PlatformResult SysteminfoManager::UnregisterPeripheralListener() { } PlatformResult SysteminfoManager::RegisterMemoryListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); int value = 0; if (-1 != vconf_get_int(VCONFKEY_SYSMAN_LOW_MEMORY, &value)) { @@ -1267,7 +1268,7 @@ PlatformResult SysteminfoManager::RegisterMemoryListener() { } PlatformResult SysteminfoManager::UnregisterMemoryListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); int value = 0; if (-1 != vconf_get_int(VCONFKEY_SYSMAN_LOW_MEMORY, &value)) { @@ -1279,7 +1280,7 @@ PlatformResult SysteminfoManager::UnregisterMemoryListener() { } PlatformResult SysteminfoManager::RegisterCameraFlashListener() { - LoggerD("Entered"); + ScopeLogger(); int ret = device_add_callback(DEVICE_CALLBACK_FLASH_BRIGHTNESS, OnBrightnessChangedCb, this); if (DEVICE_ERROR_NONE != ret) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error occured", @@ -1289,7 +1290,7 @@ PlatformResult SysteminfoManager::RegisterCameraFlashListener() { } PlatformResult SysteminfoManager::UnregisterCameraFlashListener() { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = PlatformResult(ErrorCode::NO_ERROR); int ntv_ret = device_remove_callback(DEVICE_CALLBACK_FLASH_BRIGHTNESS, OnBrightnessChangedCb); if (DEVICE_ERROR_NONE != ntv_ret) { @@ -1302,7 +1303,7 @@ PlatformResult SysteminfoManager::UnregisterCameraFlashListener() { } void SysteminfoManager::SetBrightness(const picojson::value& args, picojson::object* out) { - LoggerD("entered"); + ScopeLogger(); CHECK_EXIST(args, "brightness", out) @@ -1318,7 +1319,7 @@ void SysteminfoManager::SetBrightness(const picojson::value& args, picojson::obj } void SysteminfoManager::GetBrightness(const picojson::value& args, picojson::object* out) { - LoggerD("entered"); + ScopeLogger(); int brightness = 0; int result = device_flash_get_brightness(&brightness); @@ -1332,7 +1333,7 @@ void SysteminfoManager::GetBrightness(const picojson::value& args, picojson::obj } void SysteminfoManager::GetMaxBrightness(const picojson::value& args, picojson::object* out) { - LoggerD("entered"); + ScopeLogger(); int brightness = 0; int result = device_flash_get_max_brightness(&brightness); @@ -1347,7 +1348,7 @@ void SysteminfoManager::GetMaxBrightness(const picojson::value& args, picojson:: PlatformResult SysteminfoManager::GetPropertyCount(const std::string& property, unsigned long* count) { - LoggerD("Enter"); + ScopeLogger(); if ("BATTERY" == property || "CPU" == property || "STORAGE" == property || "DISPLAY" == property || "DEVICE_ORIENTATION" == property || "BUILD" == property || @@ -1379,17 +1380,17 @@ PlatformResult SysteminfoManager::GetPropertyCount(const std::string& property, } wifi_manager_rssi_level_e SysteminfoManager::GetWifiLevel() { - LoggerD("Enter"); + ScopeLogger(); return wifi_level_; } void SysteminfoManager::SetWifiLevel(wifi_manager_rssi_level_e level) { - LoggerD("Entered"); + ScopeLogger(); wifi_level_ = level; } int SysteminfoManager::GetSensorHandle() { - LoggerD("Enter"); + ScopeLogger(); std::lock_guard lock(sensor_mutex_); if (sensor_handle_ < 0) { LoggerD("Connecting to sensor"); @@ -1401,7 +1402,7 @@ int SysteminfoManager::GetSensorHandle() { } PlatformResult SysteminfoManager::ConnectSensor(int* result) { - LoggerD("Entered"); + ScopeLogger(); sensor_t sensor = sensord_get_sensor(AUTO_ROTATION_SENSOR); int handle_orientation = sensord_connect(sensor); if (handle_orientation < 0) { @@ -1420,9 +1421,9 @@ PlatformResult SysteminfoManager::ConnectSensor(int* result) { } void SysteminfoManager::DisconnectSensor(int handle_orientation) { - LoggerD("Enter"); + ScopeLogger(); if (handle_orientation >= 0) { - LoggerD("Entered"); + ScopeLogger(); bool state = sensord_stop(handle_orientation); LoggerD("sensord_stop() returned state = %d", state); state = sensord_disconnect(handle_orientation); @@ -1433,17 +1434,17 @@ void SysteminfoManager::DisconnectSensor(int handle_orientation) { } void SysteminfoManager::SetCpuInfoLoad(double load) { - LoggerD("Enter"); + ScopeLogger(); cpu_load_ = load; } void SysteminfoManager::SetAvailableCapacityInternal(unsigned long long capacity) { - LoggerD("Entered"); + ScopeLogger(); available_capacity_internal_ = capacity; } void SysteminfoManager::SetAvailableCapacityMmc(unsigned long long capacity) { - LoggerD("Entered"); + ScopeLogger(); available_capacity_mmc_ = capacity; } @@ -1473,7 +1474,7 @@ PlatformResult SysteminfoManager::FetchBasicSimProperties( } void SysteminfoManager::InitCameraTypes() { - LoggerD("Enter"); + ScopeLogger(); bool supported = false; PlatformResult ret = SystemInfoDeviceCapability::GetValueBool("tizen.org/feature/camera.back.flash", &supported); @@ -1492,7 +1493,7 @@ void SysteminfoManager::InitCameraTypes() { } std::string SysteminfoManager::GetCameraTypes(unsigned int index) { - LoggerD("Enter"); + ScopeLogger(); if (index >= camera_types_.size()) { return ""; } @@ -1500,12 +1501,12 @@ std::string SysteminfoManager::GetCameraTypes(unsigned int index) { } unsigned int SysteminfoManager::GetCameraTypesCount() { - LoggerD("Enter"); + ScopeLogger(); return camera_types_.size(); } PlatformResult SysteminfoManager::GetConnectionHandle(connection_h& handle) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(connection_mutex_); if (nullptr == connection_handle_) { int error = connection_create(&connection_handle_); @@ -1520,13 +1521,13 @@ PlatformResult SysteminfoManager::GetConnectionHandle(connection_h& handle) { } bool SysteminfoManager::IsListenerRegistered(const std::string& property_id) { - LoggerD("Entered"); + ScopeLogger(); return (registered_listeners_.find(property_id) != registered_listeners_.end()); } void SysteminfoManager::PostListenerResponse(const std::string& property_id, const picojson::value& result, int property_index) { - LoggerD("Entered"); + ScopeLogger(); const std::shared_ptr& response = std::shared_ptr(new picojson::value(picojson::object())); response->get()[kPropertyIdString] = picojson::value(property_id); @@ -1540,7 +1541,7 @@ void SysteminfoManager::PostListenerResponse(const std::string& property_id, } void SysteminfoManager::CallListenerCallback(const std::string& property_id, int property_index) { - LoggerD("Enter"); + ScopeLogger(); if (IsListenerRegistered(property_id)) { LoggerD("listener for %s property is registered, calling it", property_id.c_str()); @@ -1555,7 +1556,7 @@ void SysteminfoManager::CallListenerCallback(const std::string& property_id, int } void SysteminfoManager::CallCpuListenerCallback() { - LoggerD("Enter"); + ScopeLogger(); std::string property_id = kPropertyIdCpu; if (IsListenerRegistered(property_id)) { LoggerD("listener for %s property is registered, calling it", property_id.c_str()); @@ -1575,7 +1576,7 @@ void SysteminfoManager::CallCpuListenerCallback() { } void SysteminfoManager::CallStorageListenerCallback() { - LoggerD("Enter"); + ScopeLogger(); std::string property_id = kPropertyIdStorage; if (IsListenerRegistered(property_id)) { LoggerD("listener for %s property is registered, calling it", property_id.c_str()); diff --git a/src/systeminfo/systeminfo_properties_manager.cc b/src/systeminfo/systeminfo_properties_manager.cc index 5a495b5f..1868a245 100644 --- a/src/systeminfo/systeminfo_properties_manager.cc +++ b/src/systeminfo/systeminfo_properties_manager.cc @@ -97,17 +97,17 @@ const char* kConnectionOn = "ON"; SysteminfoPropertiesManager::SysteminfoPropertiesManager(SysteminfoManager& manager) : manager_(manager) { - LoggerD("Entered"); + ScopeLogger(); } SysteminfoPropertiesManager::~SysteminfoPropertiesManager() { - LoggerD("Entered"); + ScopeLogger(); } PlatformResult SysteminfoPropertiesManager::GetPropertyValue(const std::string& property, bool is_array_type, picojson::value* res) { - LoggerD("Entered getPropertyValue"); + ScopeLogger(); if (!is_array_type) { picojson::object& res_obj = res->get(); @@ -148,7 +148,7 @@ PlatformResult SysteminfoPropertiesManager::GetPropertyValue(const std::string& PlatformResult SysteminfoPropertiesManager::ReportProperty(const std::string& property, int index, picojson::object* res_obj) { - LoggerD("Entered"); + ScopeLogger(); if ("BATTERY" == property) { return ReportBattery(res_obj); } else if ("CPU" == property) { @@ -190,7 +190,7 @@ PlatformResult SysteminfoPropertiesManager::ReportProperty(const std::string& pr /// BATTERY PlatformResult SysteminfoPropertiesManager::ReportBattery(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); int value = 0; int ret = vconf_get_int(VCONFKEY_SYSMAN_BATTERY_CAPACITY, &value); if (kVconfErrorNone != ret) { @@ -214,7 +214,7 @@ PlatformResult SysteminfoPropertiesManager::ReportBattery(picojson::object* out) /// CPU PlatformResult SysteminfoPropertiesManager::ReportCpu(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); static CpuInfo cpu_info; FILE* fp = nullptr; fp = fopen("/proc/stat", "r"); @@ -262,7 +262,7 @@ PlatformResult SysteminfoPropertiesManager::ReportCpu(picojson::object* out) { /// DISPLAY PlatformResult SysteminfoPropertiesManager::ReportDisplay(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); int screenWidth = 0; int screenHeight = 0; int dotsPerInchWidth = 0; @@ -342,7 +342,7 @@ PlatformResult SysteminfoPropertiesManager::ReportDisplay(picojson::object* out) /// DEVICE_ORIENTATION PlatformResult SysteminfoPropertiesManager::FetchIsAutoRotation(bool* result) { - LoggerD("Entered"); + ScopeLogger(); int is_auto_rotation = 0; if (0 == vconf_get_bool(VCONFKEY_SETAPPL_AUTO_ROTATE_SCREEN_BOOL, &is_auto_rotation)) { @@ -359,7 +359,7 @@ PlatformResult SysteminfoPropertiesManager::FetchIsAutoRotation(bool* result) { } PlatformResult SysteminfoPropertiesManager::FetchStatus(std::string* result) { - LoggerD("Entered"); + ScopeLogger(); int rotation = 0; std::string status = kOrientationPortraitPrimary; @@ -404,7 +404,7 @@ PlatformResult SysteminfoPropertiesManager::FetchStatus(std::string* result) { } PlatformResult SysteminfoPropertiesManager::ReportDeviceOrientation(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); bool is_auto_rotation = false; std::string status = ""; @@ -421,7 +421,7 @@ PlatformResult SysteminfoPropertiesManager::ReportDeviceOrientation(picojson::ob /// BUILD PlatformResult SysteminfoPropertiesManager::ReportBuild(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); std::string model = ""; PlatformResult ret = SystemInfoDeviceCapability::GetValueString("tizen.org/system/model_name", &model); @@ -447,7 +447,7 @@ PlatformResult SysteminfoPropertiesManager::ReportBuild(picojson::object* out) { /// LOCALE PlatformResult SysteminfoPropertiesManager::ReportLocale(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); std::string str_language = ""; PlatformResult ret = SysteminfoUtils::GetRuntimeInfoString(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &str_language); @@ -468,7 +468,7 @@ PlatformResult SysteminfoPropertiesManager::ReportLocale(picojson::object* out) /// NETWORK static PlatformResult GetNetworkTypeString(NetworkType type, std::string& type_string) { - LoggerD("Entered"); + ScopeLogger(); switch (type) { case kNone: type_string = kNetworkTypeNone; @@ -506,7 +506,7 @@ static PlatformResult GetNetworkTypeString(NetworkType type, std::string& type_s PlatformResult SysteminfoPropertiesManager::ReportNetwork(picojson::object* out, unsigned long count) { - LoggerD("Entered with index property %d", count); + ScopeLogger("index property %d", count); connection_h connection_handle = nullptr; connection_type_e connection_type = CONNECTION_TYPE_DISCONNECTED; int networkType = 0; @@ -579,7 +579,7 @@ PlatformResult SysteminfoPropertiesManager::ReportNetwork(picojson::object* out, /// WIFI_NETWORK static PlatformResult GetIpsWifi(wifi_manager_ap_h wifi_ap_handle, std::string* ip_addr_str, std::string* ipv6_addr_str) { - LoggerD("Entered"); + ScopeLogger(); // getting ipv4 address char* ip_addr = nullptr; int error = @@ -609,7 +609,7 @@ static PlatformResult GetIpsWifi(wifi_manager_ap_h wifi_ap_handle, std::string* /// CELLULAR_NETWORK and ETHERNET_NETWORK static PlatformResult GetIpsFromProfile(connection_profile_h profile_handle, std::string* ip_addr_str, std::string* ipv6_addr_str) { - LoggerD("Entered"); + ScopeLogger(); // getting ipv4 address char* ip_addr = nullptr; int error = @@ -639,7 +639,7 @@ static PlatformResult GetIpsFromProfile(connection_profile_h profile_handle, } PlatformResult SysteminfoPropertiesManager::ReportWifiNetwork(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); bool result_status = false; std::string result_ssid; @@ -773,7 +773,7 @@ PlatformResult SysteminfoPropertiesManager::ReportWifiNetwork(picojson::object* /// ETHERNET_NETWORK PlatformResult SysteminfoPropertiesManager::ReportEthernetNetwork(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); std::string result_cable; std::string result_status; @@ -908,7 +908,7 @@ PlatformResult SysteminfoPropertiesManager::ReportEthernetNetwork(picojson::obje static PlatformResult FetchConnection(std::string* result_status, std::string* result_apn, std::string* result_ip_address, std::string* result_ipv6_address) { - LoggerD("Entered"); + ScopeLogger(); connection_type_e connection_type = CONNECTION_TYPE_DISCONNECTED; connection_profile_h profile_handle = nullptr; connection_h connection_handle = nullptr; @@ -986,7 +986,7 @@ static PlatformResult FetchConnection(std::string* result_status, std::string* r PlatformResult SysteminfoPropertiesManager::ReportCellularNetwork(picojson::object* out, unsigned long count) { - LoggerD("Entered with index property %d", count); + ScopeLogger("index property %lu", count); PlatformResult ret = SysteminfoUtils::CheckTelephonySupport(); if (ret.IsError()) { return ret; @@ -1032,7 +1032,7 @@ PlatformResult SysteminfoPropertiesManager::ReportCellularNetwork(picojson::obje /// NET_PROXY_NETWORK PlatformResult SysteminfoPropertiesManager::ReportNetProxyNetwork(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); connection_type_e connection_type = CONNECTION_TYPE_DISCONNECTED; connection_h connection_handle = nullptr; std::string result_status; @@ -1068,7 +1068,7 @@ PlatformResult SysteminfoPropertiesManager::ReportNetProxyNetwork(picojson::obje /// SIM PlatformResult SysteminfoPropertiesManager::ReportSim(picojson::object* out, unsigned long count) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult ret = SysteminfoUtils::CheckTelephonySupport(); if (ret.IsError()) { return ret; @@ -1078,7 +1078,7 @@ PlatformResult SysteminfoPropertiesManager::ReportSim(picojson::object* out, uns /// PERIPHERAL PlatformResult SysteminfoPropertiesManager::ReportPeripheral(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); /* int wireless_display_status = 0; PlatformResult ret = GetVconfInt(VCONFKEY_MIRACAST_WFD_SOURCE_STATUS, &wireless_display_status); if (ret.IsSuccess()) { @@ -1102,7 +1102,7 @@ PlatformResult SysteminfoPropertiesManager::ReportPeripheral(picojson::object* o /// MEMORY PlatformResult SysteminfoPropertiesManager::ReportMemory(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); std::string state = kMemoryStateNormal; int status = 0; PlatformResult ret = SysteminfoUtils::GetVconfInt(VCONFKEY_SYSMAN_LOW_MEMORY, &status); @@ -1123,7 +1123,7 @@ PlatformResult SysteminfoPropertiesManager::ReportMemory(picojson::object* out) } static void CreateStorageInfo(const std::string& type, struct statvfs& fs, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); out->insert(std::make_pair("type", picojson::value(type))); out->insert(std::make_pair( "capacity", picojson::value(std::to_string(static_cast(fs.f_frsize) * @@ -1152,7 +1152,7 @@ static std::string FromStorageTypeToStringType(common::StorageType type) { } PlatformResult SysteminfoPropertiesManager::ReportStorage(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); struct statvfs fs; picojson::value result = picojson::value(picojson::array()); @@ -1191,7 +1191,7 @@ PlatformResult SysteminfoPropertiesManager::ReportStorage(picojson::object* out) PlatformResult SysteminfoPropertiesManager::ReportCameraFlash(picojson::object* out, unsigned long index) { - LoggerD("Entered"); + ScopeLogger(); if (index < manager_.GetCameraTypesCount()) { std::string camera = manager_.GetCameraTypes(index); out->insert(std::make_pair("camera", picojson::value(camera))); @@ -1205,7 +1205,7 @@ PlatformResult SysteminfoPropertiesManager::ReportCameraFlash(picojson::object* /// ADS PlatformResult SysteminfoPropertiesManager::ReportAds(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); std::string ads_id = ""; PlatformResult ret = SysteminfoUtils::GetRuntimeInfoString(SYSTEM_SETTINGS_KEY_ADS_ID, &ads_id); if (ret.IsError()) { diff --git a/src/systeminfo/systeminfo_sim_details_manager.cc b/src/systeminfo/systeminfo_sim_details_manager.cc index 0ad13fc8..3fb1c228 100644 --- a/src/systeminfo/systeminfo_sim_details_manager.cc +++ b/src/systeminfo/systeminfo_sim_details_manager.cc @@ -35,7 +35,7 @@ const char* kSimStatusNetworkLocked = "NETWORK_LOCKED"; const char* kSimStatusUnknown = "UNKNOWN"; void SimCphsValueCallback(TapiHandle* /*handle*/, int result, void* data, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); SimDetailsManager* sim_mgr = static_cast(user_data); TelSimAccessResult_t access_rt = static_cast(result); TelSimCphsNetName_t* cphs_info = static_cast(data); @@ -56,7 +56,7 @@ void SimCphsValueCallback(TapiHandle* /*handle*/, int result, void* data, void* } void SimMsisdnValueCallback(TapiHandle* /*handle*/, int result, void* data, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); SimDetailsManager* sim_mgr = static_cast(user_data); TelSimAccessResult_t access_rt = static_cast(result); TelSimMsisdnList_t* msisdn_info = static_cast(data); @@ -81,7 +81,7 @@ void SimMsisdnValueCallback(TapiHandle* /*handle*/, int result, void* data, void } void SimSpnValueCallback(TapiHandle* /*handle*/, int result, void* data, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); SimDetailsManager* sim_mgr = static_cast(user_data); TelSimAccessResult_t access_rt = static_cast(result); TelSimSpn_t* spn_info = static_cast(data); @@ -98,7 +98,7 @@ void SimSpnValueCallback(TapiHandle* /*handle*/, int result, void* data, void* u } void SimIccidValueCallback(TapiHandle* /*handle*/, int result, void* data, void* user_data) { - LoggerD("Entered"); + ScopeLogger(); SimDetailsManager* sim_mgr = static_cast(user_data); TelSimAccessResult_t access_rt = static_cast(result); TelSimIccIdInfo_t* iccid_info = static_cast(data); @@ -132,10 +132,11 @@ SimDetailsManager::SimDetailsManager() spn_(""), sim_result_obj_(nullptr), to_process_(0) { + ScopeLogger(); } PlatformResult SimDetailsManager::GatherSimInformation(TapiHandle* handle, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard first_lock_sim(sim_info_mutex_); ResetSimHolder(out); @@ -243,7 +244,7 @@ PlatformResult SimDetailsManager::FetchBasicSimProperties( } void SimDetailsManager::FetchSimState(TapiHandle* tapi_handle) { - LoggerD("Entered"); + ScopeLogger(); if (nullptr == tapi_handle) { LoggerE("Tapi handle is null"); state_ = kSimStatusUnknown; @@ -286,7 +287,7 @@ void SimDetailsManager::FetchSimState(TapiHandle* tapi_handle) { } PlatformResult SimDetailsManager::FetchSimSyncProps(TapiHandle* tapi_handle) { - LoggerD("Entered"); + ScopeLogger(); TelSimImsiInfo_t imsi; int error = tel_get_sim_imsi(tapi_handle, &imsi); if (TAPI_API_SUCCESS == error) { @@ -303,7 +304,7 @@ PlatformResult SimDetailsManager::FetchSimSyncProps(TapiHandle* tapi_handle) { } void SimDetailsManager::ResetSimHolder(picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); sim_result_obj_ = out; to_process_ = 0; mcc_ = 0; @@ -317,7 +318,7 @@ void SimDetailsManager::ResetSimHolder(picojson::object* out) { } void SimDetailsManager::ReturnSimToJS() { - LoggerD("Entered"); + ScopeLogger(); if (nullptr != sim_result_obj_) { sim_result_obj_->insert(std::make_pair("state", picojson::value(state_))); sim_result_obj_->insert(std::make_pair("operatorName", picojson::value(operator_name_))); @@ -335,7 +336,7 @@ void SimDetailsManager::ReturnSimToJS() { } void SimDetailsManager::TryReturn() { - LoggerD("Entered"); + ScopeLogger(); if (0 == to_process_) { LoggerD("Returning property to JS"); ReturnSimToJS(); @@ -346,7 +347,7 @@ void SimDetailsManager::TryReturn() { } void SimDetailsManager::set_operator_name(const std::string& name) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(sim_to_process_mutex_); operator_name_ = name; --to_process_; @@ -354,7 +355,7 @@ void SimDetailsManager::set_operator_name(const std::string& name) { }; void SimDetailsManager::set_msisdn(const std::string& msisdn) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(sim_to_process_mutex_); this->msisdn_ = msisdn; --to_process_; @@ -362,7 +363,7 @@ void SimDetailsManager::set_msisdn(const std::string& msisdn) { }; void SimDetailsManager::set_spn(const std::string& spn) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(sim_to_process_mutex_); this->spn_ = spn; --to_process_; @@ -370,7 +371,7 @@ void SimDetailsManager::set_spn(const std::string& spn) { }; void SimDetailsManager::set_iccid(const std::string& iccid) { - LoggerD("Entered"); + ScopeLogger(); std::lock_guard lock(sim_to_process_mutex_); this->iccid_ = iccid; --to_process_; diff --git a/src/systemsetting/systemsetting_instance.cc b/src/systemsetting/systemsetting_instance.cc index 64fb7d37..8b28ba7c 100644 --- a/src/systemsetting/systemsetting_instance.cc +++ b/src/systemsetting/systemsetting_instance.cc @@ -42,7 +42,7 @@ using namespace common; using namespace extension::systemsetting; SystemSettingInstance::SystemSettingInstance() { - LoggerD("Enter"); + ScopeLogger(); using std::placeholders::_1; using std::placeholders::_2; @@ -55,18 +55,18 @@ SystemSettingInstance::SystemSettingInstance() { } SystemSettingInstance::~SystemSettingInstance() { - LoggerD("Enter"); + ScopeLogger(); } void SystemSettingInstance::getProperty(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); const double callback_id = args.get("callbackId").get(); const std::string& type = args.get("type").get(); LoggerD("Getting property type: %s ", type.c_str()); auto get = [this, type](const std::shared_ptr& response) -> void { - LoggerD("Getting platform value"); + ScopeLogger("Entered into asynchronous function, get"); picojson::value result = picojson::value(picojson::object()); PlatformResult status = getPlatformPropertyValue(type, &result); if (status.IsSuccess()) { @@ -79,7 +79,7 @@ void SystemSettingInstance::getProperty(const picojson::value& args, picojson::o auto get_response = [this, callback_id](const std::shared_ptr& response) -> void { - LoggerD("Getting response"); + ScopeLogger("Entered into asynchronous function, get_response"); picojson::object& obj = response->get(); obj.insert(std::make_pair("callbackId", picojson::value(callback_id))); Instance::PostMessage(this, response->serialize().c_str()); @@ -92,7 +92,7 @@ void SystemSettingInstance::getProperty(const picojson::value& args, picojson::o PlatformResult SystemSettingInstance::getPlatformPropertyValue(const std::string& settingType, picojson::value* out) { - LoggerD("Enter"); + ScopeLogger(); picojson::object& result_obj = out->get(); int ret = SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; @@ -125,7 +125,7 @@ PlatformResult SystemSettingInstance::getPlatformPropertyValue(const std::string } void SystemSettingInstance::setProperty(const picojson::value& args, picojson::object& out) { - LoggerD("Enter"); + ScopeLogger(); CHECK_PRIVILEGE_ACCESS(kPrivilegeSetting, &out); @@ -139,7 +139,7 @@ void SystemSettingInstance::setProperty(const picojson::value& args, picojson::o auto get = [this, type, value, callback_id](const std::shared_ptr& response) -> void { - LoggerD("Setting platform value"); + ScopeLogger("Entered into asynchronous function, get"); std::string real_path = common::FilesystemProvider::Create().GetRealPath(value); PlatformResult status = setPlatformPropertyValue(type, real_path); picojson::object& obj = response->get(); @@ -159,7 +159,7 @@ void SystemSettingInstance::setProperty(const picojson::value& args, picojson::o PlatformResult SystemSettingInstance::setPlatformPropertyValue(const std::string& settingType, const std::string& settingValue) { - LoggerD("Enter"); + ScopeLogger(); int ret = SYSTEM_SETTINGS_ERROR_INVALID_PARAMETER; if (settingType == SETTING_HOME_SCREEN) { ret = system_settings_set_value_string(SYSTEM_SETTINGS_KEY_WALLPAPER_HOME_SCREEN, diff --git a/src/time/time_extension.cc b/src/time/time_extension.cc index 769a6f49..607347dd 100644 --- a/src/time/time_extension.cc +++ b/src/time/time_extension.cc @@ -8,7 +8,7 @@ #include "time/time_instance.h" common::Extension* CreateExtension() { - LoggerD("Entered"); + ScopeLogger(); return new TimeExtension; } @@ -16,7 +16,7 @@ common::Extension* CreateExtension() { extern const char kSource_time_api[]; TimeExtension::TimeExtension() { - LoggerD("Entered"); + ScopeLogger(); SetExtensionName("tizen.time"); SetJavaScriptAPI(kSource_time_api); @@ -25,10 +25,10 @@ TimeExtension::TimeExtension() { } TimeExtension::~TimeExtension() { - LoggerD("Entered"); + ScopeLogger(); } common::Instance* TimeExtension::CreateInstance() { - LoggerD("Entered"); + ScopeLogger(); return new extension::time::TimeInstance(); } diff --git a/src/time/time_instance.cc b/src/time/time_instance.cc index 5fc4db05..5ef0a2af 100644 --- a/src/time/time_instance.cc +++ b/src/time/time_instance.cc @@ -17,7 +17,7 @@ TimeInstance::TimeInstance() : manager_(this) { using std::placeholders::_1; using std::placeholders::_2; - LoggerD("Entered"); + ScopeLogger(); #define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&TimeInstance::x, this, _1, _2)); #define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&TimeInstance::x, this, _1, _2)); @@ -47,12 +47,12 @@ TimeInstance::TimeInstance() : manager_(this) { } TimeInstance::~TimeInstance() { - LoggerD("Entered"); + ScopeLogger(); } void TimeInstance::TimeUtil_getAvailableTimezones(const picojson::value& /*args*/, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); picojson::value result = picojson::value(picojson::object()); picojson::object& result_obj = result.get(); @@ -68,7 +68,7 @@ void TimeInstance::TimeUtil_getAvailableTimezones(const picojson::value& /*args* } void TimeInstance::TimeUtil_getDateFormat(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); if (!args.contains("shortformat")) { LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out, ("Required parameter \"shortformat\" is missing")); @@ -92,7 +92,7 @@ void TimeInstance::TimeUtil_getDateFormat(const picojson::value& args, picojson: void TimeInstance::TimeUtil_getTimeFormat(const picojson::value& /* args */, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); std::string format; PlatformResult res = TimeUtilTools::GetTimeFormat(&format); if (res.IsError()) { @@ -109,7 +109,7 @@ void TimeInstance::TimeUtil_getTimeFormat(const picojson::value& /* args */, void TimeInstance::TimeUtil_setDateTimeChangeListener(const picojson::value& /*args*/, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult res = manager_.RegisterVconfCallback(kTimeChange); if (res.IsError()) { LogAndReportError(res, &out, ("Failed to set date-time change listener.")); @@ -119,7 +119,7 @@ void TimeInstance::TimeUtil_setDateTimeChangeListener(const picojson::value& /*a void TimeInstance::TimeUtil_unsetDateTimeChangeListener(const picojson::value& /*args*/, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult res = manager_.UnregisterVconfCallback(kTimeChange); if (res.IsError()) { LogAndReportError(res, &out, ("Failed to remove date-time change listener.")); @@ -129,7 +129,7 @@ void TimeInstance::TimeUtil_unsetDateTimeChangeListener(const picojson::value& / void TimeInstance::TimeUtil_setTimezoneChangeListener(const picojson::value& /*args*/, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult res = manager_.RegisterVconfCallback(kTimezoneChange); if (res.IsError()) { LogAndReportError(res, &out, ("Failed to set timezone change listener.")); @@ -139,7 +139,7 @@ void TimeInstance::TimeUtil_setTimezoneChangeListener(const picojson::value& /*a void TimeInstance::TimeUtil_unsetTimezoneChangeListener(const picojson::value& /*args*/, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); PlatformResult res = manager_.UnregisterVconfCallback(kTimezoneChange); if (res.IsError()) { LogAndReportError(res, &out, ("Failed to remove timezone change listener.")); @@ -148,7 +148,7 @@ void TimeInstance::TimeUtil_unsetTimezoneChangeListener(const picojson::value& / } void TimeInstance::TZDate_getLocalTimezone(const picojson::value& /*args*/, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); std::string local_timezone = TimeManager::GetDefaultTimezone(); @@ -160,7 +160,7 @@ void TimeInstance::TZDate_getLocalTimezone(const picojson::value& /*args*/, pico } void TimeInstance::TZDate_GetTimezoneOffset(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); if (!args.contains("timezone") || !args.contains("timestamp")) { LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out, ("Required parameters are missing: \"timezone\", \"timestamp\"")); @@ -188,7 +188,7 @@ void TimeInstance::TZDate_GetTimezoneOffset(const picojson::value& args, picojso void TimeInstance::ToStringTemplate(const picojson::value& args, bool use_locale_fmt, TimeUtilTools::DateTimeFormatType type, picojson::object* out) { - LoggerD("Entered"); + ScopeLogger(); if (!args.contains("timezone") || !args.contains("timestamp")) { LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), out, ("Required parameters are missing: \"timezone\", \"timestamp\"")); @@ -217,38 +217,38 @@ void TimeInstance::ToStringTemplate(const picojson::value& args, bool use_locale } void TimeInstance::TZDate_toLocaleDateString(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ToStringTemplate(args, true, TimeUtilTools::DateTimeFormatType::kDateFormat, &out); } void TimeInstance::TZDate_toLocaleTimeString(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ToStringTemplate(args, true, TimeUtilTools::DateTimeFormatType::kTimeFormat, &out); } void TimeInstance::TZDate_toLocaleString(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ToStringTemplate(args, true, TimeUtilTools::DateTimeFormatType::kDateTimeFormat, &out); } void TimeInstance::TZDate_toDateString(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ToStringTemplate(args, false, TimeUtilTools::DateTimeFormatType::kDateFormat, &out); } void TimeInstance::TZDate_toTimeString(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ToStringTemplate(args, false, TimeUtilTools::DateTimeFormatType::kTimeFormat, &out); } void TimeInstance::TZDate_toString(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); ToStringTemplate(args, false, TimeUtilTools::DateTimeFormatType::kDateTimeFormat, &out); } void TimeInstance::TZDate_getTimezoneAbbreviation(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); LoggerW( "DEPRECATION WARNING: getTimezoneAbbreviation() is deprecated and will be removed from next " "release."); @@ -279,7 +279,7 @@ void TimeInstance::TZDate_getTimezoneAbbreviation(const picojson::value& args, } void TimeInstance::TZDate_isDST(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); if (!args.contains("timezone") || !args.contains("timestamp")) { LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out, ("Required parameters are missing: \"timezone\", \"timestamp\"")); @@ -305,7 +305,7 @@ void TimeInstance::TZDate_isDST(const picojson::value& args, picojson::object& o void TimeInstance::TZDate_getPreviousDSTTransition(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); if (!args.contains("timezone") || !args.contains("timestamp")) { LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out, ("Required parameters are missing: \"timezone\", \"timestamp\"")); @@ -327,7 +327,7 @@ void TimeInstance::TZDate_getPreviousDSTTransition(const picojson::value& args, } void TimeInstance::TZDate_getNextDSTTransition(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); if (!args.contains("timezone") || !args.contains("timestamp")) { LogAndReportError(PlatformResult(ErrorCode::INVALID_VALUES_ERR, "Invalid parameter passed."), &out, ("Required parameters are missing: \"timezone\", \"timestamp\"")); diff --git a/src/time/time_manager.cc b/src/time/time_manager.cc index 1c38da6f..1d32c23f 100644 --- a/src/time/time_manager.cc +++ b/src/time/time_manager.cc @@ -35,11 +35,11 @@ TimeManager::TimeManager(TimeInstance* instance) current_timezone_(GetDefaultTimezone()), is_time_listener_registered_(false), is_timezone_listener_registered_(false) { - LoggerD("Entered"); + ScopeLogger(); } TimeManager::~TimeManager() { - LoggerD("Entered"); + ScopeLogger(); if (is_time_listener_registered_) { UnregisterVconfCallback(kTimeChange); } @@ -51,7 +51,7 @@ TimeManager::~TimeManager() { PlatformResult TimeManager::GetTimezoneOffset(const std::string& timezone_id, const std::string& timestamp_str, std::string* offset, std::string* modifier) { - LoggerD("Entered"); + ScopeLogger(); std::unique_ptr unicode_id(new UnicodeString(timezone_id.c_str())); std::unique_ptr tz(TimeZone::createTimeZone(*unicode_id)); @@ -91,7 +91,7 @@ PlatformResult TimeManager::GetTimezoneOffset(const std::string& timezone_id, } PlatformResult TimeManager::RegisterVconfCallback(ListenerType type) { - LoggerD("Entered"); + ScopeLogger(); if (!is_time_listener_registered_ && !is_timezone_listener_registered_) { LoggerD("registering listener on platform"); if (0 != vconf_notify_key_changed(VCONFKEY_SYSTEM_TIME_CHANGED, OnTimeChangedCallback, this)) { @@ -116,7 +116,7 @@ PlatformResult TimeManager::RegisterVconfCallback(ListenerType type) { } PlatformResult TimeManager::UnregisterVconfCallback(ListenerType type) { - LoggerD("Entered"); + ScopeLogger(); switch (type) { case kTimeChange: is_time_listener_registered_ = false; @@ -141,7 +141,7 @@ PlatformResult TimeManager::UnregisterVconfCallback(ListenerType type) { } void TimeManager::OnTimeChangedCallback(keynode_t* /*node*/, void* event_ptr) { - LoggerD("Entered"); + ScopeLogger(); TimeManager* manager = static_cast(event_ptr); TimeInstance* instance = manager->GetTimeInstance(); std::string defaultTimezone = GetDefaultTimezone(); @@ -165,7 +165,7 @@ void TimeManager::OnTimeChangedCallback(keynode_t* /*node*/, void* event_ptr) { } std::string TimeManager::GetDefaultTimezone() { - LoggerD("Entered"); + ScopeLogger(); std::unique_ptr tz(TimeZone::createDefault()); @@ -186,17 +186,14 @@ std::string TimeManager::GetDefaultTimezone() { } std::string TimeManager::GetCurrentTimezone() { - LoggerD("Entered"); return current_timezone_; } void TimeManager::SetCurrentTimezone(const std::string& new_timezone) { - LoggerD("Entered"); current_timezone_ = new_timezone; } TimeInstance* TimeManager::GetTimeInstance() { - LoggerD("Entered"); return instance_; } diff --git a/src/time/time_utils.cc b/src/time/time_utils.cc index 3f1d4462..b8e35a3d 100644 --- a/src/time/time_utils.cc +++ b/src/time/time_utils.cc @@ -34,7 +34,7 @@ namespace time { UDate TimeUtilTools::GetDSTTransition(UDate timestamp, const std::shared_ptr& timezone_id, DSTTransition tr_type) { - LoggerD("Entered"); + ScopeLogger(); UBool result = false; UDate dst_transition_date = timestamp; std::unique_ptr vtz(VTimeZone::createVTimeZoneByID(*timezone_id)); @@ -61,7 +61,7 @@ UDate TimeUtilTools::GetDSTTransition(UDate timestamp, PlatformResult TimeUtilTools::IsDST(UDate timestamp, const std::shared_ptr& timezone_id, bool* result_bool) { - LoggerD("Entered"); + ScopeLogger(); UErrorCode ec = U_ZERO_ERROR; std::unique_ptr tz(TimeZone::createTimeZone(*timezone_id)); std::unique_ptr calendar(Calendar::createInstance(*tz, ec)); @@ -86,7 +86,7 @@ PlatformResult TimeUtilTools::IsDST(UDate timestamp, PlatformResult TimeUtilTools::GetTimezoneAbbreviation( UDate date, const std::shared_ptr& timezone_id, std::string* result_string) { - LoggerD("Entered"); + ScopeLogger(); UErrorCode ec = U_ZERO_ERROR; UnicodeString str; @@ -117,7 +117,7 @@ PlatformResult TimeUtilTools::ToStringHelper(UDate date, bool use_locale_fmt, TimeUtilTools::DateTimeFormatType type, std::string* result_string) { - LoggerD("Entered"); + ScopeLogger(); UErrorCode ec = U_ZERO_ERROR; UnicodeString str; @@ -142,7 +142,7 @@ PlatformResult TimeUtilTools::ToStringHelper(UDate date, PlatformResult TimeUtilTools::ToUTF8String(const UnicodeString& uni_str, std::string* result_string) { - LoggerD("Entered"); + ScopeLogger(); int buffer_len = sizeof(UChar) * static_cast(uni_str.length()) + 1; std::unique_ptr result_buffer(static_cast(malloc(buffer_len)), @@ -165,12 +165,12 @@ PlatformResult TimeUtilTools::ToUTF8String(const UnicodeString& uni_str, } UnicodeString* TimeUtilTools::ToUnicodeString(const std::string& str) { - LoggerD("Entered"); + ScopeLogger(); return new UnicodeString(str.c_str()); } PlatformResult TimeUtilTools::GetLocalTimeZone(std::string* result_string) { - LoggerD("Entered"); + ScopeLogger(); UnicodeString id; std::unique_ptr zone(TimeZone::createDefault()); zone->getID(id); @@ -184,7 +184,7 @@ PlatformResult TimeUtilTools::GetLocalTimeZone(std::string* result_string) { } Locale* TimeUtilTools::GetDefaultLocale() { - LoggerD("Entered"); + ScopeLogger(); char* tempstr = vconf_get_str(VCONFKEY_REGIONFORMAT); if (nullptr == tempstr) { @@ -213,7 +213,7 @@ Locale* TimeUtilTools::GetDefaultLocale() { } UnicodeString TimeUtilTools::GetDateTimeFormat(DateTimeFormatType type, bool use_locale_fmt) { - LoggerD("Entered"); + ScopeLogger(); UErrorCode ec = U_ZERO_ERROR; Locale* default_locale = GetDefaultLocale(); @@ -270,7 +270,7 @@ UnicodeString TimeUtilTools::GetDateTimeFormat(DateTimeFormatType type, bool use } PlatformResult TimeUtilTools::GetDateFormat(bool shortformat, std::string* result_string) { - LoggerD("Entered"); + ScopeLogger(); UnicodeString time_format = TimeUtilTools::GetDateTimeFormat( (shortformat ? DateTimeFormatType::kDateShortFormat : DateTimeFormatType::kDateFormat), true); time_format = time_format.findAndReplace("E", "D"); @@ -303,7 +303,7 @@ PlatformResult TimeUtilTools::GetDateFormat(bool shortformat, std::string* resul } PlatformResult TimeUtilTools::GetTimeFormat(std::string* result_string) { - LoggerD("Entered"); + ScopeLogger(); UnicodeString time_format = TimeUtilTools::GetDateTimeFormat(DateTimeFormatType::kTimeFormat, true); time_format = time_format.findAndReplace("H", "h"); @@ -328,7 +328,7 @@ PlatformResult TimeUtilTools::GetTimeFormat(std::string* result_string) { } PlatformResult TimeUtilTools::GetAvailableTimezones(picojson::array* available_timezones) { - LoggerD("Entered"); + ScopeLogger(); UErrorCode ec = U_ZERO_ERROR; std::unique_ptr tz_enum(TimeZone::createEnumeration()); const char* str = nullptr; diff --git a/src/tvinputdevice/tvinputdevice_instance.cc b/src/tvinputdevice/tvinputdevice_instance.cc index 068a9de7..3983ef94 100644 --- a/src/tvinputdevice/tvinputdevice_instance.cc +++ b/src/tvinputdevice/tvinputdevice_instance.cc @@ -21,11 +21,11 @@ namespace extension { namespace tvinputdevice { TVInputDeviceInstance::TVInputDeviceInstance() { - LoggerD("Enter"); + ScopeLogger(); } TVInputDeviceInstance::~TVInputDeviceInstance() { - LoggerD("Enter"); + ScopeLogger(); } } // namespace tvinputdevice diff --git a/src/utils/utils_extension.cc b/src/utils/utils_extension.cc index 7840e5a1..0b9d7a65 100644 --- a/src/utils/utils_extension.cc +++ b/src/utils/utils_extension.cc @@ -11,21 +11,21 @@ extern const char kSource_utils_api[]; common::Extension* CreateExtension() { - LoggerD("Entered"); + ScopeLogger(); return new UtilsExtension; } UtilsExtension::UtilsExtension() { - LoggerD("Entered"); + ScopeLogger(); SetExtensionName("xwalk"); SetJavaScriptAPI(kSource_utils_api); } UtilsExtension::~UtilsExtension() { - LoggerD("Entered"); + ScopeLogger(); } common::Instance* UtilsExtension::CreateInstance() { - LoggerD("Entered"); + ScopeLogger(); return new extension::utils::UtilsInstance(); } diff --git a/src/utils/utils_instance.cc b/src/utils/utils_instance.cc index 5f0eaeeb..65f5995a 100644 --- a/src/utils/utils_instance.cc +++ b/src/utils/utils_instance.cc @@ -23,7 +23,7 @@ UtilsInstance::UtilsInstance() { using std::placeholders::_1; using std::placeholders::_2; - LoggerD("Entered"); + ScopeLogger(); #define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&UtilsInstance::x, this, _1, _2)); #define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&UtilsInstance::x, this, _1, _2)); @@ -39,7 +39,7 @@ UtilsInstance::UtilsInstance() { } void UtilsInstance::GetPkgApiVersion(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); std::string api_version; PlatformResult ret = common::tools::GetPkgApiVersion(&api_version); @@ -50,7 +50,7 @@ void UtilsInstance::GetPkgApiVersion(const picojson::value& args, picojson::obje } void UtilsInstance::CheckPrivilegeAccess(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& privilege = args.get("privilege").to_str(); CHECK_PRIVILEGE_ACCESS(privilege, &out); ReportSuccess(out); @@ -58,7 +58,7 @@ void UtilsInstance::CheckPrivilegeAccess(const picojson::value& args, picojson:: void UtilsInstance::CheckBackwardCompabilityPrivilegeAccess(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& current_priv = args.get("current_privilege").to_str(); const auto& prev_priv = args.get("previous_privilege").to_str(); @@ -79,7 +79,7 @@ const double kTwoPow64 = 18446744073709551616.0; } // namespace void UtilsInstance::ToLongLong(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& n = args.get("n"); long long output = 0; @@ -98,7 +98,7 @@ void UtilsInstance::ToLongLong(const picojson::value& args, picojson::object& ou } void UtilsInstance::ToUnsignedLongLong(const picojson::value& args, picojson::object& out) { - LoggerD("Entered"); + ScopeLogger(); const auto& n = args.get("n"); unsigned long long output = 0; diff --git a/src/websetting/websetting_extension.cc b/src/websetting/websetting_extension.cc index c84f7a0a..beaf01e5 100644 --- a/src/websetting/websetting_extension.cc +++ b/src/websetting/websetting_extension.cc @@ -24,16 +24,16 @@ common::Extension* CreateExtension() { } WebSettingExtension::WebSettingExtension() { - LoggerD("Entered"); + ScopeLogger(); SetExtensionName("tizen.websetting"); SetJavaScriptAPI(kSource_websetting_api); } WebSettingExtension::~WebSettingExtension() { - LoggerD("Entered"); + ScopeLogger(); } common::Instance* WebSettingExtension::CreateInstance() { - LoggerD("Entered"); + ScopeLogger(); return new common::ParsedInstance(); } diff --git a/src/widgetservice/widgetservice_instance.cc b/src/widgetservice/widgetservice_instance.cc index eb1232dc..51545543 100644 --- a/src/widgetservice/widgetservice_instance.cc +++ b/src/widgetservice/widgetservice_instance.cc @@ -150,7 +150,7 @@ int WidgetLifecycleCb(const char* widget_id, widget_lifecycle_event_e lifecycle_ } void bundleIterator(const char* key, const char* val, void* data) { - LOGD("Entered, adding key-pair value: (%s) - (%s)", key, val); + ScopeLogger("adding key-pair value: %s; val: %s", key, val); auto obj = static_cast(data); obj->insert(std::make_pair(key, picojson::value(val))); } @@ -232,6 +232,7 @@ TizenResult WidgetServiceInstance::GetWidgets(const picojson::object& args, } auto get_widgets = [this, pkgid](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, get_widget"); int ret = WIDGET_ERROR_NONE; picojson::value response{picojson::array{}}; auto* array = &response.get(); @@ -342,6 +343,7 @@ TizenResult WidgetServiceInstance::GetInstances(picojson::object const& args, const auto& widget_id = args.find(kWidgetId)->second.get(); auto get_instances = [this, widget_id](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, get_instances"); picojson::value response{picojson::array{}}; auto* array = &response.get(); @@ -408,6 +410,7 @@ TizenResult WidgetServiceInstance::GetVariants(picojson::object const& args, const auto& widget_id = args.find(kWidgetId)->second.get(); auto get_variants = [this, widget_id](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, get_variants"); int count = 0; int* type_array = nullptr; int ret = widget_service_get_supported_size_types(widget_id.c_str(), &count, &type_array); @@ -603,6 +606,7 @@ TizenResult WidgetServiceInstance::GetContent(picojson::object const& args, const auto& instance_id = args.find(kInstanceId)->second.get(); auto get_content = [this, widget_id, instance_id](const common::AsyncToken& token) -> void { + ScopeLogger("Entered into asynchronous function, get_content"); bundle* bundle_data = bundle_create(); int ret = get_last_result(); -- 2.34.1