From af3f9372ba9afffde4fdc9d9fb41f4763ebfba28 Mon Sep 17 00:00:00 2001
From: Woochanlee <wc0917.lee@samsung.com>
Date: Thu, 8 Jul 2021 17:07:03 +0900
Subject: [PATCH] Aurum: Gets meaningful log from lib and fix build error on
 64bit system

Change-Id: I0824512b64b32034e8f6db5ef683cb33bb5f2aac
---
 .../src/Accessibility/AccessibleWatcher.cc    | 22 ++-----------------
 libaurum/src/Comparer.cc                      |  2 +-
 .../Accessibility/AtspiAccessibleWatcher.cc   |  1 -
 libaurum/src/UiDevice.cc                      |  1 +
 org.tizen.aurum-bootstrap/src/ObjectMapper.cc |  7 ------
 5 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/libaurum/src/Accessibility/AccessibleWatcher.cc b/libaurum/src/Accessibility/AccessibleWatcher.cc
index 4ff9548..b41044b 100644
--- a/libaurum/src/Accessibility/AccessibleWatcher.cc
+++ b/libaurum/src/Accessibility/AccessibleWatcher.cc
@@ -19,22 +19,6 @@ AccessibleWatcher::~AccessibleWatcher()
 {
 }
 
-/*
-void AccessibleWatcher::printDbgInformation() const
-{
-    LOG_SCOPE_F(INFO, "%d %d", mActivatedWindowList.size(),  mWindowSet.size());
-
-    for (auto iter = mActivatedWindowList.begin(); iter != mActivatedWindowList.end(); ++iter) {
-        LOG_F(INFO, "%p", *iter);
-    }
-        LOG_F(INFO, "-----------");
-
-    for (auto iter = mWindowSet.begin(); iter != mWindowSet.end(); ++iter) {
-        LOG_F(INFO, "%p", *iter);
-    }
-}
-*/
-
 AccessibleWatcher *AccessibleWatcher::getInstance(AccessibleWatcher *watcherImpl)
 {
     static AccessibleWatcher *mInstance = nullptr;
@@ -57,17 +41,15 @@ AccessibleWatcher *AccessibleWatcher::getInstance(AccessibleWatcher *watcherImpl
 
 std::vector<std::shared_ptr<AccessibleApplication>> AccessibleWatcher::getActiveApplications(void) const
 {
-    LOGI("getActiveApplications for this(%p)", this);
-
     std::vector<std::shared_ptr<AccessibleApplication>> ret{};
     auto apps = this->getApplications();
-    LOGI("apps size %d", apps.size());
+    LOGI("available app process size %d", (int)apps.size());
 
     apps.erase(std::remove_if(apps.begin(), apps.end(), [](auto app){
         return !app->isActive();
     }), apps.end());
 
-    LOGI("active apps size %d", apps.size());
+    LOGI("active apps size %d", (int)apps.size());
 
     return apps;
 }
diff --git a/libaurum/src/Comparer.cc b/libaurum/src/Comparer.cc
index 37ee045..f7300ce 100644
--- a/libaurum/src/Comparer.cc
+++ b/libaurum/src/Comparer.cc
@@ -45,7 +45,7 @@ std::vector<std::shared_ptr<AccessibleNode>> Comparer::findObjects(const std::sh
 {
     std::list<std::shared_ptr<PartialMatch>> partialList{};
     std::vector<std::shared_ptr<AccessibleNode>> ret = findObjects(root, 0, 0, partialList);
-    LOGI("%d object(s) found", ret.size());
+    LOGI("%d object(s) found", (int)ret.size());
     return ret;
 }
 
diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc
index a2aaa49..04b21b1 100644
--- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc
+++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc
@@ -253,7 +253,6 @@ std::shared_ptr<AccessibleApplication> AtspiAccessibleWatcher::getApplicationAt(
 std::vector<std::shared_ptr<AccessibleApplication>> AtspiAccessibleWatcher::getApplications(void) const
 {
     AtspiWrapper::lock();
-    LOGI("getApplications for this(%p)", this);
     std::vector<std::shared_ptr<AccessibleApplication>> ret{};
     AtspiAccessible *root = AtspiWrapper::Atspi_get_desktop(0);
     int nchild = AtspiWrapper::Atspi_accessible_get_child_count(root, NULL);
diff --git a/libaurum/src/UiDevice.cc b/libaurum/src/UiDevice.cc
index 3250661..23b78ce 100644
--- a/libaurum/src/UiDevice.cc
+++ b/libaurum/src/UiDevice.cc
@@ -55,6 +55,7 @@ std::vector<std::shared_ptr<AccessibleNode>> UiDevice::getWindowRoot() const
         auto activeWindows = app->getActiveWindows();
         std::transform(activeWindows.begin(), activeWindows.end(), std::back_inserter(ret),
             [&](std::shared_ptr<AccessibleWindow> window){
+                LOGI("Active pkg: %s, window: %s", window->getAccessibleNode()->getPkg().c_str(), window->getTitle().c_str());
                 return window->getAccessibleNode();
             }
         );
diff --git a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc
index fb741ef..0e7b7b6 100644
--- a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc
+++ b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc
@@ -77,26 +77,19 @@ void ObjectMapper::cleanUp()
     std::stringstream ss{};
 
     LOGI("clean up object map");
-    ss << "mObjectMapReverse: ";
     for(auto iter = mObjectMapReverse.begin(); iter != mObjectMapReverse.end(); ) {
 	auto obj = mObjectMap[iter->second];
         if (obj && !obj->isValid()) {
             iter = mObjectMapReverse.erase(iter);
         } else {
-            ss << "(" << iter->first << "," << iter->second << ") ";
             ++iter;
         }
     }
-    ss << std::endl;
-    ss << "mObjectMap: ";
     for(auto iter = mObjectMap.begin(); iter != mObjectMap.end(); ) {
         if (!iter->second->isValid()) {
             iter = mObjectMap.erase(iter);
         } else {
-            ss << "(" << iter->first << "," << iter->second.get() << ") ";
             ++iter;
         }
     }
-    ss << std::endl;
-    LOGI("%s", ss.str().c_str());
 }
-- 
2.34.1