[HAM] Added logs in methods onEntered and onReturn

Change-Id: I0eb05c0febde8eb84013a0ca226a98582df02747
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>

diff --git a/src/humanactivitymonitor/humanactivitymonitor_instance.cc b/src/humanactivitymonitor/humanactivitymonitor_instance.cc
index eea1ca346d98e0bafa69b4db443c2fc73139c96d..eb266eda89d993c012a4ef8e23f3550d541b7ffa 100644 (file)
--- a/src/humanactivitymonitor/humanactivitymonitor_instance.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_instance.cc
@@ -22,6 +22,7 @@ using common::ErrorCode;
 using common::TaskQueue;
 
 HumanActivityMonitorInstance::HumanActivityMonitorInstance() {
+  LoggerD("Enter");
   using std::placeholders::_1;
   using std::placeholders::_2;
 
@@ -41,9 +42,11 @@ HumanActivityMonitorInstance::HumanActivityMonitorInstance() {
 }
 
 HumanActivityMonitorInstance::~HumanActivityMonitorInstance() {
+  LoggerD("Enter");
 }
 
 PlatformResult HumanActivityMonitorInstance::Init() {
+  LoggerD("Enter");
   if (!manager_) {
 
     manager_ = std::make_shared<HumanActivityMonitorManager>();
@@ -68,10 +71,12 @@ PlatformResult HumanActivityMonitorInstance::Init() {
 
 void HumanActivityMonitorInstance::HumanActivityMonitorManagerGetHumanActivityData(
     const picojson::value& args, picojson::object& out) {
+  LoggerD("Enter");
   CHECK_EXIST(args, "type", out)
 
   PlatformResult result = Init();
   if (!result) {
+    LoggerE("Failed: Init()");
     ReportError(result, &out);
     return;
   }
@@ -89,6 +94,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerGetHumanActivityDa
     if (result) {
       ReportSuccess(data, response_obj);
     } else {
+      LoggerE("Failed: manager_->GetHumanActivityData()");
       ReportError(result, &response_obj);
     }
 
@@ -102,10 +108,12 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerGetHumanActivityDa
 
 void HumanActivityMonitorInstance::HumanActivityMonitorManagerStart(
     const picojson::value& args, picojson::object& out) {
+  LoggerD("Enter");
   CHECK_EXIST(args, "type", out)
 
   PlatformResult result = Init();
   if (!result) {
+    LoggerE("Failed: Init()");
     ReportError(result, &out);
     return;
   }
@@ -126,16 +134,19 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerStart(
   if (result) {
     ReportSuccess(out);
   } else {
+    LoggerE("Failed: manager_->SetListener()");
     ReportError(result, &out);
   }
 }
 
 void HumanActivityMonitorInstance::HumanActivityMonitorManagerStop(
     const picojson::value& args, picojson::object& out) {
+  LoggerD("Enter");
   CHECK_EXIST(args, "type", out)
 
   PlatformResult result = Init();
   if (!result) {
+    LoggerE("Failed: Init()");
     ReportError(result, &out);
     return;
   }
@@ -144,6 +155,7 @@ void HumanActivityMonitorInstance::HumanActivityMonitorManagerStop(
   if (result) {
     ReportSuccess(out);
   } else {
+    LoggerE("Failed: manager_->UnsetListener()");
     ReportError(result, &out);
   }
 }

diff --git a/src/humanactivitymonitor/humanactivitymonitor_manager.cc b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
index db09a300c98aa8cf6a5ce66c5474a79617c0878d..9b64dcbc4c314617a90c8e292c52f9f7a506f5c5 100644 (file)
--- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc
+++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc
@@ -14,15 +14,19 @@ namespace humanactivitymonitor {
 using common::PlatformResult;
 using common::ErrorCode;
 
-HumanActivityMonitorManager::HumanActivityMonitorManager() {}
+HumanActivityMonitorManager::HumanActivityMonitorManager() {
+  LoggerD("Enter");
+}
 
 HumanActivityMonitorManager::~HumanActivityMonitorManager() {
+  LoggerD("Enter");
   UnsetWristUpListener();
   UnsetHrmListener();
   UnsetGpsListener();
 }
 
 PlatformResult HumanActivityMonitorManager::Init() {
+  LoggerD("Enter");
   return PlatformResult(ErrorCode::NO_ERROR);
 }
 
@@ -126,6 +130,7 @@ PlatformResult HumanActivityMonitorManager::GetHumanActivityData(
     const std::string& type,
     picojson::value* data) {
 
+  LoggerD("Enter");
   if (type == kActivityTypePedometer) {
     // TODO(r.galka) Not Supported in current implementation.
   }
@@ -148,6 +153,7 @@ PlatformResult HumanActivityMonitorManager::GetHumanActivityData(
 // WRIST_UP
 PlatformResult HumanActivityMonitorManager::SetWristUpListener(
     JsonCallback callback) {
+  LoggerD("Enter");
   int ret;
 
   ret = gesture_create(&gesture_handle_);
@@ -174,6 +180,7 @@ PlatformResult HumanActivityMonitorManager::SetWristUpListener(
 }
 
 PlatformResult HumanActivityMonitorManager::UnsetWristUpListener() {
+  LoggerD("Enter");
   int ret;
 
   if (gesture_handle_) {
@@ -198,6 +205,7 @@ void HumanActivityMonitorManager::OnWristUpEvent(gesture_type_e gesture,
                                                  double timestamp,
                                                  gesture_error_e error,
                                                  void* user_data) {
+  LoggerD("Enter");
   HumanActivityMonitorManager* manager =
       static_cast<HumanActivityMonitorManager*>(user_data);
 
@@ -213,6 +221,7 @@ void HumanActivityMonitorManager::OnWristUpEvent(gesture_type_e gesture,
 // HRM
 PlatformResult HumanActivityMonitorManager::SetHrmListener(
     JsonCallback callback) {
+  LoggerD("Enter");
   sensor_h hrm_sensor;
   int ret;
 
@@ -253,6 +262,7 @@ PlatformResult HumanActivityMonitorManager::SetHrmListener(
 }
 
 PlatformResult HumanActivityMonitorManager::UnsetHrmListener() {
+  LoggerD("Enter");
   int ret;
 
   if (hrm_sensor_listener_) {
@@ -315,6 +325,7 @@ static PlatformResult ConvertHrmEvent(sensor_event_s* event,
 void HumanActivityMonitorManager::OnHrmSensorEvent(
     sensor_h /*sensor*/, sensor_event_s *event, void *user_data) {
 
+  LoggerD("Enter");
   HumanActivityMonitorManager* manager =
       static_cast<HumanActivityMonitorManager*>(user_data);
 
@@ -335,6 +346,7 @@ void HumanActivityMonitorManager::OnHrmSensorEvent(
 }
 
 PlatformResult HumanActivityMonitorManager::GetHrmData(picojson::value* data) {
+  LoggerD("Enter");
   if (!hrm_sensor_listener_) {
     return PlatformResult(ErrorCode::SERVICE_NOT_AVAILABLE_ERR);
   }
@@ -362,6 +374,7 @@ PlatformResult HumanActivityMonitorManager::GetHrmData(picojson::value* data) {
 // GPS
 PlatformResult HumanActivityMonitorManager::SetGpsListener(
     JsonCallback callback) {
+  LoggerD("Enter");
   int ret;
 
   ret = location_manager_create(LOCATIONS_METHOD_GPS, &location_handle_);
@@ -395,6 +408,7 @@ PlatformResult HumanActivityMonitorManager::SetGpsListener(
 }
 
 PlatformResult HumanActivityMonitorManager::UnsetGpsListener() {
+  LoggerD("Enter");
   int ret;
 
   if (location_handle_) {
@@ -429,6 +443,7 @@ static bool ConvertGpsEvent(double latitude, double longitude, double altitude,
                             double speed, double direction, double horizontal,
                             double vertical, time_t timestamp,
                             void* user_data) {
+  LoggerD("Enter");
   picojson::array* gps_info_array = static_cast<picojson::array*>(user_data);
 
   picojson::value gps_info = picojson::value(picojson::object());
@@ -449,6 +464,7 @@ static bool ConvertGpsEvent(double latitude, double longitude, double altitude,
 
 void HumanActivityMonitorManager::OnGpsEvent(int num_of_location,
                                              void *user_data) {
+  LoggerD("Enter");
   HumanActivityMonitorManager* manager =
       static_cast<HumanActivityMonitorManager*>(user_data);
 
@@ -476,6 +492,7 @@ void HumanActivityMonitorManager::OnGpsEvent(int num_of_location,
 }
 
 PlatformResult HumanActivityMonitorManager::GetGpsData(picojson::value* data) {
+  LoggerD("Enter");
   if (!location_handle_) {
     return PlatformResult(ErrorCode::SERVICE_NOT_AVAILABLE_ERR);
   }