From 8376a89e1f81b1f3e7ce53ea3b63f4a0a36842ee Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Tue, 6 Jul 2021 18:03:35 +0900 Subject: [PATCH] libaurum, bootstrap: change log system to dlog instead of loguru Change-Id: Ib2af00fb9cc14555e869e1fd4c568680a7695eca --- libaurum/inc/Aurum.h | 23 ++++- libaurum/src/Accessibility/AccessibleNode.cc | 4 +- libaurum/src/Accessibility/AccessibleUtils.cc | 4 +- libaurum/src/Accessibility/AccessibleWatcher.cc | 8 +- libaurum/src/Comparer.cc | 13 ++- .../src/Impl/Accessibility/AtspiAccessibleNode.cc | 66 +------------ .../Impl/Accessibility/AtspiAccessibleWatcher.cc | 103 +++++++-------------- libaurum/src/Impl/TizenDeviceImpl.cc | 21 +++-- libaurum/src/Runnable/SendKeyRunnable.cc | 8 +- libaurum/src/UiObject.cc | 2 +- libaurum/src/Until.cc | 6 +- libaurum/src/Waiter.cc | 5 +- org.tizen.aurum-bootstrap/inc/bootstrap.h | 30 ++++++ org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc | 1 - org.tizen.aurum-bootstrap/src/BootstrapServer.cc | 31 +++---- .../src/Commands/ClearCommand.cc | 5 +- .../src/Commands/ClickCommand.cc | 10 +- .../src/Commands/CloseAppCommand.cc | 12 +-- org.tizen.aurum-bootstrap/src/Commands/Command.cc | 1 - .../src/Commands/DumpObjectTreeCommand.cc | 16 ++-- .../src/Commands/FindElementCommand.cc | 15 ++- .../src/Commands/FlickCommand.cc | 7 +- .../src/Commands/GetAppInfoCommand.cc | 4 +- .../src/Commands/GetAttributeCommand.cc | 9 +- .../src/Commands/GetDeviceTimeCommand.cc | 8 +- .../src/Commands/GetLocationCommand.cc | 4 +- .../src/Commands/GetSizeCommand.cc | 7 +- .../src/Commands/GetValueCommand.cc | 7 +- .../src/Commands/InstallAppCommand.cc | 6 +- .../src/Commands/KillServerCommand.cc | 4 +- .../src/Commands/LaunchAppCommand.cc | 12 +-- .../src/Commands/LongClickCommand.cc | 9 +- .../src/Commands/PostCommand.cc | 4 +- .../src/Commands/PreCommand.cc | 14 +-- .../src/Commands/RemoveAppCommand.cc | 8 +- .../src/Commands/SendKeyCommand.cc | 7 +- .../src/Commands/SetValueCommand.cc | 4 +- .../src/Commands/TakeScreenshotCommand.cc | 6 +- .../src/Commands/TouchDownCommand.cc | 6 +- .../src/Commands/TouchMoveCommand.cc | 6 +- .../src/Commands/TouchUpCommand.cc | 6 +- org.tizen.aurum-bootstrap/src/ObjectMapper.cc | 24 ++--- 42 files changed, 238 insertions(+), 308 deletions(-) create mode 100644 org.tizen.aurum-bootstrap/inc/bootstrap.h diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h index 76e7405..63f6fcd 100644 --- a/libaurum/inc/Aurum.h +++ b/libaurum/inc/Aurum.h @@ -3,11 +3,30 @@ #include -#ifdef LOG_TAG -#undef LOG_TAG +#ifdef LOG_TAG +#undef LOG_TAG #endif #define LOG_TAG "AURUM" +#ifndef LOGI +#define LOGI(fmt, arg...) \ + ({ do { \ + dlog_print(DLOG_INFO, LOG_TAG, \ + "%s: %s(%d) > " fmt, __FILE__, __func__, __LINE__, ##arg); \ + } while (0); }) +#endif + +#ifndef LOGE +#define FONT_RED "\033[31m" +#define FONT_RESET "\033[0m" +#define LOGI_RED(fmt, arg...) \ + ({ do { \ + dlog_print(DLOG_ERROR, LOG_TAG, \ + FONT_RED "%s: %s(%d) > " fmt FONT_RESET, \ + __FILE__, __func__, __LINE__, ##arg); \ + } while (0); }) +#endif + #include "UiDevice.h" #include "UiObject.h" #include "UiSelector.h" diff --git a/libaurum/src/Accessibility/AccessibleNode.cc b/libaurum/src/Accessibility/AccessibleNode.cc index db1c386..070d97c 100644 --- a/libaurum/src/Accessibility/AccessibleNode.cc +++ b/libaurum/src/Accessibility/AccessibleNode.cc @@ -75,7 +75,7 @@ void AccessibleNode::notify(int type, int type2, void *src) void AccessibleNode::invalidate() { std::unique_lock lock(mLock); - dlog_print(DLOG_INFO, LOG_TAG, "object %p is now invalid", this); + LOGI("object %p is now invalid", this); mValid = false; } @@ -100,7 +100,7 @@ void AccessibleNode::print(int depth, int maxDepth) void AccessibleNode::print(int d) { this->refresh(); - dlog_print(DLOG_INFO, LOG_TAG, "%s %s",std::string(d, ' ').c_str(), description().c_str()); + LOGI("%s %s",std::string(d, ' ').c_str(), description().c_str()); } bool AccessibleNode::isSupporting(AccessibleNodeInterface thisIface) const diff --git a/libaurum/src/Accessibility/AccessibleUtils.cc b/libaurum/src/Accessibility/AccessibleUtils.cc index 76e0792..b126880 100644 --- a/libaurum/src/Accessibility/AccessibleUtils.cc +++ b/libaurum/src/Accessibility/AccessibleUtils.cc @@ -108,11 +108,11 @@ static void _print_stateset_debug( AtspiStateSet *stateSet) char *state_name = NULL; AtspiStateType stat; - dlog_print(DLOG_INFO, LOG_TAG, "check ss:%p s:%p, len:%d", stateSet, states, states->len); + LOGI("check ss:%p s:%p, len:%d", stateSet, states, states->len); for (int i = 0; states && (i < states->len); ++i) { stat = g_array_index(states, AtspiStateType, i); state_name = state_to_char(stat); - dlog_print(DLOG_INFO, LOG_TAG, "state: %s", state_name); + LOGI("state: %s", state_name); free(state_name); } g_array_free(states, 1); diff --git a/libaurum/src/Accessibility/AccessibleWatcher.cc b/libaurum/src/Accessibility/AccessibleWatcher.cc index f9636e7..4ff9548 100644 --- a/libaurum/src/Accessibility/AccessibleWatcher.cc +++ b/libaurum/src/Accessibility/AccessibleWatcher.cc @@ -57,17 +57,17 @@ AccessibleWatcher *AccessibleWatcher::getInstance(AccessibleWatcher *watcherImpl std::vector> AccessibleWatcher::getActiveApplications(void) const { - dlog_print(DLOG_INFO, LOG_TAG, "getActiveApplications for this(%p)", this); + LOGI("getActiveApplications for this(%p)", this); std::vector> ret{}; auto apps = this->getApplications(); - dlog_print(DLOG_INFO, LOG_TAG, "apps size %d", apps.size()); + LOGI("apps size %d", apps.size()); apps.erase(std::remove_if(apps.begin(), apps.end(), [](auto app){ return !app->isActive(); }), apps.end()); - dlog_print(DLOG_INFO, LOG_TAG, "active apps size %d", apps.size()); + LOGI("active apps size %d", apps.size()); return apps; } @@ -75,7 +75,6 @@ std::vector> AccessibleWatcher::getActive void AccessibleWatcher::attach(std::shared_ptr source) { std::unique_lock lock(mLock); - dlog_print(DLOG_INFO, LOG_TAG, "source attached %p", source.get()); if (source) { mSources.insert(source); } @@ -84,7 +83,6 @@ void AccessibleWatcher::attach(std::shared_ptr source) void AccessibleWatcher::detach(std::shared_ptr source) { std::unique_lock lock(mLock); - dlog_print(DLOG_INFO, LOG_TAG, "source detached %p", source.get()); if (source) { auto iter = mSources.find(source); if (iter != mSources.end()) mSources.erase(iter); diff --git a/libaurum/src/Comparer.cc b/libaurum/src/Comparer.cc index e23cf54..37ee045 100644 --- a/libaurum/src/Comparer.cc +++ b/libaurum/src/Comparer.cc @@ -25,7 +25,7 @@ std::vector> Comparer::findObjects(const std::sh { Comparer comparer(device, selector, earlyReturn); - dlog_print(DLOG_INFO, LOG_TAG, "findObjects selector(%s) from (type:%s style:%s, role:%s, text:%s) earlyReturn:%d", selector->description().c_str(), root->getType().c_str(), root->getStyle().c_str(), root->getRole().c_str(), root->getText().c_str(), earlyReturn); + LOGI("findObjects selector(%s) from (type:%s style:%s, role:%s, text:%s) earlyReturn:%d", selector->description().c_str(), root->getType().c_str(), root->getStyle().c_str(), root->getRole().c_str(), root->getText().c_str(), earlyReturn); if (selector->mParent) { auto ret = Comparer::findObjects(device, selector->mParent, root); @@ -45,7 +45,7 @@ std::vector> Comparer::findObjects(const std::sh { std::list> partialList{}; std::vector> ret = findObjects(root, 0, 0, partialList); - dlog_print(DLOG_INFO, LOG_TAG, "%d object(s) found", ret.size()); + LOGI("%d object(s) found", ret.size()); return ret; } @@ -73,14 +73,17 @@ std::vector> Comparer::findObjects( findObjects(childNode, i, depth + 1, partialMatches); std::move(std::begin(childret), std::end(childret), std::back_inserter(ret)); - if (!ret.empty() && mEarlyReturn) return ret; + if (!ret.empty() && mEarlyReturn) { + LOGI("Object found and earlyReturn"); + return ret; + } } } else { - dlog_print(DLOG_INFO, LOG_TAG, "Abort searching! No need to search children(maxDepth limit overflow, %d < %d < %d)", mSelector->mMinDepth?*(mSelector->mMinDepth):-1, depth, mSelector->mMaxDepth?*(mSelector->mMaxDepth):9999999); + LOGI("Abort searching! No need to search children(maxDepth limit overflow, %d < %d < %d)", mSelector->mMinDepth?*(mSelector->mMinDepth):-1, depth, mSelector->mMaxDepth?*(mSelector->mMaxDepth):9999999); } if (currentMatch && currentMatch->finalizeMatch()){ - dlog_print(DLOG_INFO, LOG_TAG, "Found matched = %s with criteria %s", root->description().c_str(), currentMatch->debugPrint().c_str()); + LOGI("Found matched = %s with criteria %s", root->description().c_str(), currentMatch->debugPrint().c_str()); ret.push_back(root); } diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc index c9d7259..2b165d2 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc @@ -15,61 +15,9 @@ AtspiAccessibleNode::AtspiAccessibleNode(AtspiAccessible *node) watcher->attach(shared_from_this()); if (mNode) { - /* - GArray *ifaces = AtspiWrapper::Atspi_accessible_get_interfaces(mNode); - if (ifaces) { - for (unsigned int i = 0; i < ifaces->len; i++) { - char *iface = g_array_index(ifaces, char *, i); - if (!strcmp(iface, "Action")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::ACTION); - else if (!strcmp(iface, "Collection")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::COLLECTION); - else if (!strcmp(iface, "Component")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::COMPONENT); - else if (!strcmp(iface, "Document")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::DOCUMENT); - else if (!strcmp(iface, "EditableText")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::EDITABLETEXT); - else if (!strcmp(iface, "Hypertext")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::HYPERTEXT); - else if (!strcmp(iface, "Image")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::IMAGE); - else if (!strcmp(iface, "Selection")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::SELECTION); - else if (!strcmp(iface, "Text")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::TEXT); - else if (!strcmp(iface, "Value")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::VALUE); - else if (!strcmp(iface, "Accessible")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::ACCESSIBLE); - else if (!strcmp(iface, "Table")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::TABLE); - else if (!strcmp(iface, "TableCell")) - mSupportingIfaces |= - static_cast(AccessibleNodeInterface::TABLECELL); - else - LOG_F(WARNING, "Not Supported interface found %s", iface); - - g_free(iface); - } - g_array_free(ifaces, FALSE); - }*/ - this->refresh(); } else { - dlog_print(DLOG_INFO, LOG_TAG, "AtspiAccessibleNode Ctor : mNode is null"); + LOGI("AtspiAccessibleNode Ctor : mNode is null"); } } @@ -100,7 +48,6 @@ std::shared_ptr AtspiAccessibleNode::getChildAt(int index) const AtspiWrapper::unlock(); return std::make_shared(nullptr); } - dlog_print(DLOG_INFO, LOG_TAG, "getChild @ %d from node(%p)", index, mNode); AtspiAccessible *rawChild = AtspiWrapper::Atspi_accessible_get_child_at_index(mNode, index, NULL); AtspiWrapper::unlock(); return std::make_shared(rawChild); @@ -127,10 +74,8 @@ std::shared_ptr AtspiAccessibleNode::getParent() const AtspiAccessible *rawParent = AtspiWrapper::Atspi_accessible_get_parent(mNode, NULL); AtspiWrapper::unlock(); return std::make_shared(rawParent); -/* auto node = AccessibleNode::get(parent); - if (parent) g_object_unref(parent); - return node; */ } + bool AtspiAccessibleNode::isValid() const { if(!AccessibleNode::isValid()) return false; @@ -146,7 +91,6 @@ bool AtspiAccessibleNode::isValid() const return true; } - void* AtspiAccessibleNode::getRawHandler(void) const { return static_cast(mNode); @@ -312,7 +256,7 @@ void AtspiAccessibleNode::setValue(std::string text) } AtspiEditableText *iface = AtspiWrapper::Atspi_accessible_get_editable_text(mNode); - dlog_print(DLOG_INFO, LOG_TAG, "set Value iface:%p obj:%p text:%s", iface, mNode, text.c_str() ); + LOGI("set Value iface:%p obj:%p text:%s", iface, mNode, text.c_str() ); if (iface) { int len = getText().length(); AtspiWrapper::Atspi_editable_text_delete_text(iface, 0, len, NULL); @@ -324,10 +268,6 @@ void AtspiAccessibleNode::setValue(std::string text) void AtspiAccessibleNode::setFeatureProperty(AtspiStateType type) { -/* - LONGCLICKABLE = 0X0040, - SCROLLABLE = 0X0080, -*/ switch(type) { case ATSPI_STATE_CHECKED: setFeatureProperty(NodeFeatureProperties::CHECKED, true); diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index bffa403..b15e440 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -22,12 +22,12 @@ static bool iShowingNode(AtspiAccessible *node) if (node) name = AtspiWrapper::Atspi_accessible_get_name(node, NULL); else return false; - dlog_print(DLOG_INFO, LOG_TAG, "isShowing %s", name); + LOGI("isShowing %s", name); auto stateSet = AtspiWrapper::Atspi_accessible_get_state_set(node); if (AtspiWrapper::Atspi_state_set_contains(stateSet, ATSPI_STATE_ACTIVE) && AtspiWrapper::Atspi_state_set_contains(stateSet, ATSPI_STATE_SHOWING)) { - dlog_print(DLOG_INFO, LOG_TAG, "active and showing %p %s", node, name); + LOGI("active and showing %p %s", node, name); free(name); g_object_unref(stateSet); return true; @@ -41,14 +41,14 @@ static std::vector findActiveNode(AtspiAccessible *node, int depth, int max_depth) { - dlog_print(DLOG_INFO, LOG_TAG, "findActiveNode %p %d/%d", node, depth, max_depth); + LOGI("findActiveNode %p %d/%d", node, depth, max_depth); std::vector ret{}; if (iShowingNode(node)) { char *name = AtspiWrapper::Atspi_accessible_get_name(node, NULL); if (name) { - dlog_print(DLOG_INFO, LOG_TAG, "%s", name); + LOGI("%s", name); free(name); } ret.push_back(node); @@ -60,10 +60,10 @@ findActiveNode(AtspiAccessible *node, int depth, int nchild = AtspiWrapper::Atspi_accessible_get_child_count(node, NULL); if (nchild <= 0) return ret; - dlog_print(DLOG_INFO, LOG_TAG, "findActiveNode node %p has %d children", node, nchild); + LOGI("findActiveNode node %p has %d children", node, nchild); for (int i = 0; i < nchild; i++) { AtspiAccessible* child = AtspiWrapper::Atspi_accessible_get_child_at_index(node, i, NULL); - dlog_print(DLOG_INFO, LOG_TAG, "a child found @ %d : %p", i, child); + LOGI("a child found @ %d : %p", i, child); std::vector childRet = findActiveNode(child, depth + 1, max_depth); ret.insert(ret.end(), childRet.begin(), childRet.end()); g_object_unref(child); @@ -74,7 +74,7 @@ findActiveNode(AtspiAccessible *node, int depth, static gpointer _event_thread_loop (gpointer data) { - dlog_print(DLOG_INFO, LOG_TAG, "event thread start"); + LOGI("event thread start"); AtspiEventListener * listener = atspi_event_listener_new(AtspiAccessibleWatcher::onAtspiEvents, data, NULL); @@ -83,7 +83,7 @@ static gpointer _event_thread_loop (gpointer data) atspi_event_main(); - dlog_print(DLOG_INFO, LOG_TAG, "event thread end"); + LOGI("event thread end"); atspi_event_listener_deregister(listener, "object:", NULL); atspi_event_listener_deregister(listener, "window:", NULL); @@ -168,98 +168,63 @@ void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *user_data) } if (name) free(name); if (pkg) free(pkg); -/* char *name = NULL, *pname = NULL; - AtspiAccessibleWatcher *instance = (AtspiAccessibleWatcher *)user_data; - if (!event->source) - { - LOG_F(INFO, "event->source is NULL. Skip event handling"); - return; - } - - name = AtspiWrapper::Atspi_accessible_get_name(event->source, NULL); - AtspiAccessible *parent = AtspiWrapper::Atspi_accessible_get_parent(event->source, NULL); - if (parent) { - pname = AtspiWrapper::Atspi_accessible_get_name(parent, NULL); - g_object_unref(parent); - } - - if (!strcmp(event->type, "window:activate")) { - instance->onWindowActivated( - static_cast(event->source), - static_cast(event->detail1)); - } else if (!strcmp(event->type, "window:deactivate")) { - instance->onWindowDeactivated(static_cast(event->source)); - } else if (!strcmp(event->type, "window:create")) { - instance->onWindowCreated(static_cast(event->source)); - } else if (!strcmp(event->type, "window:destroy")) { - instance->onWindowDestroyed(static_cast(event->source)); - } else if (!strcmp(event->type, "object:state-changed:visible")) { - instance->onVisibilityChanged( - static_cast(event->source), - (event->detail1 != 0)); - } else if (!strcmp(event->type, "object:state-changed:defunct")) { - instance->onObjectDefunct( - static_cast(event->source)); - } - if (name) free(name); - if (pname) free(pname);*/ AtspiWrapper::unlock(); } void AtspiAccessibleWatcher::print_debug() { - dlog_print(DLOG_INFO, LOG_TAG, "activatewindowlist-------------------"); + LOGI("activatewindowlist-------------------"); std::for_each(mActivatedWindowList.begin(), mActivatedWindowList.end(), [](auto acc){ - dlog_print(DLOG_INFO, LOG_TAG, "child:%p", acc); + LOGI("child:%p", acc); }); - dlog_print(DLOG_INFO, LOG_TAG, "mActivatedApplicationList--------------------------"); + LOGI("mActivatedApplicationList--------------------------"); std::for_each(mActivatedApplicationList.begin(), mActivatedApplicationList.end(), [](auto acc){ - dlog_print(DLOG_INFO, LOG_TAG, "child:%p", acc); + LOGI("child:%p", acc); }); - dlog_print(DLOG_INFO, LOG_TAG, "mWindowSet------------------------------"); + LOGI("mWindowSet------------------------------"); std::for_each(mWindowSet.begin(), mWindowSet.end(), [](auto acc){ - dlog_print(DLOG_INFO, LOG_TAG, "child:%p", acc); + LOGI("child:%p", acc); }); - dlog_print(DLOG_INFO, LOG_TAG, "------------------------------"); + LOGI("------------------------------"); } void AtspiAccessibleWatcher::onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) { - dlog_print(DLOG_INFO, LOG_TAG, "onWindowActivated obj:%p", node); + LOGI("onWindowActivated obj:%p", node); notifyAll((int)EventType::Window, (int)WindowEventType::WindowActivated, node); } void AtspiAccessibleWatcher::onWindowDeactivated(AtspiAccessible *node) { - dlog_print(DLOG_INFO, LOG_TAG, "onWindowDeactivated obj:%p", node); + LOGI("onWindowDeactivated obj:%p", node); notifyAll((int)EventType::Window, (int)WindowEventType::WindowDeactivated, node); } void AtspiAccessibleWatcher::onWindowCreated(AtspiAccessible *node) { - dlog_print(DLOG_INFO, LOG_TAG, "onWindowCreated obj:%p", node); + LOGI("onWindowCreated obj:%p", node); notifyAll((int)EventType::Window, (int)WindowEventType::WindowCreated, node); } void AtspiAccessibleWatcher::onWindowDestroyed(AtspiAccessible *node) { - dlog_print(DLOG_INFO, LOG_TAG, "onWindowDestroyed obj:%p", node); + LOGI("onWindowDestroyed obj:%p", node); notifyAll((int)EventType::Window, (int)WindowEventType::WindowDestroyed, node); } void AtspiAccessibleWatcher::onVisibilityChanged(AtspiAccessible *node, bool visible) { - dlog_print(DLOG_INFO, LOG_TAG, "onVisibilityChanged obj:%p", node); + LOGI("onVisibilityChanged obj:%p", node); notifyAll((int)EventType::Object, (int)ObjectEventType::ObjectStateVisible, node); } void AtspiAccessibleWatcher::onObjectDefunct(AtspiAccessible *node) { - dlog_print(DLOG_INFO, LOG_TAG, "onObjectDefunct obj:%p", node); + LOGI("onObjectDefunct obj:%p", node); notifyAll((int)EventType::Object, (int)ObjectEventType::ObjectStateDefunct, node); } @@ -290,7 +255,7 @@ std::shared_ptr AtspiAccessibleWatcher::getApplicationAt( std::vector> AtspiAccessibleWatcher::getApplications(void) const { AtspiWrapper::lock(); - dlog_print(DLOG_INFO, LOG_TAG, "getApplications for this(%p)", this); + LOGI("getApplications for this(%p)", this); std::vector> ret{}; AtspiAccessible *root = AtspiWrapper::Atspi_get_desktop(0); int nchild = AtspiWrapper::Atspi_accessible_get_child_count(root, NULL); @@ -332,16 +297,16 @@ bool AtspiAccessibleWatcher::executeAndWaitForEvents(const Runnable *cmd, const mEventQueue.clear(); AtspiWrapper::unlock(); - if (!localEvents.empty()) - { + if (!localEvents.empty()) + { for (const auto &event : localEvents) { if (COMPARE(type, event->getEvent())) - { - dlog_print(DLOG_INFO, LOG_TAG, "type %d == %d name %s pkg %s",static_cast(type), static_cast(event->getEvent()), event->getName().c_str(), event->getPkg().c_str()); - return true; - } - } - } + { + LOGI("type %d == %d name %s pkg %s",static_cast(type), static_cast(event->getEvent()), event->getName().c_str(), event->getPkg().c_str()); + return true; + } + } + } if ((std::chrono::system_clock::now() - start) > std::chrono::milliseconds{timeout}) break; @@ -354,11 +319,11 @@ bool AtspiAccessibleWatcher::executeAndWaitForEvents(const Runnable *cmd, const bool AtspiAccessibleWatcher::removeFromActivatedList(AtspiAccessible *node) { - dlog_print(DLOG_INFO, LOG_TAG, "remove from activelist node %p", node); + LOGI("remove from activelist node %p", node); mActivatedWindowList.remove_if([&](auto &n) { return n == node; }); AtspiAccessible *app = AtspiWrapper::Atspi_accessible_get_application(node, NULL); - dlog_print(DLOG_INFO, LOG_TAG, "node:%p, app:%p", node, app); + LOGI("node:%p, app:%p", node, app); if (app) { mActivatedApplicationList.remove_if([&](auto &n) { return n == app; }); g_object_unref(app); @@ -368,7 +333,7 @@ bool AtspiAccessibleWatcher::removeFromActivatedList(AtspiAccessible *node) bool AtspiAccessibleWatcher::addToActivatedList(AtspiAccessible *node) { - dlog_print(DLOG_INFO, LOG_TAG, "add to activelist node %p", node); + LOGI("add to activelist node %p", node); mActivatedWindowList.remove_if([&](auto &n) { return n == node; }); mActivatedWindowList.push_front(node); @@ -376,7 +341,7 @@ bool AtspiAccessibleWatcher::addToActivatedList(AtspiAccessible *node) if ( iter == mWindowSet.end()) mWindowSet.insert(node); AtspiAccessible *app = AtspiWrapper::Atspi_accessible_get_application(node, NULL); - dlog_print(DLOG_INFO, LOG_TAG, "node:%p, app:%p", node, app); + LOGI("node:%p, app:%p", node, app); if (app) { mActivatedApplicationList.remove_if([&](auto &n) { if(n == app) { g_object_unref(app); return true;} else return false; }); mActivatedApplicationList.push_front(app); diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc index 82fc926..446d041 100644 --- a/libaurum/src/Impl/TizenDeviceImpl.cc +++ b/libaurum/src/Impl/TizenDeviceImpl.cc @@ -15,10 +15,13 @@ #include #include +#define NANO_SEC 1000000000.0 +#define MICRO_SEC 1000000 + TizenDeviceImpl::TizenDeviceImpl() : mFakeTouchHandle{0}, mFakeKeyboardHandle{0}, mFakeWheelHandle{0}, tStart{}, isTimerStarted{false}, mTouchSeq{} { - dlog_print(DLOG_INFO, LOG_TAG, "device implementation init"); + LOGI("device implementation init"); TizenDeviceImpl *obj = static_cast(this); obj->mFakeTouchHandle = efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); obj->mFakeKeyboardHandle = @@ -39,7 +42,7 @@ bool TizenDeviceImpl::click(const int x, const int y) bool TizenDeviceImpl::click(const int x, const int y, const unsigned int intv) { - dlog_print(DLOG_INFO, LOG_TAG, "click %d %d , intv:%d", x, y, intv); + LOGI("click %d %d , intv:%d", x, y, intv); int seq = touchDown(x, y); if (seq < 0) return false; @@ -53,7 +56,7 @@ bool TizenDeviceImpl::click(const int x, const int y, const unsigned int intv) int TizenDeviceImpl::touchDown(const int x, const int y) { int seq = grabTouchSeqNumber(); - dlog_print(DLOG_INFO, LOG_TAG, "touch down %d %d , seq:%d", x, y, seq); + LOGI("touch down %d %d , seq:%d", x, y, seq); if (seq >= 0) { TizenDeviceImpl *obj = static_cast(this); long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_BEGIN, @@ -69,7 +72,7 @@ int TizenDeviceImpl::touchDown(const int x, const int y) bool TizenDeviceImpl::touchMove(const int x, const int y, const int seq) { - dlog_print(DLOG_INFO, LOG_TAG, "touch move %d %d, seq:%d", x, y, seq); + LOGI("touch move %d %d, seq:%d", x, y, seq); if (seq >= 0) { TizenDeviceImpl *obj = static_cast(this); long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_UPDATE, @@ -81,7 +84,7 @@ bool TizenDeviceImpl::touchMove(const int x, const int y, const int seq) bool TizenDeviceImpl::touchUp(const int x, const int y, const int seq) { - dlog_print(DLOG_INFO, LOG_TAG, "touch up %d %d, seq:%d", x, y, seq); + LOGI("touch up %d %d, seq:%d", x, y, seq); if (seq >= 0) { TizenDeviceImpl *obj = static_cast(this); long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_END, @@ -93,7 +96,7 @@ bool TizenDeviceImpl::touchUp(const int x, const int y, const int seq) bool TizenDeviceImpl::wheelUp(int amount, const int durationMs) { - dlog_print(DLOG_INFO, LOG_TAG, "wheel up %d for %d", amount, durationMs); + LOGI("wheel up %d for %d", amount, durationMs); long result = -1; TizenDeviceImpl *obj = static_cast(this); obj->mFakeWheelHandle = efl_util_input_initialize_generator_with_sync(EFL_UTIL_INPUT_DEVTYPE_POINTER, NULL); @@ -109,7 +112,7 @@ bool TizenDeviceImpl::wheelUp(int amount, const int durationMs) bool TizenDeviceImpl::wheelDown(int amount, const int durationMs) { - dlog_print(DLOG_INFO, LOG_TAG, "wheel down %d for %d", amount, durationMs); + LOGI("wheel down %d for %d", amount, durationMs); long result = -1; TizenDeviceImpl *obj = static_cast(this); obj->mFakeWheelHandle = efl_util_input_initialize_generator_with_sync(EFL_UTIL_INPUT_DEVTYPE_POINTER, NULL); @@ -134,7 +137,7 @@ int TizenDeviceImpl::stopTimer(void) if (!isTimerStarted) return 0; isTimerStarted = false; clock_gettime(CLOCK_MONOTONIC, &tEnd); - return ((tEnd.tv_sec + tEnd.tv_nsec/1000000000.0) - (tStart.tv_sec + tStart.tv_nsec/1000000000.0)) * 1000000; + return ((tEnd.tv_sec + tEnd.tv_nsec/NANO_SEC) - (tStart.tv_sec + tStart.tv_nsec/NANO_SEC)) * MICRO_SEC; } bool TizenDeviceImpl::drag(const int sx, const int sy, const int ex, const int ey, @@ -156,7 +159,7 @@ bool TizenDeviceImpl::drag(const int sx, const int sy, const int ex, const int e _steps = (int)(_durationUs / (INTV_MINIMUM_DRAG_MS * MSEC_PER_SEC)) - 1; _stepUs = (INTV_MINIMUM_DRAG_MS * MSEC_PER_SEC); } - dlog_print(DLOG_INFO, LOG_TAG, "flicking (%d, %d) -> (%d, %d) for (%d ms)", sx, sy, ex, ey, durationMs); + LOGI("flicking (%d, %d) -> (%d, %d) for (%d ms)", sx, sy, ex, ey, durationMs); startTimer(); int seq = touchDown(sx, sy); if (seq < 0) return false; diff --git a/libaurum/src/Runnable/SendKeyRunnable.cc b/libaurum/src/Runnable/SendKeyRunnable.cc index fc1f54c..61d3138 100644 --- a/libaurum/src/Runnable/SendKeyRunnable.cc +++ b/libaurum/src/Runnable/SendKeyRunnable.cc @@ -7,9 +7,9 @@ SendKeyRunnable::SendKeyRunnable(std::string keycode) void SendKeyRunnable::run() const { - dlog_print(DLOG_INFO, LOG_TAG, "sendKey %s",mKeycode.c_str()); - std::shared_ptr mDevice = UiDevice::getInstance(); - mDevice->pressKeyCode(mKeycode.c_str(), KeyRequestType::PRESS); - mDevice->pressKeyCode(mKeycode.c_str(), KeyRequestType::RELEASE); + LOGI("sendKey %s",mKeycode.c_str()); + std::shared_ptr mDevice = UiDevice::getInstance(); + mDevice->pressKeyCode(mKeycode.c_str(), KeyRequestType::PRESS); + mDevice->pressKeyCode(mKeycode.c_str(), KeyRequestType::RELEASE); } diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc index 1095669..db48098 100644 --- a/libaurum/src/UiObject.cc +++ b/libaurum/src/UiObject.cc @@ -86,7 +86,7 @@ std::vector> UiObject::findObjects( auto nodes = Comparer::findObjects(mDevice, selector, getAccessibleNode()); for ( auto& node : nodes) { if (!node) { - dlog_print(DLOG_INFO, LOG_TAG, "Skipped! (node == nullptr)"); + LOGI("Skipped! (node == nullptr)"); continue; } result.push_back(std::make_shared(mDevice, selector, std::move(node))); diff --git a/libaurum/src/Until.cc b/libaurum/src/Until.cc index 324635b..987627a 100644 --- a/libaurum/src/Until.cc +++ b/libaurum/src/Until.cc @@ -4,7 +4,7 @@ std::function Until::hasObject( const std::shared_ptr selector) { return [=](const ISearchable *searchable) -> bool { - dlog_print(DLOG_INFO, LOG_TAG, "Until::hasObject search:%p", searchable); + LOGI("Until::hasObject search:%p", searchable); std::shared_ptr obj = searchable->findObject(selector); return obj.get() != nullptr; }; @@ -14,7 +14,7 @@ std::function(const ISearchable *)> Until::findObject( const std::shared_ptr selector) { return [=](const ISearchable *searchable) -> std::shared_ptr { - dlog_print(DLOG_INFO, LOG_TAG, "Until::findObject search:%p", searchable); + LOGI("Until::findObject search:%p", searchable); std::shared_ptr obj = searchable->findObject(selector); return obj; }; @@ -23,7 +23,7 @@ std::function(const ISearchable *)> Until::findObject( std::function Until::checkable(const bool isCheckable) { return [=](const UiObject *object) -> bool { - dlog_print(DLOG_INFO, LOG_TAG, "Until::checkable checkable:%d for obj %p", isCheckable, object); + LOGI("Until::checkable checkable:%d for obj %p", isCheckable, object); return object->isClickable() == isCheckable; }; } diff --git a/libaurum/src/Waiter.cc b/libaurum/src/Waiter.cc index dfb2ae8..05b4f63 100644 --- a/libaurum/src/Waiter.cc +++ b/libaurum/src/Waiter.cc @@ -28,8 +28,7 @@ template bool Waiter::waitFor( template R Waiter::waitFor(const std::function condition) const { - dlog_print(DLOG_INFO, LOG_TAG, "Waiter::waitFor ISearchable"); - // startTime = currentTime(); + LOGI("Waiter::waitFor ISearchable"); std::chrono::system_clock::time_point start = std::chrono::system_clock::now(); R result = condition(mSearchableObject); @@ -47,7 +46,7 @@ R Waiter::waitFor(const std::function condition) const template R Waiter::waitFor(const std::function condition) const { - dlog_print(DLOG_INFO, LOG_TAG, "Waiter::waitFor UiObject"); + LOGI("Waiter::waitFor UiObject"); if (mUiObject) { std::chrono::system_clock::time_point start = std::chrono::system_clock::now(); diff --git a/org.tizen.aurum-bootstrap/inc/bootstrap.h b/org.tizen.aurum-bootstrap/inc/bootstrap.h new file mode 100644 index 0000000..429e4e5 --- /dev/null +++ b/org.tizen.aurum-bootstrap/inc/bootstrap.h @@ -0,0 +1,30 @@ +#ifndef _BOOTSTRAP_H_ +#define _BOOTSTRAP_H_ + +#include + +#ifdef LOG_TAG +#undef LOG_TAG +#endif +#define LOG_TAG "AURUM-BOOTSTRAP" + +#ifndef LOGI +#define LOGI(fmt, arg...) \ + ({ do { \ + dlog_print(DLOG_INFO, LOG_TAG, \ + "%s: %s(%d) > " fmt, __FILE__, __func__, __LINE__, ##arg); \ + } while (0); }) +#endif + +#ifndef LOGE +#define FONT_RED "\033[31m" +#define FONT_RESET "\033[0m" +#define LOGI_RED(fmt, arg...) \ + ({ do { \ + dlog_print(DLOG_ERROR, LOG_TAG, \ + FONT_RED "%s: %s(%d) > " fmt FONT_RESET, \ + __FILE__, __func__, __LINE__, ##arg); \ + } while (0); }) +#endif + +#endif \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc index 8cf4527..e733b23 100644 --- a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc +++ b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc @@ -6,7 +6,6 @@ #include "Commands/PreCommand.h" #include "config.h" -#include using namespace grpc; using namespace aurum; diff --git a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc index aa70fd3..827fcee 100644 --- a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc +++ b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc @@ -1,5 +1,6 @@ #include #include +#include "bootstrap.h" #include #include @@ -10,7 +11,6 @@ #include "AurumServiceImpl.h" #include "config.h" -#include #define PRIV_MEDIASTORAGE "http://tizen.org/privilege/mediastorage" #define PRIV_LOCATION "http://tizen.org/privilege/location" @@ -31,10 +31,9 @@ _grpc_thread_func (gpointer data) aurumServiceImpl service; ServerBuilder builder; - LOG_F(INFO, "[T] Server Listening on %s", binding.c_str()); + LOGI("[T] Server Listening on %s", binding.c_str()); builder.AddListeningPort(binding, grpc::InsecureServerCredentials()); builder.RegisterService(&service); - //std::unique_ptr server(builder.BuildAndStart()); ctx->server = std::move(builder.BuildAndStart()); ctx->server->Wait(); @@ -46,22 +45,22 @@ reponse_cb(ppm_call_cause_e cause, ppm_request_result_e result, const char *privilege, void *user_data) { if (cause == PRIVACY_PRIVILEGE_MANAGER_CALL_CAUSE_ERROR) { - LOG_F(INFO, "PPM Error PRIVACY_PRIVILEGE_MANAGER_CALL_CAUSE_ERROR"); + LOGI("PPM Error PRIVACY_PRIVILEGE_MANAGER_CALL_CAUSE_ERROR"); return; } switch (result) { case PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_ALLOW_FOREVER: - LOG_F(INFO, "priv:%s PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_ALLOW_FOREVER", privilege); + LOGI("priv:%s PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_ALLOW_FOREVER", privilege); break; case PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_DENY_FOREVER: - LOG_F(INFO, "priv:%s PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_ALLOW_FOREVER", privilege); + LOGI("priv:%s PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_ALLOW_FOREVER", privilege); break; case PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_DENY_ONCE: - LOG_F(INFO, "priv:%s PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_ALLOW_FOREVER", privilege); + LOGI("priv:%s PRIVACY_PRIVILEGE_MANAGER_REQUEST_RESULT_ALLOW_FOREVER", privilege); break; default: - LOG_F(INFO, "priv:%s default", privilege); + LOGI("priv:%s default", privilege); break; } } @@ -71,7 +70,7 @@ check_permission(char *path_privilege) { ppm_check_result_e result; int ret; - LOG_F(INFO, "path_privilege = %s",path_privilege); + LOGI("path_privilege = %s",path_privilege); ret = ppm_check_permission(path_privilege, &result); if (ret == PRIVACY_PRIVILEGE_MANAGER_ERROR_NONE) { @@ -80,12 +79,12 @@ check_permission(char *path_privilege) break; case PRIVACY_PRIVILEGE_MANAGER_CHECK_RESULT_DENY: - LOG_F(INFO, "PRIVACY_PRIVILEGE_MANAGER_CHECK_RESULT_DENY"); + LOGI("PRIVACY_PRIVILEGE_MANAGER_CHECK_RESULT_DENY"); ; break; case PRIVACY_PRIVILEGE_MANAGER_CHECK_RESULT_ASK: - LOG_F(INFO, "PRIVACY_PRIVILEGE_MANAGER_CHECK_RESULT_ASK"); + LOGI("PRIVACY_PRIVILEGE_MANAGER_CHECK_RESULT_ASK"); ppm_request_permission(path_privilege, reponse_cb, NULL); break; @@ -93,7 +92,7 @@ check_permission(char *path_privilege) break; } } else { - LOG_F(INFO, "Error to check permission[0x%x]", ret); + LOGI("Error to check permission[0x%x]", ret); } } @@ -101,12 +100,6 @@ check_permission(char *path_privilege) static bool _service_app_create(void *data) { ServiceContext *ctx = (ServiceContext*)data; - const char *logPath = "/tmp/ua.log"; - - - loguru::g_preamble = false; - loguru::add_file(logPath, loguru::Append, loguru::Verbosity_MAX); - LOG_SCOPE_F(INFO, "Log : %s", logPath); ctx->loop = g_main_loop_new ( NULL , FALSE ); ctx->thread = g_thread_new("grpc_thread", _grpc_thread_func, ctx); @@ -149,7 +142,7 @@ int main(int argc, char **argv) try { result = service_app_main(argc, argv, &event_callback, &ctx); } catch (const std::exception& e) { - LOG_F(INFO, "service_app_main exception: %s", e.what()); + LOGI("service_app_main exception: %s", e.what()); } return result; diff --git a/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc index 352c537..3b80401 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc @@ -1,6 +1,5 @@ +#include "bootstrap.h" #include "ClearCommand.h" -#include -#include #include ClearCommand::ClearCommand(const ::aurum::ReqClear* request, @@ -25,7 +24,7 @@ bool ClearCommand::hasHintText(std::shared_ptr obj) ::grpc::Status ClearCommand::execute() { - LOG_SCOPE_F(INFO, "Clear --------------- "); + LOGI("Clear --------------- "); ObjectMapper* mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); diff --git a/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc index 8340168..0b74527 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc @@ -1,10 +1,8 @@ +#include "bootstrap.h" #include "ClickCommand.h" - #include "UiObject.h" #include "UiDevice.h" -#include - ClickCommand::ClickCommand(const ::aurum::ReqClick* request, ::aurum::RspClick* response) : mRequest{request}, mResponse{response} @@ -34,7 +32,7 @@ std::unique_ptr ClickCommand::createCommand(const ::aurum::ReqClic { ObjectMapper* mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); - LOG_SCOPE_F(INFO, "ClickElementCommand execute %p", obj); + LOGI("ClickElementCommand execute %p", obj.get()); if (obj) { obj->click(); @@ -49,7 +47,7 @@ std::unique_ptr ClickCommand::createCommand(const ::aurum::ReqClic { std::shared_ptr obj = UiDevice::getInstance(); const ::aurum::Point& point = mRequest->coordination(); - LOG_SCOPE_F(INFO, "ClickCoordCommand execute %p @ (%d, %d)", obj.get(), point.x(), point.y()); + LOGI("ClickCoordCommand execute %p @ (%d, %d)", obj.get(), point.x(), point.y()); obj->click(point.x(), point.y()); mResponse->set_status(::aurum::RspStatus::OK); return grpc::Status::OK; @@ -60,7 +58,7 @@ std::unique_ptr ClickCommand::createCommand(const ::aurum::ReqClic ObjectMapper* mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); - LOG_SCOPE_F(INFO, "ClickAtspiCommand execute %p", obj); + LOGI("ClickAtspiCommand execute %p", obj.get()); if (obj) { if (obj->DoAtspiActivate()) mResponse->set_status(::aurum::RspStatus::OK); diff --git a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc index 3221d36..f40f7cb 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc @@ -1,5 +1,5 @@ +#include "bootstrap.h" #include "CloseAppCommand.h" -#include #include #include #ifdef GBSBUILD @@ -14,22 +14,22 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp* request, ::grpc::Status CloseAppCommand::execute() { - LOG_SCOPE_F(INFO, "CloseApp --------------- "); + LOGI("CloseApp --------------- "); #ifdef GBSBUILD std::string packageName = mRequest->packagename(); app_context_h app_context = NULL; - LOG_F(INFO, "close req : %s", packageName.c_str()); + LOGI("close req : %s", packageName.c_str()); int ret = app_manager_get_app_context(packageName.c_str(), &app_context); if (ret) { - LOG_SCOPE_F(INFO, "Terminate Failed(1/2) Err Code : %d", ret); + LOGI("Terminate Failed(1/2) Err Code : %d", ret); mResponse->set_status(::aurum::RspStatus::ERROR); return grpc::Status::OK; } ret = app_manager_terminate_app(app_context); if (ret) { - LOG_SCOPE_F(INFO, "Terminate Failed(2/2) Err Code : %d", ret); + LOGI("Terminate Failed(2/2) Err Code : %d", ret); mResponse->set_status(::aurum::RspStatus::ERROR); return grpc::Status::OK; } @@ -39,7 +39,7 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp* request, ::grpc::Status CloseAppCommand::executePost() { - LOG_SCOPE_F(INFO, "CloseAppCommand::executePost"); + LOGI("CloseAppCommand::executePost"); std::this_thread::sleep_for(std::chrono::milliseconds{1500}); return grpc::Status::OK; } \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/src/Commands/Command.cc b/org.tizen.aurum-bootstrap/src/Commands/Command.cc index 71a6eb7..8988bf7 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/Command.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/Command.cc @@ -1,5 +1,4 @@ #include "Command.h" -#include ::grpc::Status Command::executePost() { diff --git a/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc index c7c0e4a..b8b7c71 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc @@ -1,14 +1,10 @@ +#include "bootstrap.h" #include "DumpObjectTreeCommand.h" - -#include "ISearchable.h" - -#include "Sel.h" -#include "UiDevice.h" #include "UiObject.h" +#include "UiDevice.h" #include "UiSelector.h" - -#include - +#include "Sel.h" +#include "ISearchable.h" DumpObjectTreeCommand::DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree* request, ::aurum::RspDumpObjectTree* response) @@ -66,8 +62,8 @@ void DumpObjectTreeCommand::traverse(::aurum::Element *root, std::shared_ptrelementid().c_str()); + LOGI("DumpObjectTree --------------- "); + LOGI("elementid : %s", mRequest->elementid().c_str()); if (mRequest->elementid().length()) { auto obj = mObjMap->getElement(mRequest->elementid()); if (!obj) return grpc::Status::OK;; diff --git a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc index 590806f..1238b8b 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc @@ -1,13 +1,10 @@ +#include "bootstrap.h" #include "FindElementCommand.h" - -#include "ISearchable.h" - -#include "Sel.h" -#include "UiDevice.h" #include "UiObject.h" +#include "UiDevice.h" #include "UiSelector.h" - -#include +#include "Sel.h" +#include "ISearchable.h" FindElementCommand::FindElementCommand(const ::aurum::ReqFindElement* request, ::aurum::RspFindElement* response) @@ -54,7 +51,7 @@ std::vector> FindElementCommand::getSelectors(void) ::grpc::Status FindElementCommand::execute() { - LOG_SCOPE_F(INFO, "findElement --------------- "); + LOGI("findElement --------------- "); auto searchableObj = getSearchableTop(); auto selectors = getSelectors(); @@ -72,7 +69,7 @@ std::vector> FindElementCommand::getSelectors(void) key = mObjMap->getElement(found); if (key.length() <= 0) key = mObjMap->addElement(std::move(found)); - LOG_F(INFO, "found object : %s key:%s", + LOGI("found object : %s key:%s", obj->getAutomationId().c_str(), key.c_str()); ::aurum::Element* elm = mResponse->add_elements(); elm->set_elementid(key); diff --git a/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc index b468e43..d1703be 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc @@ -1,7 +1,6 @@ +#include "bootstrap.h" #include "FlickCommand.h" -#include - -#include +#include "UiDevice.h" FlickCommand::FlickCommand(const ::aurum::ReqFlick *request, ::aurum::RspFlick * response) @@ -11,7 +10,7 @@ FlickCommand::FlickCommand(const ::aurum::ReqFlick *request, ::grpc::Status FlickCommand::execute() { - LOG_SCOPE_F(INFO, "Flick --------------- "); + LOGI("Flick --------------- "); const ::aurum::Point &startPoint = mRequest->startpoint(); const ::aurum::Point &endPoint = mRequest->endpoint(); diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc index b4c5ff7..6ecb115 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc @@ -1,5 +1,5 @@ +#include "bootstrap.h" #include "GetAppInfoCommand.h" -#include #ifdef GBSBUILD #include #include @@ -13,7 +13,7 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request, ::grpc::Status GetAppInfoCommand::execute() { - LOG_SCOPE_F(INFO, "GetAppInfo --------------- "); + LOGI("GetAppInfo --------------- "); #ifdef GBSBUILD std::string packageName = mRequest->packagename(); diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc index 5b0ced7..38a3686 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc @@ -1,8 +1,7 @@ +#include "bootstrap.h" #include "GetAttributeCommand.h" -#include - -#include -#include +#include "UiObject.h" +#include "UiDevice.h" GetAttributeCommand::GetAttributeCommand( const ::aurum::ReqGetAttribute* request, ::aurum::RspGetAttribute* response) @@ -20,7 +19,7 @@ std::unique_ptr GetAttributeCommand::createCommand(const :: { ::aurum::ReqGetAttribute_RequestType type = request->attribute(); - LOG_SCOPE_F(INFO, "type : %d", type); + LOGI("type : %d", type); if (type == ::aurum::ReqGetAttribute_RequestType::ReqGetAttribute_RequestType_VISIBLE) return std::make_unique(request, response); diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc index 0119a20..8403dc8 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc @@ -1,12 +1,10 @@ +#include "bootstrap.h" #include "GetDeviceTimeCommand.h" #include #include - -#include - -#include "UiDevice.h" #include +#include "UiDevice.h" #define BUFSIZE 64 @@ -88,7 +86,7 @@ public: ::grpc::Status GetDeviceTimeCommand::execute() { - LOG_SCOPE_F(INFO, "GetDeviceTime --------------- "); + LOGI("GetDeviceTime --------------- "); std::shared_ptr obj = UiDevice::getInstance(); ::aurum::ReqGetDeviceTime_TimeType type = mRequest->type(); diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc index b92ff80..9110cb5 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc @@ -1,5 +1,5 @@ +#include "bootstrap.h" #include "GetLocationCommand.h" -#include GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation* request, ::aurum::RspGetLocation* response) @@ -9,7 +9,7 @@ GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation* request, ::grpc::Status GetLocationCommand::execute() { - LOG_SCOPE_F(INFO, "CliGetLocation --------------- "); + LOGI("CliGetLocation --------------- "); // ObjectMapper *mObjMap = ObjectMapper::getInstance(); mResponse->set_alt(-1); diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc index 919c196..88c7b00 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc @@ -1,7 +1,6 @@ +#include "bootstrap.h" #include "GetSizeCommand.h" -#include - -#include +#include "UiObject.h" GetSizeCommand::GetSizeCommand(const ::aurum::ReqGetSize* request, ::aurum::RspGetSize* response) @@ -11,7 +10,7 @@ GetSizeCommand::GetSizeCommand(const ::aurum::ReqGetSize* request, ::grpc::Status GetSizeCommand::execute() { - LOG_SCOPE_F(INFO, "GetSize --------------- "); + LOGI("GetSize --------------- "); ObjectMapper *mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); if (obj) { diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc index ebe9c93..410af95 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc @@ -1,7 +1,6 @@ +#include "bootstrap.h" #include "GetValueCommand.h" -#include - -#include +#include "UiObject.h" GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue* request, ::aurum::RspGetValue* response) @@ -11,7 +10,7 @@ GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue* request, ::grpc::Status GetValueCommand::execute() { - LOG_SCOPE_F(INFO, "GetValue --------------- "); + LOGI("GetValue --------------- "); ObjectMapper* mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); diff --git a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc index 58c369f..f475da2 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc @@ -1,8 +1,8 @@ +#include "bootstrap.h" #include "InstallAppCommand.h" #include #include #include -#include #ifdef GBSBUILD #include #endif @@ -16,7 +16,7 @@ InstallAppCommand::InstallAppCommand( ::grpc::Status InstallAppCommand::execute() { - LOG_SCOPE_F(INFO, "InstallApp --------------- "); + LOGI("InstallApp --------------- "); #ifdef GBSBUILD ::aurum::ReqInstallApp chunk; @@ -40,7 +40,7 @@ InstallAppCommand::InstallAppCommand( ::grpc::Status InstallAppCommand::executePost() { - LOG_SCOPE_F(INFO, "InstallAppCommand::executePost"); + LOGI("InstallAppCommand::executePost"); std::this_thread::sleep_for(std::chrono::milliseconds{5000}); return grpc::Status::OK; } \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc index 2e51682..8a8641f 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc @@ -1,5 +1,5 @@ +#include "bootstrap.h" #include "KillServerCommand.h" -#include KillServerCommand::KillServerCommand(const ::aurum::ReqEmpty* request, ::aurum::RspEmpty* response) @@ -9,7 +9,7 @@ KillServerCommand::KillServerCommand(const ::aurum::ReqEmpty* request, ::grpc::Status KillServerCommand::execute() { - LOG_SCOPE_F(INFO, "Kill Server "); + LOGI("Kill Server "); exit(1); diff --git a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc index f611eb5..b2a01c3 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc @@ -1,5 +1,5 @@ +#include "bootstrap.h" #include "LaunchAppCommand.h" -#include #include #include @@ -15,7 +15,7 @@ LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp* request, ::grpc::Status LaunchAppCommand::execute() { - LOG_SCOPE_F(INFO, "LaunchApp --------------- "); + LOGI("LaunchApp --------------- "); #ifdef GBSBUILD app_control_h appControl; std::string packageName = mRequest->packagename(); @@ -25,14 +25,14 @@ LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp* request, ret = app_control_create(&appControl); if (ret) { - LOG_SCOPE_F(INFO, "Launch Failed(1/3) Err Code : %ull", ret); + LOGI("Launch Failed(1/3) Err Code : %ull", ret); mResponse->set_status(::aurum::RspStatus::ERROR); return grpc::Status::OK; } ret = app_control_set_app_id(appControl, packageName.c_str()); if (ret) { - LOG_SCOPE_F(INFO, "Launch Failed(2/3) Err Code : %ull", ret); + LOGI("Launch Failed(2/3) Err Code : %ull", ret); mResponse->set_status(::aurum::RspStatus::ERROR); app_control_destroy(appControl); return grpc::Status::OK; @@ -40,7 +40,7 @@ LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp* request, ret = app_control_send_launch_request(appControl, NULL, NULL); if (ret) { - LOG_SCOPE_F(INFO, "Launch Failed(3/3) Err Code : %ull", ret); + LOGI("Launch Failed(3/3) Err Code : %ull", ret); mResponse->set_status(::aurum::RspStatus::ERROR); app_control_destroy(appControl); return grpc::Status::OK; @@ -52,7 +52,7 @@ LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp* request, } ::grpc::Status LaunchAppCommand::executePost() { - LOG_SCOPE_F(INFO, "LaunchAppCommand::executePost"); + LOGI("LaunchAppCommand::executePost"); std::this_thread::sleep_for(std::chrono::milliseconds{2500}); return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc index 6360c12..22148b5 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc @@ -1,8 +1,7 @@ +#include "bootstrap.h" #include "LongClickCommand.h" -#include - -#include -#include +#include "UiObject.h" +#include "UiDevice.h" LongClickCommand::LongClickCommand(const ::aurum::ReqClick* request, ::aurum::RspClick* response) @@ -12,7 +11,7 @@ LongClickCommand::LongClickCommand(const ::aurum::ReqClick* request, ::grpc::Status LongClickCommand::execute() { - LOG_SCOPE_F(INFO, "LongClick --------------- "); + LOGI("LongClick --------------- "); ObjectMapper* mObjMap = ObjectMapper::getInstance(); ::aurum::ReqClick_RequestType type = mRequest->type(); diff --git a/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc index d6664cc..2a2a5e1 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc @@ -1,6 +1,6 @@ +#include "bootstrap.h" #include "PostCommand.h" #include -#include PostCommand::PostCommand() : PostCommand(nullptr) {} PostCommand::PostCommand(Command *cmd) : mCommand{cmd} {} @@ -8,7 +8,7 @@ PostCommand::PostCommand(Command *cmd) : mCommand{cmd} {} ::grpc::Status PostCommand::execute() { ::grpc::Status rst = mCommand->execute(); - LOG_SCOPE_F(INFO, "PostCommand --------------- "); + LOGI("PostCommand --------------- "); mCommand->executePost(); // do post-command diff --git a/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc index af36b2c..b291289 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc @@ -1,6 +1,6 @@ +#include "bootstrap.h" #include "PreCommand.h" #include -#include #include #include @@ -16,16 +16,16 @@ PreCommand::PreCommand(Command *cmd) : mCommand{cmd} {} ::grpc::Status PreCommand::execute() { { - LOG_SCOPE_F(INFO, "PreCommand --------------- "); - display_state_e state; - if (device_display_get_state(&state) != DEVICE_ERROR_NONE) { - LOG_F(INFO, "getting display state has failed"); - } + LOGI("PreCommand --------------- "); + display_state_e state; + if (device_display_get_state(&state) != DEVICE_ERROR_NONE) { + LOGI("getting display state has failed"); + } bool isDisplayOn = DISPLAY_STATE_SCREEN_OFF != state; if (device_power_wakeup(false) != DEVICE_ERROR_NONE) { - LOG_F(INFO, "turning on display has failed"); + LOGI("turning on display has failed"); } if (!isDisplayOn) diff --git a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc index 07c0738..218e3d5 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc @@ -1,5 +1,5 @@ +#include "bootstrap.h" #include "RemoveAppCommand.h" -#include #include #include #ifdef GBSBUILD @@ -14,13 +14,13 @@ RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, ::grpc::Status RemoveAppCommand::execute() { - LOG_SCOPE_F(INFO, "RemoveAppCommand::execute"); + LOGI("RemoveAppCommand::execute"); #ifdef GBSBUILD package_manager_request_h pkgRequest; std::string name = mRequest->packagename(); int id; - LOG_F(INFO, "package name :%s", name.c_str()); + LOGI("package name :%s", name.c_str()); if (package_manager_request_create(&pkgRequest) == PACKAGE_MANAGER_ERROR_NONE) { if (package_manager_request_uninstall(pkgRequest, name.c_str(), &id) == PACKAGE_MANAGER_ERROR_NONE) { @@ -33,7 +33,7 @@ RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, ::grpc::Status RemoveAppCommand::executePost() { - LOG_SCOPE_F(INFO, "RemoveAppCommand::executePost"); + LOGI("RemoveAppCommand::executePost"); std::this_thread::sleep_for(std::chrono::milliseconds{5000}); return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc index 6008d44..52e137f 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc @@ -1,7 +1,6 @@ +#include "bootstrap.h" #include "SendKeyCommand.h" -#include - -#include +#include "UiDevice.h" SendKeyCommand::SendKeyCommand(const ::aurum::ReqKey* request, ::aurum::RspKey* response) @@ -11,7 +10,7 @@ SendKeyCommand::SendKeyCommand(const ::aurum::ReqKey* request, ::grpc::Status SendKeyCommand::execute() { - LOG_SCOPE_F(INFO, "SendKey --------------- "); + LOGI("SendKey --------------- "); std::shared_ptr mDevice = UiDevice::getInstance(); ::aurum::ReqKey_KeyType type = mRequest->type(); ::aurum::ReqKey_KeyActionType action_type = mRequest->actiontype(); diff --git a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc index 32cd476..8e4e4ac 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc @@ -1,5 +1,5 @@ +#include "bootstrap.h" #include "SetValueCommand.h" -#include SetValueCommand::SetValueCommand(const ::aurum::ReqSetValue* request, ::aurum::RspSetValue* response) @@ -9,7 +9,7 @@ SetValueCommand::SetValueCommand(const ::aurum::ReqSetValue* request, ::grpc::Status SetValueCommand::execute() { - LOG_SCOPE_F(INFO, "SetValue (text:%s) --------------- ", mRequest->stringvalue().c_str()); + LOGI("SetValue (text:%s) --------------- ", mRequest->stringvalue().c_str()); ObjectMapper* mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); if (obj) obj->setText(const_cast(mRequest->stringvalue())); diff --git a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc index 3206029..6d0177c 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc @@ -1,8 +1,8 @@ +#include "bootstrap.h" #include "TakeScreenshotCommand.h" -#include +#include #include "UiObject.h" #include "UiDevice.h" -#include TakeScreenshotCommand::TakeScreenshotCommand( const ::aurum::ReqTakeScreenshot* request, @@ -13,7 +13,7 @@ TakeScreenshotCommand::TakeScreenshotCommand( ::grpc::Status TakeScreenshotCommand::execute() { - LOG_SCOPE_F(INFO, "TakeScreenshot --------------- "); + LOGI("TakeScreenshot --------------- "); std::string path = "/tmp/screenshot.png"; std::shared_ptr mDevice = UiDevice::getInstance(); diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc index 533f520..c148b8a 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc @@ -1,6 +1,6 @@ +#include "bootstrap.h" #include "TouchDownCommand.h" -#include -#include +#include "UiDevice.h" TouchDownCommand::TouchDownCommand(const ::aurum::ReqTouchDown* request, ::aurum::RspTouchDown* response) @@ -10,7 +10,7 @@ TouchDownCommand::TouchDownCommand(const ::aurum::ReqTouchDown* request, ::grpc::Status TouchDownCommand::execute() { - LOG_SCOPE_F(INFO, "TouchDown --------------- "); + LOGI("TouchDown --------------- "); const aurum::Point& point_ = mRequest->coordination(); int seq = UiDevice::getInstance() ->touchDown(point_.x(), point_.y()); diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc index d31c771..2bb0423 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc @@ -1,6 +1,6 @@ +#include "bootstrap.h" #include "TouchMoveCommand.h" -#include -#include +#include "UiDevice.h" TouchMoveCommand::TouchMoveCommand(const ::aurum::ReqTouchMove* request, ::aurum::RspTouchMove* response) @@ -10,7 +10,7 @@ TouchMoveCommand::TouchMoveCommand(const ::aurum::ReqTouchMove* request, ::grpc::Status TouchMoveCommand::execute() { - LOG_SCOPE_F(INFO, "TouchMove --------------- "); + LOGI("TouchMove --------------- "); const aurum::Point& point = mRequest->coordination(); int seq = mRequest->seqid(); UiDevice::getInstance()->touchMove(point.x(), point.y(), seq); diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc index 354ccad..4fd946b 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc @@ -1,6 +1,6 @@ +#include "bootstrap.h" #include "TouchUpCommand.h" -#include -#include +#include "UiDevice.h" TouchUpCommand::TouchUpCommand(const ::aurum::ReqTouchUp* request, ::aurum::RspTouchUp* response) @@ -10,7 +10,7 @@ TouchUpCommand::TouchUpCommand(const ::aurum::ReqTouchUp* request, ::grpc::Status TouchUpCommand::execute() { - LOG_SCOPE_F(INFO, "TouchUp --------------- "); + LOGI("TouchUp --------------- "); const aurum::Point& point = mRequest->coordination(); int seq = mRequest->seqid(); UiDevice::getInstance()->touchUp(point.x(), point.y(), seq); diff --git a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc index 32b97c3..aa07fb5 100644 --- a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc +++ b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc @@ -1,6 +1,6 @@ #include "ObjectMapper.h" #include -#include +#include "bootstrap.h" #include #include @@ -21,40 +21,40 @@ std::string ObjectMapper::addElement(std::shared_ptr object) mObjectMap[key] = object; std::string value = object->getId(); mObjectMapReverse[value] = key; - LOG_SCOPE_F(INFO, "addElement %p as key %s, id %s", object.get(), key.c_str(), value.c_str()); + LOGI("addElement %p as key %s, id %s", object.get(), key.c_str(), value.c_str()); return key; } std::shared_ptr ObjectMapper::getElement(std::string key) { - LOG_SCOPE_F(INFO, "getElement for key(%s)", key.c_str()); + LOGI("getElement for key(%s)", key.c_str()); unsigned long long keyCnt = (unsigned long long)std::stoll(key); // this key is a result of calling std:to_string(mObjCounter) if (keyCnt <= 0 || keyCnt > mObjCounter) return nullptr; if (mObjectMap.count(key)) { std::shared_ptr obj = mObjectMap[key]; obj->refresh(); - LOG_F(INFO, "succeeded"); + LOGI("succeeded"); return obj; } - LOG_F(INFO, "failed(object not found)"); + LOGI("failed(object not found)"); return nullptr; } std::string ObjectMapper::getElement(std::shared_ptr object) { - LOG_SCOPE_F(INFO, "getElement for object(%p)", object.get()); + LOGI("getElement for object(%p)", object.get()); std::string value = object->getId(); if (mObjectMapReverse.count(value)) { - LOG_F(INFO, "succeeded"); + LOGI("succeeded"); return mObjectMapReverse[value]; } - LOG_F(INFO, "failed(object not found)"); + LOGI("failed(object not found)"); return std::string{""}; } bool ObjectMapper::removeElement(const std::string key) { - LOG_SCOPE_F(INFO, "removeElement for key(%s)", key.c_str()); + LOGI("removeElement for key(%s)", key.c_str()); std::shared_ptr obj = getElement(key); if (obj) { std::string value = obj->getId(); @@ -66,7 +66,7 @@ bool ObjectMapper::removeElement(const std::string key) bool ObjectMapper::removeElement(std::shared_ptr object) { - LOG_SCOPE_F(INFO, "removeElement for object(%p)", object.get()); + LOGI("removeElement for object(%p)", object.get()); std::string key = getElement(object); if (key.empty()) return false; return removeElement(key); @@ -76,7 +76,7 @@ void ObjectMapper::cleanUp() { std::stringstream ss{}; - LOG_SCOPE_F(INFO, "clean up object map"); + LOGI("clean up object map"); ss << "mObjectMapReverse: "; for(auto iter = mObjectMapReverse.begin(); iter != mObjectMapReverse.end(); ) { auto obj = mObjectMap[iter->second]; @@ -98,7 +98,7 @@ void ObjectMapper::cleanUp() } } ss << std::endl; - LOG_F(INFO, "%s", ss.str().c_str()); + LOGI("%s", ss.str().c_str()); } // std::remove_if(mObjectMapReverse.begin(), mObjectMapReverse.end(), [](auto& pair){return !pair.first->isValid();}); -- 2.7.4