From baabbdb7f31e8e0f99d04143e6ae195159428112 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Wed, 7 Jul 2021 16:52:00 +0900 Subject: [PATCH 01/16] Aurum: Remove build warnings Change-Id: Ifcd13621d8559a4d5d33865c39262fca70caad37 --- org.tizen.aurum-bootstrap/org.tizen.aurum-bootstrap.xml | 2 -- org.tizen.aurum-bootstrap/src/BootstrapServer.cc | 3 ++- org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc | 1 - packaging/aurum.spec | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/org.tizen.aurum-bootstrap/org.tizen.aurum-bootstrap.xml b/org.tizen.aurum-bootstrap/org.tizen.aurum-bootstrap.xml index fcac948..fb382b2 100644 --- a/org.tizen.aurum-bootstrap/org.tizen.aurum-bootstrap.xml +++ b/org.tizen.aurum-bootstrap/org.tizen.aurum-bootstrap.xml @@ -10,7 +10,6 @@ http://tizen.org/privilege/datasharing http://tizen.org/privilege/externalstroage - http://tizen.org/privilege/mediastorage http://tizen.org/privilege/application.info http://tizen.org/privilege/application.launch http://tizen.org/privilege/packagemanager.info @@ -21,7 +20,6 @@ http://tizen.org/privilege/appmanager.launch http://tizen.org/privilege/inputgenerator http://tizen.org/privilege/screenshot - http://tizen.org/privilege/location http://tizen.org/privilege/display true diff --git a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc index 3415218..6ef11e2 100644 --- a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc +++ b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc @@ -57,6 +57,8 @@ static void _service_app_terminate(void *data) static void _service_app_control(app_control_h app_control, void *data) { ServiceContext *ctx = (ServiceContext*)data; + if (!ctx) + LOGE("Service context is empty!"); } int main(int argc, char **argv) @@ -66,7 +68,6 @@ int main(int argc, char **argv) #endif service_app_lifecycle_callback_s event_callback; - app_event_handler_h handlers[5] = {NULL, }; ServiceContext ctx = {0,}; event_callback.create = _service_app_create; diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc index 6ecb115..219211d 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc @@ -22,7 +22,6 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request, app_state_e appState; char* label = nullptr; - int ret = -1; mResponse->set_status(::aurum::RspStatus::OK); mResponse->set_isinstalled(false); diff --git a/packaging/aurum.spec b/packaging/aurum.spec index 7e14f5d..21e21fc 100644 --- a/packaging/aurum.spec +++ b/packaging/aurum.spec @@ -29,7 +29,6 @@ BuildRequires: pkgconfig(capi-system-device) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(capi-system-system-settings) BuildRequires: pkgconfig(capi-base-utils-i18n) -BuildRequires: pkgconfig(capi-privacy-privilege-manager) %if 0%{?gendoc:1} BuildRequires: doxygen @@ -215,6 +214,4 @@ echo "signing %{TZ_SYS_RO_APP}/org.tizen.aurum-bootstrap" %files gcov %{_datadir}/gcov/obj/* %{_bindir}/test_* -%else -%exclude %{_bindir}/test_* %endif -- 2.7.4 From 118904f09e5b60e5116abca3bd8ff03daebfc62e Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Wed, 7 Jul 2021 18:23:53 +0900 Subject: [PATCH 02/16] bootstrap: Fix typo Change-Id: I3a1864a5c7825f372975adfbe873a646a1169ed9 --- org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc index 9110cb5..dc85706 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc @@ -9,7 +9,7 @@ GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation* request, ::grpc::Status GetLocationCommand::execute() { - LOGI("CliGetLocation --------------- "); + LOGI("GetLocation --------------- "); // ObjectMapper *mObjMap = ObjectMapper::getInstance(); mResponse->set_alt(-1); -- 2.7.4 From e4640c5cee1cc448de2f7237822639c64115acda Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Wed, 7 Jul 2021 19:06:24 +0900 Subject: [PATCH 03/16] bootstrap: Code and logic clean up when display off state there is no need to call device_power_wakeup(), if display already on Change-Id: Ic42d9625cf04b0a1ffec79652c4c8a5fb0d363e3 --- .../src/Commands/PreCommand.cc | 24 +++++++++++++--------- packaging/aurum.spec | 5 +++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc index b291289..82d10d5 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc @@ -15,22 +15,26 @@ PreCommand::PreCommand(Command *cmd) : mCommand{cmd} {} ::grpc::Status PreCommand::execute() { - { - LOGI("PreCommand --------------- "); - display_state_e state; - if (device_display_get_state(&state) != DEVICE_ERROR_NONE) { - LOGI("getting display state has failed"); - } +#ifndef TIZEN_TV + display_state_e state; + if (device_display_get_state(&state) != DEVICE_ERROR_NONE) { + LOGE("getting display state has failed"); + return grpc::Status::CANCELLED; + } - bool isDisplayOn = DISPLAY_STATE_SCREEN_OFF != state; + bool isDisplayOn = DISPLAY_STATE_SCREEN_OFF != state; + if (!isDisplayOn) { + LOGI("Display off state try to wake up"); if (device_power_wakeup(false) != DEVICE_ERROR_NONE) { - LOGI("turning on display has failed"); + LOGE("turning on display has failed"); + return grpc::Status::CANCELLED; } - if (!isDisplayOn) - std::this_thread::sleep_for(std::chrono::milliseconds{INTV_TURNON_MARGIN}); + std::this_thread::sleep_for(std::chrono::milliseconds{INTV_TURNON_MARGIN}); } +#endif /* TIZEN_TV */ + mCommand->executePre(); return mCommand->execute(); } diff --git a/packaging/aurum.spec b/packaging/aurum.spec index 21e21fc..f002269 100644 --- a/packaging/aurum.spec +++ b/packaging/aurum.spec @@ -131,6 +131,11 @@ meson \ -e 's%^.*: warning: .*$%\x1b[30;43m&\x1b[m%' %build + +%if "%{tizen_profile_name}" == "tv" + CFLAGS+=" -DTIZEN_TV";export CFLAGS +%endif + ninja \ -C gbsbuild \ -j %(echo "`/usr/bin/getconf _NPROCESSORS_ONLN`") \ -- 2.7.4 From 5e95ff96411687a0e5101db7225bc4082882c66c Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Wed, 7 Jul 2021 19:41:37 +0900 Subject: [PATCH 04/16] bootstrap: Log & code clean up Change-Id: Idba082a3f2e3f6396cdfad101f4f843aedf042f4 --- libaurum/inc/Aurum.h | 2 +- org.tizen.aurum-bootstrap/inc/bootstrap.h | 2 +- org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc | 28 +++++++++++++++++++++- org.tizen.aurum-bootstrap/src/BootstrapServer.cc | 2 +- .../src/Commands/CloseAppCommand.cc | 2 +- .../src/Commands/GetAttributeCommand.cc | 5 +--- .../src/Commands/InstallAppCommand.cc | 2 +- .../src/Commands/KillServerCommand.cc | 2 +- .../src/Commands/LaunchAppCommand.cc | 8 +++---- .../src/Commands/PostCommand.cc | 3 +-- .../src/Commands/RemoveAppCommand.cc | 2 +- .../src/Commands/SetValueCommand.cc | 3 ++- org.tizen.aurum-bootstrap/src/ObjectMapper.cc | 17 ++----------- 13 files changed, 44 insertions(+), 34 deletions(-) diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h index 63f6fcd..e94ac22 100644 --- a/libaurum/inc/Aurum.h +++ b/libaurum/inc/Aurum.h @@ -19,7 +19,7 @@ #ifndef LOGE #define FONT_RED "\033[31m" #define FONT_RESET "\033[0m" -#define LOGI_RED(fmt, arg...) \ +#define LOGE(fmt, arg...) \ ({ do { \ dlog_print(DLOG_ERROR, LOG_TAG, \ FONT_RED "%s: %s(%d) > " fmt FONT_RESET, \ diff --git a/org.tizen.aurum-bootstrap/inc/bootstrap.h b/org.tizen.aurum-bootstrap/inc/bootstrap.h index 429e4e5..e8e9905 100644 --- a/org.tizen.aurum-bootstrap/inc/bootstrap.h +++ b/org.tizen.aurum-bootstrap/inc/bootstrap.h @@ -19,7 +19,7 @@ #ifndef LOGE #define FONT_RED "\033[31m" #define FONT_RESET "\033[0m" -#define LOGI_RED(fmt, arg...) \ +#define LOGE(fmt, arg...) \ ({ do { \ dlog_print(DLOG_ERROR, LOG_TAG, \ FONT_RED "%s: %s(%d) > " fmt FONT_RESET, \ diff --git a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc index e733b23..705b768 100644 --- a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc +++ b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc @@ -6,12 +6,14 @@ #include "Commands/PreCommand.h" #include "config.h" +#include "bootstrap.h" using namespace grpc; using namespace aurum; aurumServiceImpl::aurumServiceImpl() { + LOGI("creates watcher instance (start to look up at_spi server)"); AccessibleWatcher::getInstance(); } @@ -24,7 +26,11 @@ aurumServiceImpl::aurumServiceImpl() return rst; } -aurumServiceImpl::~aurumServiceImpl() {} +aurumServiceImpl::~aurumServiceImpl() +{ + LOGI("bootstrap service terminated"); +} + ::grpc::Status aurumServiceImpl::aurumServiceImpl::killServer( ::grpc::ServerContext* context, const ::aurum::ReqEmpty* request, ::aurum::RspEmpty* response) @@ -32,6 +38,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::aurumServiceImpl::findElement( ::grpc::ServerContext* context, const ::aurum::ReqFindElement* request, ::aurum::RspFindElement* response) @@ -47,6 +54,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = ClickCommand::createCommand(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::getValue(::grpc::ServerContext* context, const ::aurum::ReqGetValue* request, ::aurum::RspGetValue* response) @@ -54,6 +62,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::setValue(::grpc::ServerContext* context, const ::aurum::ReqSetValue* request, ::aurum::RspSetValue* response) @@ -61,6 +70,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::getAttribute( ::grpc::ServerContext* context, const ::aurum::ReqGetAttribute* request, ::aurum::RspGetAttribute* response) @@ -68,6 +78,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = GetAttributeCommand::createCommand(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::getSize(::grpc::ServerContext* context, const ::aurum::ReqGetSize* request, ::aurum::RspGetSize* response) @@ -75,6 +86,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::clear(::grpc::ServerContext* context, const ::aurum::ReqClear* request, ::aurum::RspClear* response) @@ -82,6 +94,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::installApp( ::grpc::ServerContext* context, ::grpc::ServerReader< ::aurum::ReqInstallApp>* request, @@ -90,6 +103,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::removeApp(::grpc::ServerContext* context, const ::aurum::ReqRemoveApp* request, ::aurum::RspRemoveApp* response) @@ -97,6 +111,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::getAppInfo( ::grpc::ServerContext* context, const ::aurum::ReqGetAppInfo* request, ::aurum::RspGetAppInfo* response) @@ -104,6 +119,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::launchApp(::grpc::ServerContext* context, const ::aurum::ReqLaunchApp* request, ::aurum::RspLaunchApp* response) @@ -111,6 +127,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::closeApp(::grpc::ServerContext* context, const ::aurum::ReqCloseApp* request, ::aurum::RspCloseApp* response) @@ -118,6 +135,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::touchDown(::grpc::ServerContext* context, const ::aurum::ReqTouchDown* request, ::aurum::RspTouchDown* response) @@ -125,6 +143,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::touchUp(::grpc::ServerContext* context, const ::aurum::ReqTouchUp* request, ::aurum::RspTouchUp* response) @@ -132,6 +151,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::touchMove(::grpc::ServerContext* context, const ::aurum::ReqTouchMove* request, ::aurum::RspTouchMove* response) @@ -139,6 +159,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::longClick(::grpc::ServerContext* context, const ::aurum::ReqClick* request, ::aurum::RspClick* response) @@ -146,6 +167,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::flick(::grpc::ServerContext* context, const ::aurum::ReqFlick* request, ::aurum::RspFlick* response) @@ -153,6 +175,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::getDeviceTime( ::grpc::ServerContext* context, const ::aurum::ReqGetDeviceTime* request, ::aurum::RspGetDeviceTime* response) @@ -160,6 +183,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::getLocation( ::grpc::ServerContext* context, const ::aurum::ReqGetLocation* request, ::aurum::RspGetLocation* response) @@ -167,6 +191,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::sendKey(::grpc::ServerContext* context, const ::aurum::ReqKey* request, ::aurum::RspKey* response) @@ -174,6 +199,7 @@ aurumServiceImpl::~aurumServiceImpl() {} std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get()); } + ::grpc::Status aurumServiceImpl::takeScreenshot(::grpc::ServerContext* context, const ::aurum::ReqTakeScreenshot* request, ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer) diff --git a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc index 6ef11e2..0edd35d 100644 --- a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc +++ b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc @@ -58,7 +58,7 @@ static void _service_app_control(app_control_h app_control, void *data) { ServiceContext *ctx = (ServiceContext*)data; if (!ctx) - LOGE("Service context is empty!"); + LOGE("Service context is empty!"); } int main(int argc, char **argv) diff --git a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc index f40f7cb..e1d0b51 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc @@ -39,7 +39,7 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp* request, ::grpc::Status CloseAppCommand::executePost() { - LOGI("CloseAppCommand::executePost"); + LOGI("Wait for 1500ms"); 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/GetAttributeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc index 38a3686..cba8037 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc @@ -17,8 +17,8 @@ GetAttributeCommand::GetAttributeCommand( std::unique_ptr GetAttributeCommand::createCommand(const ::aurum::ReqGetAttribute* request, ::aurum::RspGetAttribute* response) { + LOGI("GetAttribute --------------- "); ::aurum::ReqGetAttribute_RequestType type = request->attribute(); - LOGI("type : %d", type); if (type == ::aurum::ReqGetAttribute_RequestType::ReqGetAttribute_RequestType_VISIBLE) @@ -179,7 +179,6 @@ std::unique_ptr GetAttributeCommand::createCommand(const :: return grpc::Status::OK; } - ::grpc::Status GetShowingAttributeCommand::execute() { std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); @@ -193,8 +192,6 @@ std::unique_ptr GetAttributeCommand::createCommand(const :: return grpc::Status::OK; } - - ::grpc::Status GetActiveAttributeCommand::execute() { 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 f475da2..500557a 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/InstallAppCommand.cc @@ -40,7 +40,7 @@ InstallAppCommand::InstallAppCommand( ::grpc::Status InstallAppCommand::executePost() { - LOGI("InstallAppCommand::executePost"); + LOGI("Wait for 5000ms"); 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 8a8641f..72f9e3f 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc @@ -9,7 +9,7 @@ KillServerCommand::KillServerCommand(const ::aurum::ReqEmpty* request, ::grpc::Status KillServerCommand::execute() { - LOGI("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 b2a01c3..2d2ab15 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc @@ -25,14 +25,14 @@ LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp* request, ret = app_control_create(&appControl); if (ret) { - LOGI("Launch Failed(1/3) Err Code : %ull", ret); + LOGE("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) { - LOGI("Launch Failed(2/3) Err Code : %ull", ret); + LOGE("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) { - LOGI("Launch Failed(3/3) Err Code : %ull", ret); + LOGE("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() { - LOGI("LaunchAppCommand::executePost"); + LOGI("Wait for 2500ms"); std::this_thread::sleep_for(std::chrono::milliseconds{2500}); return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc index 2a2a5e1..f9b39f0 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/PostCommand.cc @@ -8,10 +8,9 @@ PostCommand::PostCommand(Command *cmd) : mCommand{cmd} {} ::grpc::Status PostCommand::execute() { ::grpc::Status rst = mCommand->execute(); - LOGI("PostCommand --------------- "); + mCommand->executePost(); - // do post-command return rst; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc index 218e3d5..7c20460 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/RemoveAppCommand.cc @@ -33,7 +33,7 @@ RemoveAppCommand::RemoveAppCommand(const ::aurum::ReqRemoveApp* request, ::grpc::Status RemoveAppCommand::executePost() { - LOGI("RemoveAppCommand::executePost"); + LOGI("Wait for 5000ms"); std::this_thread::sleep_for(std::chrono::milliseconds{5000}); return grpc::Status::OK; } diff --git a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc index 8e4e4ac..30538fe 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc @@ -9,7 +9,8 @@ SetValueCommand::SetValueCommand(const ::aurum::ReqSetValue* request, ::grpc::Status SetValueCommand::execute() { - LOGI("SetValue (text:%s) --------------- ", mRequest->stringvalue().c_str()); + LOGI("SetValue --------------- "); + LOGI("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/ObjectMapper.cc b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc index aa07fb5..fb741ef 100644 --- a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc +++ b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc @@ -36,7 +36,7 @@ std::shared_ptr ObjectMapper::getElement(std::string key) LOGI("succeeded"); return obj; } - LOGI("failed(object not found)"); + LOGI("key is not exist in mObjectMap"); return nullptr; } @@ -48,7 +48,7 @@ std::string ObjectMapper::getElement(std::shared_ptr object) LOGI("succeeded"); return mObjectMapReverse[value]; } - LOGI("failed(object not found)"); + LOGI("object is not exist in mObjectMapReverse"); return std::string{""}; } @@ -100,16 +100,3 @@ void ObjectMapper::cleanUp() ss << std::endl; LOGI("%s", ss.str().c_str()); } - -// std::remove_if(mObjectMapReverse.begin(), mObjectMapReverse.end(), [](auto& pair){return !pair.first->isValid();}); - //auto iter = std::find_if(mObjectMap.begin(), mObjectMap.end(), [](const std::pair>& pair)->bool{ - //return !pair.second->isValid(); - //}); -/* - while ( iter != mObjectMap.end()) { - removeElement(iter->second); - iter = std::find_if(std::next(iter), mObjectMap.end(), [](const std::pair>& pair)->bool{ - return !pair.second->isValid(); - }); - } - */ -- 2.7.4 From 450485454fce77e79102c289cc4b7b879884096a Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Wed, 7 Jul 2021 19:54:31 +0900 Subject: [PATCH 05/16] Aurum: Using #pragma once to safe include guard Tizen gcc support this and it fatser than previous way conceptually. Change-Id: I049f938ac1ca1f863b896eaf09bceaaba5761651 --- libaurum/inc/A11yEvent.h | 1 + libaurum/inc/Accessibility/Accessible.h | 5 +---- libaurum/inc/Accessibility/AccessibleUtils.h | 1 + libaurum/inc/Aurum.h | 5 +---- libaurum/inc/Comparer.h | 1 + libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h | 1 + libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h | 1 + libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h | 1 + libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h | 1 + libaurum/inc/Impl/Accessibility/AtspiWrapper.h | 1 + libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h | 1 + libaurum/inc/Impl/Accessibility/MockAccessibleNode.h | 1 + libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h | 1 + libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h | 1 + libaurum/inc/Impl/MockDeviceImpl.h | 1 + libaurum/inc/Impl/TizenDeviceImpl.h | 1 + libaurum/inc/Interface/IDevice.h | 1 + libaurum/inc/Interface/ISearchable.h | 1 + libaurum/inc/Misc/Rect.h | 1 + libaurum/inc/Misc/bitmask.h | 1 + libaurum/inc/Sel.h | 1 + libaurum/inc/UiDevice.h | 1 + libaurum/inc/UiObject.h | 1 + libaurum/inc/UiScrollable.h | 1 + libaurum/inc/UiSelector.h | 1 + org.tizen.aurum-bootstrap/inc/bootstrap.h | 5 +---- 26 files changed, 26 insertions(+), 12 deletions(-) diff --git a/libaurum/inc/A11yEvent.h b/libaurum/inc/A11yEvent.h index 28ab8a4..7a2a47a 100644 --- a/libaurum/inc/A11yEvent.h +++ b/libaurum/inc/A11yEvent.h @@ -1,4 +1,5 @@ #pragma once + #include "bitmask.h" #include diff --git a/libaurum/inc/Accessibility/Accessible.h b/libaurum/inc/Accessibility/Accessible.h index 3292ad8..1f369be 100644 --- a/libaurum/inc/Accessibility/Accessible.h +++ b/libaurum/inc/Accessibility/Accessible.h @@ -1,5 +1,4 @@ -#ifndef _ACCESSIBLE_H_ -#define _ACCESSIBLE_H_ +#pragma once #include "AccessibleNode.h" #include "AccessibleUtils.h" @@ -8,5 +7,3 @@ #include "AccessibleWindow.h" #include "IEventConsumer.h" #include "IEventSource.h" - -#endif /* _ACCESSIBLE_H_ */ diff --git a/libaurum/inc/Accessibility/AccessibleUtils.h b/libaurum/inc/Accessibility/AccessibleUtils.h index 0fb722a..3b38a84 100644 --- a/libaurum/inc/Accessibility/AccessibleUtils.h +++ b/libaurum/inc/Accessibility/AccessibleUtils.h @@ -1,4 +1,5 @@ #pragma once + //#include #include diff --git a/libaurum/inc/Aurum.h b/libaurum/inc/Aurum.h index e94ac22..ae9a89e 100644 --- a/libaurum/inc/Aurum.h +++ b/libaurum/inc/Aurum.h @@ -1,5 +1,4 @@ -#ifndef _AURUM_H_ -#define _AURUM_H_ +#pragma once #include @@ -42,5 +41,3 @@ #include "Comparer.h" #include "A11yEvent.h" #include "Runnables.h" - -#endif /* _AURUM_H_ */ diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h index f6fce85..a86c3a8 100644 --- a/libaurum/inc/Comparer.h +++ b/libaurum/inc/Comparer.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include "AccessibleNode.h" diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h index 1ee5592..413945a 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleApplication.h @@ -1,4 +1,5 @@ #pragma once + #include "AccessibleApplication.h" #include diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h index 2554ab4..2f854c5 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h @@ -1,4 +1,5 @@ #pragma once + #include "AccessibleNode.h" #include diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index 3d8294f..2e36672 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -1,4 +1,5 @@ #pragma once + #include "AccessibleNode.h" #include "AccessibleWatcher.h" diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h index 95631e7..2613b28 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWindow.h @@ -1,4 +1,5 @@ #pragma once + #include "AccessibleWindow.h" class AtspiAccessibleWindow : public AccessibleWindow { diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h index 0bebabc..d817884 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h +++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h @@ -1,4 +1,5 @@ #pragma once + #include #include diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h index 76a3caa..ab987c2 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleApplication.h @@ -1,4 +1,5 @@ #pragma once + #include "AccessibleApplication.h" #include "MockAccessibleWindow.h" #include "MockAccessibleNode.h" diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h index 1f7b8fe..0913046 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleNode.h @@ -1,4 +1,5 @@ #pragma once + #include "AccessibleNode.h" #include diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h index c183248..f51097b 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWatcher.h @@ -1,4 +1,5 @@ #pragma once + #include "AccessibleNode.h" #include "AccessibleWatcher.h" diff --git a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h index a0264e9..b31491d 100644 --- a/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h +++ b/libaurum/inc/Impl/Accessibility/MockAccessibleWindow.h @@ -1,4 +1,5 @@ #pragma once + #include "AccessibleWindow.h" #include "MockAccessibleNode.h" diff --git a/libaurum/inc/Impl/MockDeviceImpl.h b/libaurum/inc/Impl/MockDeviceImpl.h index 241af8c..342e748 100644 --- a/libaurum/inc/Impl/MockDeviceImpl.h +++ b/libaurum/inc/Impl/MockDeviceImpl.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include "IDevice.h" diff --git a/libaurum/inc/Impl/TizenDeviceImpl.h b/libaurum/inc/Impl/TizenDeviceImpl.h index f72eb0c..01541db 100644 --- a/libaurum/inc/Impl/TizenDeviceImpl.h +++ b/libaurum/inc/Impl/TizenDeviceImpl.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include "IDevice.h" diff --git a/libaurum/inc/Interface/IDevice.h b/libaurum/inc/Interface/IDevice.h index fd97087..84a93cd 100644 --- a/libaurum/inc/Interface/IDevice.h +++ b/libaurum/inc/Interface/IDevice.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include diff --git a/libaurum/inc/Interface/ISearchable.h b/libaurum/inc/Interface/ISearchable.h index 97d7c1b..d90bd30 100644 --- a/libaurum/inc/Interface/ISearchable.h +++ b/libaurum/inc/Interface/ISearchable.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include "UiSelector.h" diff --git a/libaurum/inc/Misc/Rect.h b/libaurum/inc/Misc/Rect.h index 18e9a91..3976688 100644 --- a/libaurum/inc/Misc/Rect.h +++ b/libaurum/inc/Misc/Rect.h @@ -1,4 +1,5 @@ #pragma once + #include "Point2D.h" /** diff --git a/libaurum/inc/Misc/bitmask.h b/libaurum/inc/Misc/bitmask.h index 0dda2f6..865d025 100644 --- a/libaurum/inc/Misc/bitmask.h +++ b/libaurum/inc/Misc/bitmask.h @@ -1,4 +1,5 @@ #pragma once + #include template diff --git a/libaurum/inc/Sel.h b/libaurum/inc/Sel.h index 5f5e700..e06dbc5 100644 --- a/libaurum/inc/Sel.h +++ b/libaurum/inc/Sel.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index 504ceff..ae16a63 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include "UiObject.h" diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index b670dd7..8da6376 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include "AccessibleNode.h" diff --git a/libaurum/inc/UiScrollable.h b/libaurum/inc/UiScrollable.h index ecabb2f..d60e51e 100644 --- a/libaurum/inc/UiScrollable.h +++ b/libaurum/inc/UiScrollable.h @@ -1,4 +1,5 @@ #pragma once + #include "UiObject.h" #include /** diff --git a/libaurum/inc/UiSelector.h b/libaurum/inc/UiSelector.h index bbd789f..b9729be 100644 --- a/libaurum/inc/UiSelector.h +++ b/libaurum/inc/UiSelector.h @@ -1,4 +1,5 @@ #pragma once + #include "config.h" #include diff --git a/org.tizen.aurum-bootstrap/inc/bootstrap.h b/org.tizen.aurum-bootstrap/inc/bootstrap.h index e8e9905..6a4545b 100644 --- a/org.tizen.aurum-bootstrap/inc/bootstrap.h +++ b/org.tizen.aurum-bootstrap/inc/bootstrap.h @@ -1,5 +1,4 @@ -#ifndef _BOOTSTRAP_H_ -#define _BOOTSTRAP_H_ +#pragma once #include @@ -26,5 +25,3 @@ __FILE__, __func__, __LINE__, ##arg); \ } while (0); }) #endif - -#endif \ No newline at end of file -- 2.7.4 From 3b4c973358424f9e52715c209230a1fe17b80073 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Thu, 8 Jul 2021 14:40:38 +0900 Subject: [PATCH 06/16] bootstrap: Avoid unnecessary object search and clean A command that does not create an object no need to clean the object. Change-Id: I2c4e81a3a8739b2b4e28e8bf98ff8ed68aa961ba --- org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h | 2 +- org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc | 50 +++++++++++------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h index 9c0d637..10577af 100644 --- a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h +++ b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h @@ -10,7 +10,7 @@ public: virtual ~aurumServiceImpl(); protected: - ::grpc::Status execute(Command *cmd); + ::grpc::Status execute(Command *cmd, bool clean); public: ::grpc::Status killServer(::grpc::ServerContext * context, diff --git a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc index 705b768..bf12ff8 100644 --- a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc +++ b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc @@ -17,12 +17,12 @@ aurumServiceImpl::aurumServiceImpl() AccessibleWatcher::getInstance(); } -::grpc::Status aurumServiceImpl::execute(Command* cmd) +::grpc::Status aurumServiceImpl::execute(Command* cmd, bool clean) { std::unique_ptr proxyPreCmd = std::make_unique(cmd); std::unique_ptr proxyPostCmd = std::make_unique(proxyPreCmd.get()); ::grpc::Status rst = proxyPostCmd->execute(); - ObjectMapper::getInstance()->cleanUp(); + if (clean) ObjectMapper::getInstance()->cleanUp(); return rst; } @@ -36,7 +36,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspEmpty* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::aurumServiceImpl::findElement( @@ -44,7 +44,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspFindElement* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::aurumServiceImpl::click( @@ -52,7 +52,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspClick* response) { std::unique_ptr cmd = ClickCommand::createCommand(request, response); - return execute(cmd.get()); + return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::getValue(::grpc::ServerContext* context, @@ -60,7 +60,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspGetValue* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::setValue(::grpc::ServerContext* context, @@ -68,7 +68,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspSetValue* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::getAttribute( @@ -76,7 +76,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspGetAttribute* response) { std::unique_ptr cmd = GetAttributeCommand::createCommand(request, response); - return execute(cmd.get()); + return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::getSize(::grpc::ServerContext* context, @@ -84,7 +84,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspGetSize* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::clear(::grpc::ServerContext* context, @@ -92,7 +92,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspClear* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::installApp( @@ -101,7 +101,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspInstallApp* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::removeApp(::grpc::ServerContext* context, @@ -109,7 +109,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspRemoveApp* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::getAppInfo( @@ -117,7 +117,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspGetAppInfo* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::launchApp(::grpc::ServerContext* context, @@ -125,7 +125,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspLaunchApp* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::closeApp(::grpc::ServerContext* context, @@ -133,7 +133,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspCloseApp* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::touchDown(::grpc::ServerContext* context, @@ -141,7 +141,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspTouchDown* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::touchUp(::grpc::ServerContext* context, @@ -149,7 +149,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspTouchUp* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::touchMove(::grpc::ServerContext* context, @@ -157,7 +157,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspTouchMove* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::longClick(::grpc::ServerContext* context, @@ -165,7 +165,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspClick* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::flick(::grpc::ServerContext* context, @@ -173,7 +173,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspFlick* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::getDeviceTime( @@ -181,7 +181,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspGetDeviceTime* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::getLocation( @@ -189,7 +189,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspGetLocation* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::sendKey(::grpc::ServerContext* context, @@ -197,7 +197,7 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspKey* response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::takeScreenshot(::grpc::ServerContext* context, @@ -205,7 +205,7 @@ aurumServiceImpl::~aurumServiceImpl() ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer) { std::unique_ptr cmd = std::make_unique(request, writer); - return execute(cmd.get()); + return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::dumpObjectTree(::grpc::ServerContext *context, @@ -213,5 +213,5 @@ aurumServiceImpl::~aurumServiceImpl() ::aurum::RspDumpObjectTree * response) { std::unique_ptr cmd = std::make_unique(request, response); - return execute(cmd.get()); + return execute(cmd.get(), true); } -- 2.7.4 From af3f9372ba9afffde4fdc9d9fb41f4763ebfba28 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Thu, 8 Jul 2021 17:07:03 +0900 Subject: [PATCH 07/16] Aurum: Gets meaningful log from lib and fix build error on 64bit system Change-Id: I0824512b64b32034e8f6db5ef683cb33bb5f2aac --- libaurum/src/Accessibility/AccessibleWatcher.cc | 22 ++-------------------- libaurum/src/Comparer.cc | 2 +- .../Impl/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> AccessibleWatcher::getActiveApplications(void) const { - LOGI("getActiveApplications for this(%p)", this); - std::vector> 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> Comparer::findObjects(const std::sh { std::list> partialList{}; std::vector> 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 AtspiAccessibleWatcher::getApplicationAt( std::vector> AtspiAccessibleWatcher::getApplications(void) const { AtspiWrapper::lock(); - 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); 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> UiDevice::getWindowRoot() const auto activeWindows = app->getActiveWindows(); std::transform(activeWindows.begin(), activeWindows.end(), std::back_inserter(ret), [&](std::shared_ptr 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.7.4 From b6689f8da509d628a25ea425caea585035de89cb Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Thu, 8 Jul 2021 18:10:16 +0900 Subject: [PATCH 08/16] libaurum: Delete class name in log class name will be added at the defined macro. Change-Id: I960c109688832f5e97c530116afd69705dbdb592 --- libaurum/src/Until.cc | 6 +++--- libaurum/src/Waiter.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libaurum/src/Until.cc b/libaurum/src/Until.cc index 987627a..8fb8d85 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 { - LOGI("Until::hasObject search:%p", searchable); + LOGI("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 { - LOGI("Until::findObject search:%p", searchable); + LOGI("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 { - LOGI("Until::checkable checkable:%d for obj %p", isCheckable, object); + LOGI("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 05b4f63..1990895 100644 --- a/libaurum/src/Waiter.cc +++ b/libaurum/src/Waiter.cc @@ -28,7 +28,7 @@ template bool Waiter::waitFor( template R Waiter::waitFor(const std::function condition) const { - LOGI("Waiter::waitFor ISearchable"); + LOGI("waitFor ISearchable"); std::chrono::system_clock::time_point start = std::chrono::system_clock::now(); R result = condition(mSearchableObject); @@ -46,7 +46,7 @@ R Waiter::waitFor(const std::function condition) const template R Waiter::waitFor(const std::function condition) const { - LOGI("Waiter::waitFor UiObject"); + LOGI("waitFor UiObject"); if (mUiObject) { std::chrono::system_clock::time_point start = std::chrono::system_clock::now(); -- 2.7.4 From 1efb8b2395f6e4ddde56339f26f6812a8448a203 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 9 Jul 2021 13:13:01 +0900 Subject: [PATCH 09/16] bootstrap: Delete check display state and wake up It's not good for performance and user can do this at user side. Change-Id: Ie964ea2eba3f7bc3acc6dd45296a65be20fb66f4 --- org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc | 20 -------------------- packaging/aurum.spec | 4 ---- 2 files changed, 24 deletions(-) diff --git a/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc index 82d10d5..60142c6 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/PreCommand.cc @@ -15,26 +15,6 @@ PreCommand::PreCommand(Command *cmd) : mCommand{cmd} {} ::grpc::Status PreCommand::execute() { -#ifndef TIZEN_TV - display_state_e state; - if (device_display_get_state(&state) != DEVICE_ERROR_NONE) { - LOGE("getting display state has failed"); - return grpc::Status::CANCELLED; - } - - bool isDisplayOn = DISPLAY_STATE_SCREEN_OFF != state; - - if (!isDisplayOn) { - LOGI("Display off state try to wake up"); - if (device_power_wakeup(false) != DEVICE_ERROR_NONE) { - LOGE("turning on display has failed"); - return grpc::Status::CANCELLED; - } - - std::this_thread::sleep_for(std::chrono::milliseconds{INTV_TURNON_MARGIN}); - } -#endif /* TIZEN_TV */ - mCommand->executePre(); return mCommand->execute(); } diff --git a/packaging/aurum.spec b/packaging/aurum.spec index f002269..399c75e 100644 --- a/packaging/aurum.spec +++ b/packaging/aurum.spec @@ -132,10 +132,6 @@ meson \ %build -%if "%{tizen_profile_name}" == "tv" - CFLAGS+=" -DTIZEN_TV";export CFLAGS -%endif - ninja \ -C gbsbuild \ -j %(echo "`/usr/bin/getconf _NPROCESSORS_ONLN`") \ -- 2.7.4 From 7675a6ecdb16e98be0a558ff1d5e2557d42bd2c3 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 9 Jul 2021 13:16:27 +0900 Subject: [PATCH 10/16] Aurum: Disable Mock test at build time It's not need do every build, changed it as optional. Change-Id: I456425fc47c2fd8c4fa01166792a157eefd8f8f0 --- packaging/aurum.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packaging/aurum.spec b/packaging/aurum.spec index 399c75e..181fddb 100644 --- a/packaging/aurum.spec +++ b/packaging/aurum.spec @@ -145,9 +145,10 @@ ninja \ find . -name '*.gcno' -exec cp '{}' gcov-obj ';' %endif -meson test \ - -C gbsbuild \ - -v +#Enable below test if needed +#meson test \ +# -C gbsbuild \ +# -v %install -- 2.7.4 From a0948d4eacd21d285320a388d2827bea0c75ce8f Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 9 Jul 2021 13:36:04 +0900 Subject: [PATCH 11/16] libaurum: Fix indentation and clean code up Change-Id: Idb5cd19e866da6d9471b052424cd32af6b8b2f51 --- libaurum/inc/Comparer.h | 2 +- .../inc/Impl/Accessibility/AtspiAccessibleNode.h | 2 +- .../Impl/Accessibility/AtspiAccessibleWatcher.h | 24 +++++++------- libaurum/inc/Impl/Accessibility/AtspiWrapper.h | 38 +++++++++++----------- libaurum/inc/UiDevice.h | 2 +- libaurum/inc/UiObject.h | 2 +- libaurum/inc/Waiter.h | 4 +-- libaurum/src/Accessibility/AccessibleNode.cc | 34 ++----------------- libaurum/src/Comparer.cc | 2 +- .../src/Impl/Accessibility/AtspiAccessibleNode.cc | 6 ++-- .../Impl/Accessibility/AtspiAccessibleWatcher.cc | 12 +++---- libaurum/src/Impl/Accessibility/AtspiWrapper.cc | 38 +++++++++++----------- .../src/Impl/Accessibility/MockAccessibleNode.cc | 2 +- libaurum/src/Impl/MockDeviceImpl.cc | 13 +++++--- libaurum/src/Impl/TizenDeviceImpl.cc | 28 ++++++++-------- libaurum/src/UiObject.cc | 2 +- libaurum/src/UiScrollable.cc | 6 +--- libaurum/src/UiSelector.cc | 14 -------- 18 files changed, 92 insertions(+), 139 deletions(-) diff --git a/libaurum/inc/Comparer.h b/libaurum/inc/Comparer.h index a86c3a8..5ca1029 100644 --- a/libaurum/inc/Comparer.h +++ b/libaurum/inc/Comparer.h @@ -36,7 +36,7 @@ public: * @brief TBD * @since_tizen 5.5 */ - static std::shared_ptr findObject(const std::shared_ptr device, + static std::shared_ptr findObject(const std::shared_ptr device, const std::shared_ptr selector, const std::shared_ptr root); diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h index 2f854c5..89ddb5d 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleNode.h @@ -92,5 +92,5 @@ private: * @brief TBD * @since_tizen 5.5 */ - AtspiAccessible* mNode; + AtspiAccessible *mNode; }; \ No newline at end of file diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index 2e36672..5c1f9b2 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -40,37 +40,37 @@ public: * @brief TBD * @since_tizen 5.5 */ - virtual void onWindowActivated(AtspiAccessible* node, WindowActivateInfoType type) = 0; + virtual void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) = 0; /** * @brief TBD * @since_tizen 5.5 */ - virtual void onWindowDeactivated(AtspiAccessible* node) = 0; + virtual void onWindowDeactivated(AtspiAccessible *node) = 0; /** * @brief TBD * @since_tizen 5.5 */ - virtual void onWindowCreated(AtspiAccessible* node) = 0; + virtual void onWindowCreated(AtspiAccessible *node) = 0; /** * @brief TBD * @since_tizen 5.5 */ - virtual void onWindowDestroyed(AtspiAccessible* node) = 0; + virtual void onWindowDestroyed(AtspiAccessible *node) = 0; /** * @brief TBD * @since_tizen 5.5 */ - virtual void onVisibilityChanged(AtspiAccessible* node, bool visible) = 0; + virtual void onVisibilityChanged(AtspiAccessible *node, bool visible) = 0; /** * @brief TBD * @since_tizen 5.5 */ - virtual void onObjectDefunct(AtspiAccessible* node) = 0; + virtual void onObjectDefunct(AtspiAccessible *node) = 0; }; @@ -115,37 +115,37 @@ public: * @brief TBD * @since_tizen 5.5 */ - void onWindowActivated(AtspiAccessible* node, WindowActivateInfoType type) override; + void onWindowActivated(AtspiAccessible *node, WindowActivateInfoType type) override; /** * @brief TBD * @since_tizen 5.5 */ - void onWindowDeactivated(AtspiAccessible* node) override; + void onWindowDeactivated(AtspiAccessible *node) override; /** * @brief TBD * @since_tizen 5.5 */ - void onWindowCreated(AtspiAccessible* node) override; + void onWindowCreated(AtspiAccessible *node) override; /** * @brief TBD * @since_tizen 5.5 */ - void onWindowDestroyed(AtspiAccessible* node) override; + void onWindowDestroyed(AtspiAccessible *node) override; /** * @brief TBD * @since_tizen 5.5 */ - void onVisibilityChanged(AtspiAccessible* node, bool visible) override; + void onVisibilityChanged(AtspiAccessible *node, bool visible) override; /** * @brief TBD * @since_tizen 5.5 */ - void onObjectDefunct(AtspiAccessible* node) override; + void onObjectDefunct(AtspiAccessible *node) override; /** * @brief TBD diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h index d817884..869ba6a 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h +++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h @@ -5,28 +5,28 @@ class AtspiWrapper { public: - static GArray* Atspi_state_set_get_states(AtspiStateSet *set); - static GArray* Atspi_accessible_get_interfaces(AtspiAccessible *node); - static gchar* Atspi_accessible_get_name(AtspiAccessible *node, GError **error); - static AtspiAccessible* Atspi_get_desktop(int n); + static GArray *Atspi_state_set_get_states(AtspiStateSet *set); + static GArray *Atspi_accessible_get_interfaces(AtspiAccessible *node); + static gchar *Atspi_accessible_get_name(AtspiAccessible *node, GError **error); + static AtspiAccessible *Atspi_get_desktop(int n); static int Atspi_accessible_get_child_count(AtspiAccessible *node, GError **error); - static AtspiAccessible* Atspi_accessible_get_child_at_index(AtspiAccessible *node, int index, GError **error); - static AtspiAccessible* Atspi_accessible_get_parent(AtspiAccessible *node, GError **error); - static AtspiStateSet* Atspi_accessible_get_state_set(AtspiAccessible *node); + static AtspiAccessible *Atspi_accessible_get_child_at_index(AtspiAccessible *node, int index, GError **error); + static AtspiAccessible *Atspi_accessible_get_parent(AtspiAccessible *node, GError **error); + static AtspiStateSet *Atspi_accessible_get_state_set(AtspiAccessible *node); static gboolean Atspi_state_set_contains(AtspiStateSet *set , AtspiStateType state); - static gchar* Atspi_accessible_get_role_name(AtspiAccessible *node, GError **error); - static gchar* Atspi_accessible_get_unique_id(AtspiAccessible *node, GError **error); - static GHashTable* Atspi_accessible_get_attributes(AtspiAccessible *node, GError **error); - static AtspiComponent* Atspi_accessible_get_component_iface(AtspiAccessible *node); - static AtspiRect* Atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error); - static AtspiAction* Atspi_accessible_get_action_iface(AtspiAccessible *node); - static int Atspi_action_get_n_actions(AtspiAction* action, GError **error); - static gchar* Atspi_action_get_action_name(AtspiAction* action, int index, GError **error); + static gchar *Atspi_accessible_get_role_name(AtspiAccessible *node, GError **error); + static gchar *Atspi_accessible_get_unique_id(AtspiAccessible *node, GError **error); + static GHashTable *Atspi_accessible_get_attributes(AtspiAccessible *node, GError **error); + static AtspiComponent *Atspi_accessible_get_component_iface(AtspiAccessible *node); + static AtspiRect *Atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error); + static AtspiAction *Atspi_accessible_get_action_iface(AtspiAccessible *node); + static int Atspi_action_get_n_actions(AtspiAction *action, GError **error); + static gchar *Atspi_action_get_action_name(AtspiAction *action, int index, GError **error); static gboolean Atspi_action_do_action(AtspiAction *action, int index, GError **error); - static AtspiEditableText* Atspi_accessible_get_editable_text(AtspiAccessible *node); - static gboolean Atspi_editable_text_delete_text(AtspiEditableText*, int start, int end, GError **error); - static gboolean Atspi_editable_text_insert_text(AtspiEditableText*, int pos, const gchar *text, int len, GError **error); - static AtspiAccessible* Atspi_accessible_get_application (AtspiAccessible *node, GError **error); + static AtspiEditableText *Atspi_accessible_get_editable_text(AtspiAccessible *node); + static gboolean Atspi_editable_text_delete_text(AtspiEditableText *, int start, int end, GError **error); + static gboolean Atspi_editable_text_insert_text(AtspiEditableText *, int pos, const gchar *text, int len, GError **error); + static AtspiAccessible *Atspi_accessible_get_application (AtspiAccessible *node, GError **error); static void Atspi_accessible_clear_cache (AtspiAccessible *node); static void lock(); diff --git a/libaurum/inc/UiDevice.h b/libaurum/inc/UiDevice.h index ae16a63..dbda79c 100644 --- a/libaurum/inc/UiDevice.h +++ b/libaurum/inc/UiDevice.h @@ -222,7 +222,7 @@ private: /** * @brief TBD */ - IDevice * mDeviceImpl; + IDevice *mDeviceImpl; /** * @brief TBD */ diff --git a/libaurum/inc/UiObject.h b/libaurum/inc/UiObject.h index 8da6376..b764fb5 100644 --- a/libaurum/inc/UiObject.h +++ b/libaurum/inc/UiObject.h @@ -325,7 +325,7 @@ private: /** * @brief TBD */ - const Waiter * mWaiter; + const Waiter *mWaiter; /** * @brief TBD diff --git a/libaurum/inc/Waiter.h b/libaurum/inc/Waiter.h index 135ccc3..ae33f60 100644 --- a/libaurum/inc/Waiter.h +++ b/libaurum/inc/Waiter.h @@ -21,7 +21,7 @@ public: * @since_tizen 5.5 */ Waiter(const ISearchable *searchableObject, - const UiObject * uiObject = nullptr); // : mObject{object} + const UiObject *uiObject = nullptr); // : mObject{object} /** * @brief TBD @@ -55,7 +55,7 @@ private: * @brief TBD * @since_tizen 5.5 */ - const UiObject * mUiObject; + const UiObject *mUiObject; /** * @brief TBD diff --git a/libaurum/src/Accessibility/AccessibleNode.cc b/libaurum/src/Accessibility/AccessibleNode.cc index 070d97c..791913d 100644 --- a/libaurum/src/Accessibility/AccessibleNode.cc +++ b/libaurum/src/Accessibility/AccessibleNode.cc @@ -19,6 +19,7 @@ AccessibleNode::AccessibleNode() std::string AccessibleNode::description() { std::stringstream ss{}; + ss << "{"; ss << "\"mId\":\"" << this->mId << "\", "; ss << "\"mAutomationId\":\"" << this->mAutomationId << "\", "; @@ -27,39 +28,8 @@ std::string AccessibleNode::description() { ss << "\"mPkg\":\"" << this->mPkg << "\", "; ss << "\"mType\":\"" << this->mType << "\", "; ss << "\"mStyle\":\"" << this->mStyle << "\", "; - /* - if(this->mMatchId) ss << "\"mMatchId\":\"" << ((*this->mMatchId)?"true":"false") << "\", "; - if(this->mMatchAutomationId) ss << "\"mMatchAutomationId\":\"" << ((*this->mMatchAutomationId)?"true":"false") << "\", "; - if(this->mMatchRole) ss << "\"mMatchRole\":\"" << ((*this->mMatchRole)?"true":"false") << "\", "; - if(this->mMatchText) ss << "\"mMatchText\":\"" << ((*this->mMatchText)?"true":"false") << "\", "; - if(this->mMatchPkg) ss << "\"mMatchPkg\":\"" << ((*this->mMatchPkg)?"true":"false") << "\", "; - if(this->mMatchType) ss << "\"mMatchType\":\"" << ((*this->mMatchType)?"true":"false") << "\", "; - if(this->mMatchStyle) ss << "\"mMatchStyle\":\"" << ((*this->mMatchStyle)?"true":"false" )<< "\", "; - if(this->mMinDepth) ss << "\"mMinDepth\":\"" << *this->mMinDepth << "\", "; - if(this->mMaxDepth) ss << "\"mMaxDepth\":\"" << *this->mMaxDepth << "\", "; - if(this->mIschecked) ss << "\"mIschecked\":\"" << ((*this->mIschecked)?"true":"false") << "\", "; - if(this->mIscheckable) ss << "\"mIscheckable\":\"" << ((*this->mIscheckable)?"true":"false") << "\", "; - if(this->mIsclickable) ss << "\"mIsclickable\":\"" << ((*this->mIsclickable)?"true":"false") << "\", "; - if(this->mIsenabled) ss << "\"mIsenabled\":\"" << ((*this->mIsenabled)?"true":"false") << "\", "; - if(this->mIsfocused) ss << "\"mIsfocused\":\"" << ((*this->mIsfocused)?"true":"false") << "\", "; - if(this->mIsfocusable) ss << "\"mIsfocusable\":\"" << ((*this->mIsfocusable)?"true":"false") << "\", "; - if(this->mIsscrollable) ss << "\"mIsscrollable\":\"" << ((*this->mIsscrollable)?"true":"false") << "\", "; - if(this->mIsselected) ss << "\"mIsselected\":\"" << ((*this->mIsselected)?"true":"false") << "\", "; - if(this->mIsshowing) ss << "\"mIsshowing\":\"" << ((*this->mIsshowing)?"true":"false") << "\", "; - if(this->mIsactive) ss << "\"mIsactive\":\"" << ((*this->mIsactive)?"true":"false") << "\", "; - if(this->mIsvisible) ss << "\"mIsvisible\":\"" << ((*this->mIsvisible)?"true":"false") << "\", "; - if(this->mIsselectable) ss << "\"mIsselectable\":\"" << ((*this->mIsselectable)?"true":"false") << "\", "; - if(this->mParent) { - ss << "\"mParent\":" << this->mParent->description(); - } - ss << "\"mChild\":["; - for ( auto child = mChild.begin(); child != mChild.end(); child++) { - ss << (*child)->description(); - if (child+1 != mChild.end()) ss << ", " ; - } - ss << "]"; - */ ss << "}"; + return ss.str(); } diff --git a/libaurum/src/Comparer.cc b/libaurum/src/Comparer.cc index f7300ce..1aee954 100644 --- a/libaurum/src/Comparer.cc +++ b/libaurum/src/Comparer.cc @@ -79,7 +79,7 @@ std::vector> Comparer::findObjects( } } } else { - 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); + 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()){ diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc index 2b165d2..a5641f9 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc @@ -5,12 +5,10 @@ #include -//std::map AccessibleNode::mNodeMap{}; - AtspiAccessibleNode::AtspiAccessibleNode(AtspiAccessible *node) : mNode{node} { - const auto trickDontRemove = std::shared_ptr( this, [](AtspiAccessibleNode*){} ); + const auto trickDontRemove = std::shared_ptr( this, [](AtspiAccessibleNode *){} ); auto watcher = AccessibleWatcher::getInstance(); watcher->attach(shared_from_this()); @@ -93,7 +91,7 @@ bool AtspiAccessibleNode::isValid() const void* AtspiAccessibleNode::getRawHandler(void) const { - return static_cast(mNode); + return static_cast(mNode); } void AtspiAccessibleNode::refresh() diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index 04b21b1..a58a89f 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -60,7 +60,7 @@ findActiveNode(AtspiAccessible *node, int depth, 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); + AtspiAccessible *child = AtspiWrapper::Atspi_accessible_get_child_at_index(node, i, NULL); 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()); @@ -73,7 +73,7 @@ findActiveNode(AtspiAccessible *node, int depth, static gpointer _event_thread_loop (gpointer data) { LOGI("event thread start"); - AtspiEventListener * listener = + AtspiEventListener *listener = atspi_event_listener_new(AtspiAccessibleWatcher::onAtspiEvents, data, NULL); atspi_event_listener_register(listener, "window:", NULL); @@ -93,7 +93,7 @@ AtspiAccessibleWatcher::AtspiAccessibleWatcher() : mDbusProxy{nullptr} { GVariant *enabled_variant = nullptr, *result = nullptr; - GError * error = nullptr; + GError *error = nullptr; atspi_set_main_context (g_main_context_default ()); atspi_init(); @@ -119,7 +119,7 @@ AtspiAccessibleWatcher::AtspiAccessibleWatcher() AtspiAccessibleWatcher::~AtspiAccessibleWatcher() { GVariant *enabled_variant = nullptr, *result = nullptr; - GError * error = nullptr; + GError *error = nullptr; enabled_variant = g_variant_new_boolean(false); result = g_dbus_proxy_call_sync( @@ -244,7 +244,7 @@ std::shared_ptr AtspiAccessibleWatcher::getApplicationAt( { AtspiWrapper::lock(); AtspiAccessible *root = AtspiWrapper::Atspi_get_desktop(0); - AtspiAccessible* child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, index, NULL); + AtspiAccessible *child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, index, NULL); g_object_unref(root); AtspiWrapper::unlock(); return std::make_shared(std::make_shared(child)); @@ -263,7 +263,7 @@ std::vector> AtspiAccessibleWatcher::getA } for (int i = 0; i < nchild; i++){ - AtspiAccessible* child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, i, NULL); + AtspiAccessible *child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, i, NULL); if (child) { ret.push_back(std::make_shared(std::make_shared(child))); } diff --git a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc index 69e47c6..cf76dcd 100644 --- a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc +++ b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc @@ -3,25 +3,25 @@ std::recursive_mutex AtspiWrapper::mMutex = std::recursive_mutex{}; //std::unique_lock AtspiWrapper::mLock = std::unique_lock(mMutex, std::defer_lock); -GArray* AtspiWrapper::Atspi_state_set_get_states(AtspiStateSet *set) +GArray *AtspiWrapper::Atspi_state_set_get_states(AtspiStateSet *set) { std::unique_lock lock(mMutex); return atspi_state_set_get_states(set); } -GArray* AtspiWrapper::Atspi_accessible_get_interfaces(AtspiAccessible *node) +GArray *AtspiWrapper::Atspi_accessible_get_interfaces(AtspiAccessible *node) { std::unique_lock lock(mMutex); return atspi_accessible_get_interfaces(node); } -gchar* AtspiWrapper::Atspi_accessible_get_name(AtspiAccessible *node, GError **error) +gchar *AtspiWrapper::Atspi_accessible_get_name(AtspiAccessible *node, GError **error) { std::unique_lock lock(mMutex); return atspi_accessible_get_name(node, error); } -AtspiAccessible* AtspiWrapper::Atspi_get_desktop(int n) +AtspiAccessible *AtspiWrapper::Atspi_get_desktop(int n) { std::unique_lock lock(mMutex); return atspi_get_desktop(n); @@ -33,19 +33,19 @@ int AtspiWrapper::Atspi_accessible_get_child_count(AtspiAccessible *node, GError return atspi_accessible_get_child_count(node, error); } -AtspiAccessible* AtspiWrapper::Atspi_accessible_get_child_at_index(AtspiAccessible *node, int index, GError **error) +AtspiAccessible *AtspiWrapper::Atspi_accessible_get_child_at_index(AtspiAccessible *node, int index, GError **error) { std::unique_lock lock(mMutex); return atspi_accessible_get_child_at_index(node, index, error); } -AtspiAccessible* AtspiWrapper::Atspi_accessible_get_parent(AtspiAccessible *node, GError **error) +AtspiAccessible *AtspiWrapper::Atspi_accessible_get_parent(AtspiAccessible *node, GError **error) { std::unique_lock lock(mMutex); return atspi_accessible_get_parent(node, error); } -AtspiStateSet* AtspiWrapper::Atspi_accessible_get_state_set(AtspiAccessible *node) +AtspiStateSet *AtspiWrapper::Atspi_accessible_get_state_set(AtspiAccessible *node) { std::unique_lock lock(mMutex); return atspi_accessible_get_state_set(node); @@ -57,49 +57,49 @@ gboolean AtspiWrapper::Atspi_state_set_contains(AtspiStateSet *set , AtspiStateT return atspi_state_set_contains(set , state); } -gchar* AtspiWrapper::Atspi_accessible_get_role_name(AtspiAccessible *node, GError **error) +gchar *AtspiWrapper::Atspi_accessible_get_role_name(AtspiAccessible *node, GError **error) { std::unique_lock lock(mMutex); return atspi_accessible_get_role_name(node, error); } -gchar* AtspiWrapper::Atspi_accessible_get_unique_id(AtspiAccessible *node, GError **error) +gchar *AtspiWrapper::Atspi_accessible_get_unique_id(AtspiAccessible *node, GError **error) { std::unique_lock lock(mMutex); return atspi_accessible_get_unique_id(node, error); } -GHashTable* AtspiWrapper::Atspi_accessible_get_attributes(AtspiAccessible *node, GError **error) +GHashTable *AtspiWrapper::Atspi_accessible_get_attributes(AtspiAccessible *node, GError **error) { std::unique_lock lock(mMutex); return atspi_accessible_get_attributes(node, error); } -AtspiComponent* AtspiWrapper::Atspi_accessible_get_component_iface(AtspiAccessible *node) +AtspiComponent *AtspiWrapper::Atspi_accessible_get_component_iface(AtspiAccessible *node) { std::unique_lock lock(mMutex); return atspi_accessible_get_component_iface(node); } -AtspiRect* AtspiWrapper::Atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error) +AtspiRect *AtspiWrapper::Atspi_component_get_extents(AtspiComponent *obj, AtspiCoordType ctype, GError **error) { std::unique_lock lock(mMutex); return atspi_component_get_extents(obj, ctype, error); } -AtspiAction* AtspiWrapper::Atspi_accessible_get_action_iface(AtspiAccessible *node) +AtspiAction *AtspiWrapper::Atspi_accessible_get_action_iface(AtspiAccessible *node) { std::unique_lock lock(mMutex); return atspi_accessible_get_action_iface(node); } -int AtspiWrapper::Atspi_action_get_n_actions(AtspiAction* action, GError **error) +int AtspiWrapper::Atspi_action_get_n_actions(AtspiAction *action, GError **error) { std::unique_lock lock(mMutex); return atspi_action_get_n_actions(action, error); } -gchar* AtspiWrapper::Atspi_action_get_action_name(AtspiAction* action, int index, GError **error) +gchar *AtspiWrapper::Atspi_action_get_action_name(AtspiAction *action, int index, GError **error) { std::unique_lock lock(mMutex); return atspi_action_get_action_name(action, index, error); @@ -111,25 +111,25 @@ gboolean AtspiWrapper::Atspi_action_do_action(AtspiAction *action, int index, GE return atspi_action_do_action(action, index, error); } -AtspiEditableText* AtspiWrapper::Atspi_accessible_get_editable_text(AtspiAccessible *node) +AtspiEditableText *AtspiWrapper::Atspi_accessible_get_editable_text(AtspiAccessible *node) { std::unique_lock lock(mMutex); return atspi_accessible_get_editable_text(node); } -gboolean AtspiWrapper::Atspi_editable_text_delete_text(AtspiEditableText* iface, int start, int end, GError **error) +gboolean AtspiWrapper::Atspi_editable_text_delete_text(AtspiEditableText *iface, int start, int end, GError **error) { std::unique_lock lock(mMutex); return atspi_editable_text_delete_text(iface, start, end, error); } -gboolean AtspiWrapper::Atspi_editable_text_insert_text(AtspiEditableText* iface, int pos, const gchar *text, int len, GError **error) +gboolean AtspiWrapper::Atspi_editable_text_insert_text(AtspiEditableText *iface, int pos, const gchar *text, int len, GError **error) { std::unique_lock lock(mMutex); return atspi_editable_text_insert_text(iface, pos, text, len, error); } -AtspiAccessible* AtspiWrapper::Atspi_accessible_get_application (AtspiAccessible *node, GError **error) +AtspiAccessible *AtspiWrapper::Atspi_accessible_get_application (AtspiAccessible *node, GError **error) { std::unique_lock lock(mMutex); return atspi_accessible_get_application(node, error); diff --git a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc index 121c31d..9e3a8e6 100644 --- a/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/MockAccessibleNode.cc @@ -8,7 +8,7 @@ MockAccessibleNode::MockAccessibleNode(std::shared_ptr parent, s : mParentNode(parent), mChildrenList{}, mActionSet{} { printf("%s:%d / %s\n",__FILE__, __LINE__, __PRETTY_FUNCTION__); - const auto trickDontRemove = std::shared_ptr( this, [](MockAccessibleNode*){} ); + const auto trickDontRemove = std::shared_ptr( this, [](MockAccessibleNode *){} ); setProperties(text,pkg,role,res,type,style,automationId, boundingBox, supportingIfaces, featureProperty); auto watcher = AccessibleWatcher::getInstance(); diff --git a/libaurum/src/Impl/MockDeviceImpl.cc b/libaurum/src/Impl/MockDeviceImpl.cc index 0184b44..855ceb3 100644 --- a/libaurum/src/Impl/MockDeviceImpl.cc +++ b/libaurum/src/Impl/MockDeviceImpl.cc @@ -15,6 +15,9 @@ #include #include +#define NANO_SEC 1000000000.0 +#define MICRO_SEC 1000000 + MockDeviceImpl::MockDeviceImpl() :tStart{}, isTimerStarted{false}, mTouchRelease{}, mTouchDown{}, mKeyDevice{}, mWheelDevice{0} { @@ -104,7 +107,7 @@ bool MockDeviceImpl::wheelUp(int amount, const int durationMs) { for (int i = 0; i < amount; i++){ mWheelDevice++; - usleep(durationMs*MSEC_PER_SEC/amount); + usleep(durationMs * MSEC_PER_SEC/amount); } return true; @@ -114,7 +117,7 @@ bool MockDeviceImpl::wheelDown(int amount, const int durationMs) { for (int i = 0; i < amount; i++){ mWheelDevice--; - usleep(durationMs*MSEC_PER_SEC/(double)amount); + usleep(durationMs * MSEC_PER_SEC/(double)amount); } return true; @@ -180,7 +183,7 @@ long long MockDeviceImpl::getSystemTime(TimeRequestType type) clock_gettime(CLOCK_REALTIME, &t); } - return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / 1000000); + return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / MICRO_SEC); } bool MockDeviceImpl::strokeKeyCode(std::string keycode, unsigned int intv) @@ -220,13 +223,13 @@ int MockDeviceImpl::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; } long long MockDeviceImpl::timeStamp(void) { struct timespec t; clock_gettime(CLOCK_MONOTONIC, &t); - long long rtn = (t.tv_sec + t.tv_nsec/1000000000.0) * 1000000; + long long rtn = (t.tv_sec + t.tv_nsec/NANO_SEC) * MICRO_SEC; return rtn; } diff --git a/libaurum/src/Impl/TizenDeviceImpl.cc b/libaurum/src/Impl/TizenDeviceImpl.cc index 446d041..ea0792a 100644 --- a/libaurum/src/Impl/TizenDeviceImpl.cc +++ b/libaurum/src/Impl/TizenDeviceImpl.cc @@ -22,7 +22,7 @@ TizenDeviceImpl::TizenDeviceImpl() : mFakeTouchHandle{0}, mFakeKeyboardHandle{0}, mFakeWheelHandle{0}, tStart{}, isTimerStarted{false}, mTouchSeq{} { LOGI("device implementation init"); - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); obj->mFakeTouchHandle = efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_TOUCHSCREEN); obj->mFakeKeyboardHandle = efl_util_input_initialize_generator(EFL_UTIL_INPUT_DEVTYPE_KEYBOARD); @@ -30,7 +30,7 @@ TizenDeviceImpl::TizenDeviceImpl() TizenDeviceImpl::~TizenDeviceImpl() { - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); efl_util_input_deinitialize_generator(obj->mFakeTouchHandle); efl_util_input_deinitialize_generator(obj->mFakeKeyboardHandle); } @@ -58,7 +58,7 @@ int TizenDeviceImpl::touchDown(const int x, const int y) int seq = grabTouchSeqNumber(); LOGI("touch down %d %d , seq:%d", x, y, seq); if (seq >= 0) { - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_BEGIN, x, y); @@ -74,7 +74,7 @@ bool TizenDeviceImpl::touchMove(const int x, const int y, const int seq) { LOGI("touch move %d %d, seq:%d", x, y, seq); if (seq >= 0) { - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_UPDATE, x, y); return result == EFL_UTIL_ERROR_NONE; @@ -86,7 +86,7 @@ bool TizenDeviceImpl::touchUp(const int x, const int y, const int seq) { LOGI("touch up %d %d, seq:%d", x, y, seq); if (seq >= 0) { - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); long result = (long)efl_util_input_generate_touch(obj->mFakeTouchHandle, seq, EFL_UTIL_INPUT_TOUCH_END, x, y); return releaseTouchSeqNumber(seq) && result == EFL_UTIL_ERROR_NONE; @@ -98,12 +98,12 @@ bool TizenDeviceImpl::wheelUp(int amount, const int durationMs) { LOGI("wheel up %d for %d", amount, durationMs); long result = -1; - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); obj->mFakeWheelHandle = efl_util_input_initialize_generator_with_sync(EFL_UTIL_INPUT_DEVTYPE_POINTER, NULL); for (int i = 0; i < amount; i++){ - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); result = (long)efl_util_input_generate_wheel(obj->mFakeWheelHandle, EFL_UTIL_INPUT_POINTER_WHEEL_HORZ, 1); - usleep(durationMs*MSEC_PER_SEC/amount); + usleep(durationMs * MSEC_PER_SEC/amount); } efl_util_input_deinitialize_generator(obj->mFakeWheelHandle); @@ -114,12 +114,12 @@ bool TizenDeviceImpl::wheelDown(int amount, const int durationMs) { LOGI("wheel down %d for %d", amount, durationMs); long result = -1; - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); obj->mFakeWheelHandle = efl_util_input_initialize_generator_with_sync(EFL_UTIL_INPUT_DEVTYPE_POINTER, NULL); for (int i = 0; i < amount; i++){ - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); result = (long)efl_util_input_generate_wheel(obj->mFakeWheelHandle, EFL_UTIL_INPUT_POINTER_WHEEL_HORZ, -1); - usleep(durationMs*MSEC_PER_SEC/amount); + usleep(durationMs * MSEC_PER_SEC/amount); } efl_util_input_deinitialize_generator(obj->mFakeWheelHandle); @@ -231,14 +231,14 @@ bool TizenDeviceImpl::strokeKeyCode(std::string keycode, unsigned int intv) bool TizenDeviceImpl::pressKeyCode(std::string keycode) { - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); long result = (long)efl_util_input_generate_key(obj->mFakeKeyboardHandle, keycode.c_str(), 1); return result == EFL_UTIL_ERROR_NONE; } bool TizenDeviceImpl::releaseKeyCode(std::string keycode) { - TizenDeviceImpl *obj = static_cast(this); + TizenDeviceImpl *obj = static_cast(this); long result = (long)efl_util_input_generate_key(obj->mFakeKeyboardHandle, keycode.c_str(), 0); return result == EFL_UTIL_ERROR_NONE; } @@ -280,7 +280,7 @@ public: virtual long long getTime() = 0; protected: long long convertTime(struct timespec t){ - return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / 1000000); + return (long long)t.tv_sec * 1000L + (long long)(t.tv_nsec / MICRO_SEC); } }; diff --git a/libaurum/src/UiObject.cc b/libaurum/src/UiObject.cc index db48098..f802b6a 100644 --- a/libaurum/src/UiObject.cc +++ b/libaurum/src/UiObject.cc @@ -17,7 +17,7 @@ UiObject::UiObject(const std::shared_ptr device, const std::shared_ptr const AccessibleNode *node) : mDevice(device), mSelector(selector), - mNode(std::shared_ptr(const_cast(node))), + mNode(std::shared_ptr(const_cast(node))), mWaiter(new Waiter{this, this}) { } diff --git a/libaurum/src/UiScrollable.cc b/libaurum/src/UiScrollable.cc index 7c4ca8a..cae156d 100644 --- a/libaurum/src/UiScrollable.cc +++ b/libaurum/src/UiScrollable.cc @@ -38,11 +38,7 @@ bool UiScrollable::scrollForward() bool UiScrollable::scrollForward(int steps) { -/* - 화면 크기 확인 - scroll to - -*/ + //TODO Check Scree Size here return true; } diff --git a/libaurum/src/UiSelector.cc b/libaurum/src/UiSelector.cc index 5caad3d..ae83625 100644 --- a/libaurum/src/UiSelector.cc +++ b/libaurum/src/UiSelector.cc @@ -58,20 +58,6 @@ std::string UiSelector::description() return ss.str(); } -/* -UiSelector::UiSelector(const UiSelector &src) -{ - // 복사 생성자 -} - -UiSelector& UiSelector::operator= (const UiSelector& src) -{ - // = 오버라이드 - if (this == &src) return *this; // 자기 대입 방지 - return *this; -} -*/ - UiSelector *UiSelector::text(std::string text, bool match) { this->mText = std::make_unique(text); -- 2.7.4 From a3cecaff4ec31f62edba59f4eecba6223c11ebf9 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 9 Jul 2021 13:49:08 +0900 Subject: [PATCH 12/16] proto: Delete an invalid type values attribute checks and returns only bool type. Change-Id: Iadc2aec7f3647044dceee7641a25ef9564963403 --- protocol/aurum.proto | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/protocol/aurum.proto b/protocol/aurum.proto index 23f6f67..639bed7 100644 --- a/protocol/aurum.proto +++ b/protocol/aurum.proto @@ -234,13 +234,7 @@ message ReqGetAttribute { } message RspGetAttribute { RspStatus status = 1; - ParamType type = 2; - oneof params { - string stringValue = 3; - int32 intValue = 4; - double doubleValue = 5; - bool boolValue = 6; - } + bool boolValue = 2; } // ------------------------------------ // -- 2.7.4 From 14e4b207f70b8d4d0e6d7b27d8514af98a75fa70 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 9 Jul 2021 15:13:47 +0900 Subject: [PATCH 13/16] bootstrap: Fix indentation and code clean up Change-Id: I813501c1222bed9292a983fecc0b6c5bfabdf7ca --- org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h | 80 +++++++------- .../inc/Commands/ClearCommand.h | 6 +- .../inc/Commands/ClickCommand.h | 8 +- .../inc/Commands/CloseAppCommand.h | 8 +- .../inc/Commands/DumpObjectTreeCommand.h | 10 +- .../inc/Commands/FindElementCommand.h | 10 +- .../inc/Commands/FlickCommand.h | 6 +- .../inc/Commands/GetAppInfoCommand.h | 8 +- .../inc/Commands/GetAttributeCommand.h | 14 +-- .../inc/Commands/GetDeviceTimeCommand.h | 8 +- .../inc/Commands/GetLocationCommand.h | 8 +- .../inc/Commands/GetSizeCommand.h | 8 +- .../inc/Commands/GetValueCommand.h | 8 +- .../inc/Commands/InstallAppCommand.h | 8 +- .../inc/Commands/KillServerCommand.h | 8 +- .../inc/Commands/LaunchAppCommand.h | 8 +- .../inc/Commands/LongClickCommand.h | 8 +- .../inc/Commands/RemoveAppCommand.h | 8 +- .../inc/Commands/SendKeyCommand.h | 6 +- .../inc/Commands/SetValueCommand.h | 8 +- .../inc/Commands/TakeScreenshotCommand.h | 8 +- .../inc/Commands/TouchDownCommand.h | 8 +- .../inc/Commands/TouchMoveCommand.h | 8 +- .../inc/Commands/TouchUpCommand.h | 8 +- org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc | 122 ++++++++++----------- org.tizen.aurum-bootstrap/src/BootstrapServer.cc | 10 +- .../src/Commands/ClearCommand.cc | 8 +- .../src/Commands/ClickCommand.cc | 10 +- .../src/Commands/CloseAppCommand.cc | 6 +- .../src/Commands/DumpObjectTreeCommand.cc | 8 +- .../src/Commands/FindElementCommand.cc | 8 +- .../src/Commands/FlickCommand.cc | 2 +- .../src/Commands/GetAppInfoCommand.cc | 6 +- .../src/Commands/GetAttributeCommand.cc | 6 +- .../src/Commands/GetDeviceTimeCommand.cc | 4 +- .../src/Commands/GetLocationCommand.cc | 5 +- .../src/Commands/GetSizeCommand.cc | 4 +- .../src/Commands/GetValueCommand.cc | 8 +- .../src/Commands/KillServerCommand.cc | 4 +- .../src/Commands/LaunchAppCommand.cc | 4 +- .../src/Commands/LongClickCommand.cc | 6 +- .../src/Commands/SendKeyCommand.cc | 4 +- .../src/Commands/SetValueCommand.cc | 5 +- .../src/Commands/TakeScreenshotCommand.cc | 4 +- .../src/Commands/TouchDownCommand.cc | 4 +- .../src/Commands/TouchMoveCommand.cc | 4 +- .../src/Commands/TouchUpCommand.cc | 4 +- org.tizen.aurum-bootstrap/src/ObjectMapper.cc | 4 +- 48 files changed, 258 insertions(+), 260 deletions(-) diff --git a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h index 10577af..cbd4145 100644 --- a/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h +++ b/org.tizen.aurum-bootstrap/inc/AurumServiceImpl.h @@ -13,80 +13,80 @@ protected: ::grpc::Status execute(Command *cmd, bool clean); public: - ::grpc::Status killServer(::grpc::ServerContext * context, + ::grpc::Status killServer(::grpc::ServerContext *context, const ::aurum::ReqEmpty *request, - ::aurum::RspEmpty * response) override; + ::aurum::RspEmpty *response) override; - ::grpc::Status findElement(::grpc::ServerContext * context, + ::grpc::Status findElement(::grpc::ServerContext *context, const ::aurum::ReqFindElement *request, ::aurum::RspFindElement *response) override; - ::grpc::Status getValue(::grpc::ServerContext * context, + ::grpc::Status getValue(::grpc::ServerContext *context, const ::aurum::ReqGetValue *request, - ::aurum::RspGetValue * response) override; - ::grpc::Status setValue(::grpc::ServerContext * context, + ::aurum::RspGetValue *response) override; + ::grpc::Status setValue(::grpc::ServerContext *context, const ::aurum::ReqSetValue *request, - ::aurum::RspSetValue * response) override; - ::grpc::Status getAttribute(::grpc::ServerContext * context, + ::aurum::RspSetValue *response) override; + ::grpc::Status getAttribute(::grpc::ServerContext *context, const ::aurum::ReqGetAttribute *request, ::aurum::RspGetAttribute *response) override; - ::grpc::Status getSize(::grpc::ServerContext * context, + ::grpc::Status getSize(::grpc::ServerContext *context, const ::aurum::ReqGetSize *request, - ::aurum::RspGetSize * response) override; - ::grpc::Status clear(::grpc::ServerContext * context, + ::aurum::RspGetSize *response) override; + ::grpc::Status clear(::grpc::ServerContext *context, const ::aurum::ReqClear *request, - ::aurum::RspClear * response) override; + ::aurum::RspClear *response) override; ::grpc::Status installApp( - ::grpc::ServerContext * context, + ::grpc::ServerContext *context, ::grpc::ServerReader< ::aurum::ReqInstallApp> *reader, - ::aurum::RspInstallApp * response) override; - ::grpc::Status removeApp(::grpc::ServerContext * context, + ::aurum::RspInstallApp *response) override; + ::grpc::Status removeApp(::grpc::ServerContext *context, const ::aurum::ReqRemoveApp *request, - ::aurum::RspRemoveApp * response) override; - ::grpc::Status getAppInfo(::grpc::ServerContext * context, + ::aurum::RspRemoveApp *response) override; + ::grpc::Status getAppInfo(::grpc::ServerContext *context, const ::aurum::ReqGetAppInfo *request, - ::aurum::RspGetAppInfo * response) override; - ::grpc::Status launchApp(::grpc::ServerContext * context, + ::aurum::RspGetAppInfo *response) override; + ::grpc::Status launchApp(::grpc::ServerContext *context, const ::aurum::ReqLaunchApp *request, - ::aurum::RspLaunchApp * response) override; - ::grpc::Status closeApp(::grpc::ServerContext * context, + ::aurum::RspLaunchApp *response) override; + ::grpc::Status closeApp(::grpc::ServerContext *context, const ::aurum::ReqCloseApp *request, - ::aurum::RspCloseApp * response) override; + ::aurum::RspCloseApp *response) override; - ::grpc::Status click(::grpc::ServerContext * context, + ::grpc::Status click(::grpc::ServerContext *context, const ::aurum::ReqClick *request, - ::aurum::RspClick * response) override; - ::grpc::Status longClick(::grpc::ServerContext * context, + ::aurum::RspClick *response) override; + ::grpc::Status longClick(::grpc::ServerContext *context, const ::aurum::ReqClick *request, - ::aurum::RspClick * response) override; - ::grpc::Status flick(::grpc::ServerContext * context, + ::aurum::RspClick *response) override; + ::grpc::Status flick(::grpc::ServerContext *context, const ::aurum::ReqFlick *request, - ::aurum::RspFlick * response) override; + ::aurum::RspFlick *response) override; - ::grpc::Status touchDown(::grpc::ServerContext * context, + ::grpc::Status touchDown(::grpc::ServerContext *context, const ::aurum::ReqTouchDown *request, - ::aurum::RspTouchDown * response) override; - ::grpc::Status touchUp(::grpc::ServerContext * context, + ::aurum::RspTouchDown *response) override; + ::grpc::Status touchUp(::grpc::ServerContext *context, const ::aurum::ReqTouchUp *request, - ::aurum::RspTouchUp * response) override; - ::grpc::Status touchMove(::grpc::ServerContext * context, + ::aurum::RspTouchUp *response) override; + ::grpc::Status touchMove(::grpc::ServerContext *context, const ::aurum::ReqTouchMove *request, - ::aurum::RspTouchMove * response) override; - ::grpc::Status getDeviceTime(::grpc::ServerContext * context, + ::aurum::RspTouchMove *response) override; + ::grpc::Status getDeviceTime(::grpc::ServerContext *context, const ::aurum::ReqGetDeviceTime *request, ::aurum::RspGetDeviceTime *response) override; - ::grpc::Status getLocation(::grpc::ServerContext * context, + ::grpc::Status getLocation(::grpc::ServerContext *context, const ::aurum::ReqGetLocation *request, ::aurum::RspGetLocation *response) override; ::grpc::Status sendKey(::grpc::ServerContext *context, const ::aurum::ReqKey *request, - ::aurum::RspKey * response) override; + ::aurum::RspKey *response) override; ::grpc::Status takeScreenshot(::grpc::ServerContext *context, - const ::aurum::ReqTakeScreenshot * request, - ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer) override; + const ::aurum::ReqTakeScreenshot *request, + ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *writer) override; ::grpc::Status dumpObjectTree(::grpc::ServerContext *context, const ::aurum::ReqDumpObjectTree *request, - ::aurum::RspDumpObjectTree * response) override; + ::aurum::RspDumpObjectTree *response) override; }; diff --git a/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h index 5a9391c..21fc670 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/ClearCommand.h @@ -9,11 +9,11 @@ class ClearCommand : public Command { private: - const ::aurum::ReqClear* mRequest; - ::aurum::RspClear* mResponse; + const ::aurum::ReqClear *mRequest; + ::aurum::RspClear *mResponse; public: - ClearCommand(const ::aurum::ReqClear* request, ::aurum::RspClear* response); + ClearCommand(const ::aurum::ReqClear *request, ::aurum::RspClear *response); ::grpc::Status execute() override; protected: diff --git a/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h index aafaf97..9d62d34 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/ClickCommand.h @@ -8,13 +8,13 @@ #include "config.h" class ClickCommand : public Command { protected: - const ::aurum::ReqClick* mRequest; - ::aurum::RspClick* mResponse; + const ::aurum::ReqClick *mRequest; + ::aurum::RspClick *mResponse; public: - ClickCommand(const ::aurum::ReqClick* request, ::aurum::RspClick* response); + ClickCommand(const ::aurum::ReqClick *request, ::aurum::RspClick *response); ::grpc::Status execute() override; - static std::unique_ptr createCommand(const ::aurum::ReqClick* request, ::aurum::RspClick* response); + static std::unique_ptr createCommand(const ::aurum::ReqClick *request, ::aurum::RspClick *response); }; class ClickElementCommand : public ClickCommand { diff --git a/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h index 81bc6c4..a3074ce 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/CloseAppCommand.h @@ -9,12 +9,12 @@ class CloseAppCommand : public Command { private: - const ::aurum::ReqCloseApp* mRequest; - ::aurum::RspCloseApp* mResponse; + const ::aurum::ReqCloseApp *mRequest; + ::aurum::RspCloseApp *mResponse; public: - CloseAppCommand(const ::aurum::ReqCloseApp* request, - ::aurum::RspCloseApp* response); + CloseAppCommand(const ::aurum::ReqCloseApp *request, + ::aurum::RspCloseApp *response); ::grpc::Status execute() override; ::grpc::Status executePost() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h index 1e320fa..e09bd7d 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/DumpObjectTreeCommand.h @@ -10,15 +10,15 @@ class DumpObjectTreeCommand: public Command { protected: - const ::aurum::ReqDumpObjectTree* mRequest; - ::aurum::RspDumpObjectTree* mResponse; + const ::aurum::ReqDumpObjectTree *mRequest; + ::aurum::RspDumpObjectTree *mResponse; protected: - ObjectMapper* mObjMap; + ObjectMapper *mObjMap; public: - DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree* request, - ::aurum::RspDumpObjectTree* response); + DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree *request, + ::aurum::RspDumpObjectTree *response); ::grpc::Status execute() override; private: diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h index cc52270..202ede2 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/FindElementCommand.h @@ -9,15 +9,15 @@ class FindElementCommand : public Command { protected: - const ::aurum::ReqFindElement* mRequest; - ::aurum::RspFindElement* mResponse; + const ::aurum::ReqFindElement *mRequest; + ::aurum::RspFindElement *mResponse; protected: - ObjectMapper* mObjMap; + ObjectMapper *mObjMap; public: - FindElementCommand(const ::aurum::ReqFindElement* request, - ::aurum::RspFindElement* response); + FindElementCommand(const ::aurum::ReqFindElement *request, + ::aurum::RspFindElement *response); ::grpc::Status execute() override; protected: virtual std::shared_ptr getSearchableTop(void); diff --git a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h index 1a6d5c5..ac3f177 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/FlickCommand.h @@ -9,12 +9,12 @@ class FlickCommand : public Command { private: - const ::aurum::ReqFlick* mRequest; - ::aurum::RspFlick* mResponse; + const ::aurum::ReqFlick *mRequest; + ::aurum::RspFlick *mResponse; const unsigned int MINIMUM_TOUCHEVENT_INTV_MS = 25; public: - FlickCommand(const ::aurum::ReqFlick* request, ::aurum::RspFlick* response); + FlickCommand(const ::aurum::ReqFlick *request, ::aurum::RspFlick *response); ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h index 7bdd8a6..4e94c54 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAppInfoCommand.h @@ -9,12 +9,12 @@ class GetAppInfoCommand : public Command { private: - const ::aurum::ReqGetAppInfo* mRequest; - ::aurum::RspGetAppInfo* mResponse; + const ::aurum::ReqGetAppInfo *mRequest; + ::aurum::RspGetAppInfo *mResponse; public: - GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request, - ::aurum::RspGetAppInfo* response); + GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, + ::aurum::RspGetAppInfo *response); ; ::grpc::Status execute() override; }; diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h index f1e3d7b..749156b 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetAttributeCommand.h @@ -9,16 +9,16 @@ class GetAttributeCommand : public Command { protected: - const ::aurum::ReqGetAttribute* mRequest; - ::aurum::RspGetAttribute* mResponse; - ObjectMapper* mObjMap; + const ::aurum::ReqGetAttribute *mRequest; + ::aurum::RspGetAttribute *mResponse; + ObjectMapper *mObjMap; public: - GetAttributeCommand(const ::aurum::ReqGetAttribute* request, - ::aurum::RspGetAttribute* response); + GetAttributeCommand(const ::aurum::ReqGetAttribute *request, + ::aurum::RspGetAttribute *response); ::grpc::Status execute() override; - static std::unique_ptr createCommand(const ::aurum::ReqGetAttribute* request, - ::aurum::RspGetAttribute* response); + static std::unique_ptr createCommand(const ::aurum::ReqGetAttribute *request, + ::aurum::RspGetAttribute *response); }; class GetVisibleAttributeCommand : public GetAttributeCommand { diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h index a366961..d261d2c 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetDeviceTimeCommand.h @@ -9,12 +9,12 @@ class GetDeviceTimeCommand : public Command { private: - const ::aurum::ReqGetDeviceTime* mRequest; - ::aurum::RspGetDeviceTime* mResponse; + const ::aurum::ReqGetDeviceTime *mRequest; + ::aurum::RspGetDeviceTime *mResponse; public: - GetDeviceTimeCommand(const ::aurum::ReqGetDeviceTime* request, - ::aurum::RspGetDeviceTime* response); + GetDeviceTimeCommand(const ::aurum::ReqGetDeviceTime *request, + ::aurum::RspGetDeviceTime *response); ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h index 1591233..e153a43 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetLocationCommand.h @@ -9,12 +9,12 @@ class GetLocationCommand : public Command { private: - const ::aurum::ReqGetLocation* mRequest; - ::aurum::RspGetLocation* mResponse; + const ::aurum::ReqGetLocation *mRequest; + ::aurum::RspGetLocation *mResponse; public: - GetLocationCommand(const ::aurum::ReqGetLocation* request, - ::aurum::RspGetLocation* response); + GetLocationCommand(const ::aurum::ReqGetLocation *request, + ::aurum::RspGetLocation *response); ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h index eae1ceb..ad2a528 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetSizeCommand.h @@ -9,12 +9,12 @@ class GetSizeCommand : public Command { private: - const ::aurum::ReqGetSize* mRequest; - ::aurum::RspGetSize* mResponse; + const ::aurum::ReqGetSize *mRequest; + ::aurum::RspGetSize *mResponse; public: - GetSizeCommand(const ::aurum::ReqGetSize* request, - ::aurum::RspGetSize* response); + GetSizeCommand(const ::aurum::ReqGetSize *request, + ::aurum::RspGetSize *response); ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h index 09617ec..22ab0db 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/GetValueCommand.h @@ -9,12 +9,12 @@ class GetValueCommand : public Command { private: - const ::aurum::ReqGetValue* mRequest; - ::aurum::RspGetValue* mResponse; + const ::aurum::ReqGetValue *mRequest; + ::aurum::RspGetValue *mResponse; public: - GetValueCommand(const ::aurum::ReqGetValue* request, - ::aurum::RspGetValue* response); + GetValueCommand(const ::aurum::ReqGetValue *request, + ::aurum::RspGetValue *response); ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h index 7ef0c32..1c2e6b2 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/InstallAppCommand.h @@ -9,12 +9,12 @@ class InstallAppCommand : public Command { private: - ::grpc::ServerReader< ::aurum::ReqInstallApp>* mRequest; - ::aurum::RspInstallApp* mResponse; + ::grpc::ServerReader< ::aurum::ReqInstallApp> *mRequest; + ::aurum::RspInstallApp *mResponse; public: - InstallAppCommand(::grpc::ServerReader< ::aurum::ReqInstallApp>* request, - ::aurum::RspInstallApp* response); + InstallAppCommand(::grpc::ServerReader< ::aurum::ReqInstallApp> *request, + ::aurum::RspInstallApp *response); ::grpc::Status execute() override; ::grpc::Status executePost() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h index a8cc9e4..50ff081 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/KillServerCommand.h @@ -9,12 +9,12 @@ class KillServerCommand : public Command { private: - const ::aurum::ReqEmpty* mRequest; - ::aurum::RspEmpty* mResponse; + const ::aurum::ReqEmpty *mRequest; + ::aurum::RspEmpty *mResponse; public: - KillServerCommand(const ::aurum::ReqEmpty* request, - ::aurum::RspEmpty* response); + KillServerCommand(const ::aurum::ReqEmpty *request, + ::aurum::RspEmpty *response); ; ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h index 9702917..a08d30c 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/LaunchAppCommand.h @@ -9,12 +9,12 @@ class LaunchAppCommand : public Command { private: - const ::aurum::ReqLaunchApp* mRequest; - ::aurum::RspLaunchApp* mResponse; + const ::aurum::ReqLaunchApp *mRequest; + ::aurum::RspLaunchApp *mResponse; public: - LaunchAppCommand(const ::aurum::ReqLaunchApp* request, - ::aurum::RspLaunchApp* response); + LaunchAppCommand(const ::aurum::ReqLaunchApp *request, + ::aurum::RspLaunchApp *response); ::grpc::Status execute() override; ::grpc::Status executePost() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h index 12fa17f..5b25ab9 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/LongClickCommand.h @@ -9,12 +9,12 @@ class LongClickCommand : public Command { private: - const ::aurum::ReqClick* mRequest; - ::aurum::RspClick* mResponse; + const ::aurum::ReqClick *mRequest; + ::aurum::RspClick *mResponse; public: - LongClickCommand(const ::aurum::ReqClick* request, - ::aurum::RspClick* response); + LongClickCommand(const ::aurum::ReqClick *request, + ::aurum::RspClick *response); ::grpc::Status execute() override; private: const static unsigned int LOGNCLICK_INTERVAL = 50; diff --git a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h index f45ff5a..4351629 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/RemoveAppCommand.h @@ -9,12 +9,12 @@ class RemoveAppCommand : public Command { private: - const ::aurum::ReqRemoveApp* mRequest; - ::aurum::RspRemoveApp* mResponse; + const ::aurum::ReqRemoveApp *mRequest; + ::aurum::RspRemoveApp *mResponse; public: - RemoveAppCommand(const ::aurum::ReqRemoveApp* request, - ::aurum::RspRemoveApp* response); + RemoveAppCommand(const ::aurum::ReqRemoveApp *request, + ::aurum::RspRemoveApp *response); ; ::grpc::Status execute() override; ::grpc::Status executePost() override; diff --git a/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h index 1a7678a..4efb6d9 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/SendKeyCommand.h @@ -9,10 +9,10 @@ class SendKeyCommand : public Command { private: - const ::aurum::ReqKey* mRequest; - ::aurum::RspKey* mResponse; + const ::aurum::ReqKey *mRequest; + ::aurum::RspKey *mResponse; public: - SendKeyCommand(const ::aurum::ReqKey* request, ::aurum::RspKey* response); + SendKeyCommand(const ::aurum::ReqKey *request, ::aurum::RspKey *response); ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h index 2bc5dd5..7a37943 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/SetValueCommand.h @@ -9,11 +9,11 @@ class SetValueCommand : public Command { private: - const ::aurum::ReqSetValue* mRequest; - ::aurum::RspSetValue* mResponse; + const ::aurum::ReqSetValue *mRequest; + ::aurum::RspSetValue *mResponse; public: - SetValueCommand(const ::aurum::ReqSetValue* request, - ::aurum::RspSetValue* response); + SetValueCommand(const ::aurum::ReqSetValue *request, + ::aurum::RspSetValue *response); ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h index 41e0a8e..d67c889 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TakeScreenshotCommand.h @@ -9,11 +9,11 @@ class TakeScreenshotCommand : public Command { private: - const ::aurum::ReqTakeScreenshot* mRequest; - ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* mWriter; + const ::aurum::ReqTakeScreenshot *mRequest; + ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *mWriter; public: - TakeScreenshotCommand(const ::aurum::ReqTakeScreenshot* request, - ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer); + TakeScreenshotCommand(const ::aurum::ReqTakeScreenshot *request, + ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *writer); ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h index acd0f1b..b9c6b84 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchDownCommand.h @@ -9,11 +9,11 @@ class TouchDownCommand : public Command { private: - const ::aurum::ReqTouchDown* mRequest; - ::aurum::RspTouchDown* mResponse; + const ::aurum::ReqTouchDown *mRequest; + ::aurum::RspTouchDown *mResponse; public: - TouchDownCommand(const ::aurum::ReqTouchDown* request, - ::aurum::RspTouchDown* response); + TouchDownCommand(const ::aurum::ReqTouchDown *request, + ::aurum::RspTouchDown *response); ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h index 2182e3b..b8f6e01 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchMoveCommand.h @@ -9,11 +9,11 @@ class TouchMoveCommand : public Command { private: - const ::aurum::ReqTouchMove* mRequest; - ::aurum::RspTouchMove* mResponse; + const ::aurum::ReqTouchMove *mRequest; + ::aurum::RspTouchMove *mResponse; public: - TouchMoveCommand(const ::aurum::ReqTouchMove* request, - ::aurum::RspTouchMove* response); + TouchMoveCommand(const ::aurum::ReqTouchMove *request, + ::aurum::RspTouchMove *response); ::grpc::Status execute() override; }; \ No newline at end of file diff --git a/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h b/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h index ed746ac..9210b31 100644 --- a/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h +++ b/org.tizen.aurum-bootstrap/inc/Commands/TouchUpCommand.h @@ -9,11 +9,11 @@ class TouchUpCommand : public Command { private: - const ::aurum::ReqTouchUp* mRequest; - ::aurum::RspTouchUp* mResponse; + const ::aurum::ReqTouchUp *mRequest; + ::aurum::RspTouchUp *mResponse; public: - TouchUpCommand(const ::aurum::ReqTouchUp* request, - ::aurum::RspTouchUp* response); + TouchUpCommand(const ::aurum::ReqTouchUp *request, + ::aurum::RspTouchUp *response); ::grpc::Status execute() override; }; \ 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 bf12ff8..586bac5 100644 --- a/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc +++ b/org.tizen.aurum-bootstrap/src/AurumServiceImpl.cc @@ -17,7 +17,7 @@ aurumServiceImpl::aurumServiceImpl() AccessibleWatcher::getInstance(); } -::grpc::Status aurumServiceImpl::execute(Command* cmd, bool clean) +::grpc::Status aurumServiceImpl::execute(Command *cmd, bool clean) { std::unique_ptr proxyPreCmd = std::make_unique(cmd); std::unique_ptr proxyPostCmd = std::make_unique(proxyPreCmd.get()); @@ -32,177 +32,177 @@ aurumServiceImpl::~aurumServiceImpl() } ::grpc::Status aurumServiceImpl::aurumServiceImpl::killServer( - ::grpc::ServerContext* context, const ::aurum::ReqEmpty* request, - ::aurum::RspEmpty* response) + ::grpc::ServerContext *context, const ::aurum::ReqEmpty *request, + ::aurum::RspEmpty *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::aurumServiceImpl::findElement( - ::grpc::ServerContext* context, const ::aurum::ReqFindElement* request, - ::aurum::RspFindElement* response) + ::grpc::ServerContext *context, const ::aurum::ReqFindElement *request, + ::aurum::RspFindElement *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::aurumServiceImpl::click( - ::grpc::ServerContext* context, const ::aurum::ReqClick* request, - ::aurum::RspClick* response) + ::grpc::ServerContext *context, const ::aurum::ReqClick *request, + ::aurum::RspClick *response) { std::unique_ptr cmd = ClickCommand::createCommand(request, response); return execute(cmd.get(), true); } -::grpc::Status aurumServiceImpl::getValue(::grpc::ServerContext* context, - const ::aurum::ReqGetValue* request, - ::aurum::RspGetValue* response) +::grpc::Status aurumServiceImpl::getValue(::grpc::ServerContext *context, + const ::aurum::ReqGetValue *request, + ::aurum::RspGetValue *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), true); } -::grpc::Status aurumServiceImpl::setValue(::grpc::ServerContext* context, - const ::aurum::ReqSetValue* request, - ::aurum::RspSetValue* response) +::grpc::Status aurumServiceImpl::setValue(::grpc::ServerContext *context, + const ::aurum::ReqSetValue *request, + ::aurum::RspSetValue *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::getAttribute( - ::grpc::ServerContext* context, const ::aurum::ReqGetAttribute* request, - ::aurum::RspGetAttribute* response) + ::grpc::ServerContext *context, const ::aurum::ReqGetAttribute *request, + ::aurum::RspGetAttribute *response) { std::unique_ptr cmd = GetAttributeCommand::createCommand(request, response); return execute(cmd.get(), true); } -::grpc::Status aurumServiceImpl::getSize(::grpc::ServerContext* context, - const ::aurum::ReqGetSize* request, - ::aurum::RspGetSize* response) +::grpc::Status aurumServiceImpl::getSize(::grpc::ServerContext *context, + const ::aurum::ReqGetSize *request, + ::aurum::RspGetSize *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), true); } -::grpc::Status aurumServiceImpl::clear(::grpc::ServerContext* context, - const ::aurum::ReqClear* request, - ::aurum::RspClear* response) +::grpc::Status aurumServiceImpl::clear(::grpc::ServerContext *context, + const ::aurum::ReqClear *request, + ::aurum::RspClear *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), true); } ::grpc::Status aurumServiceImpl::installApp( - ::grpc::ServerContext* context, - ::grpc::ServerReader< ::aurum::ReqInstallApp>* request, - ::aurum::RspInstallApp* response) + ::grpc::ServerContext *context, + ::grpc::ServerReader< ::aurum::ReqInstallApp> *request, + ::aurum::RspInstallApp *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::removeApp(::grpc::ServerContext* context, - const ::aurum::ReqRemoveApp* request, - ::aurum::RspRemoveApp* response) +::grpc::Status aurumServiceImpl::removeApp(::grpc::ServerContext *context, + const ::aurum::ReqRemoveApp *request, + ::aurum::RspRemoveApp *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::getAppInfo( - ::grpc::ServerContext* context, const ::aurum::ReqGetAppInfo* request, - ::aurum::RspGetAppInfo* response) + ::grpc::ServerContext *context, const ::aurum::ReqGetAppInfo *request, + ::aurum::RspGetAppInfo *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::launchApp(::grpc::ServerContext* context, - const ::aurum::ReqLaunchApp* request, - ::aurum::RspLaunchApp* response) +::grpc::Status aurumServiceImpl::launchApp(::grpc::ServerContext *context, + const ::aurum::ReqLaunchApp *request, + ::aurum::RspLaunchApp *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::closeApp(::grpc::ServerContext* context, - const ::aurum::ReqCloseApp* request, - ::aurum::RspCloseApp* response) +::grpc::Status aurumServiceImpl::closeApp(::grpc::ServerContext *context, + const ::aurum::ReqCloseApp *request, + ::aurum::RspCloseApp *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::touchDown(::grpc::ServerContext* context, - const ::aurum::ReqTouchDown* request, - ::aurum::RspTouchDown* response) +::grpc::Status aurumServiceImpl::touchDown(::grpc::ServerContext *context, + const ::aurum::ReqTouchDown *request, + ::aurum::RspTouchDown *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::touchUp(::grpc::ServerContext* context, - const ::aurum::ReqTouchUp* request, - ::aurum::RspTouchUp* response) +::grpc::Status aurumServiceImpl::touchUp(::grpc::ServerContext *context, + const ::aurum::ReqTouchUp *request, + ::aurum::RspTouchUp *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::touchMove(::grpc::ServerContext* context, - const ::aurum::ReqTouchMove* request, - ::aurum::RspTouchMove* response) +::grpc::Status aurumServiceImpl::touchMove(::grpc::ServerContext *context, + const ::aurum::ReqTouchMove *request, + ::aurum::RspTouchMove *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::longClick(::grpc::ServerContext* context, - const ::aurum::ReqClick* request, - ::aurum::RspClick* response) +::grpc::Status aurumServiceImpl::longClick(::grpc::ServerContext *context, + const ::aurum::ReqClick *request, + ::aurum::RspClick * response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::flick(::grpc::ServerContext* context, - const ::aurum::ReqFlick* request, - ::aurum::RspFlick* response) +::grpc::Status aurumServiceImpl::flick(::grpc::ServerContext *context, + const ::aurum::ReqFlick *request, + ::aurum::RspFlick *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::getDeviceTime( - ::grpc::ServerContext* context, const ::aurum::ReqGetDeviceTime* request, - ::aurum::RspGetDeviceTime* response) + ::grpc::ServerContext *context, const ::aurum::ReqGetDeviceTime *request, + ::aurum::RspGetDeviceTime *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } ::grpc::Status aurumServiceImpl::getLocation( - ::grpc::ServerContext* context, const ::aurum::ReqGetLocation* request, - ::aurum::RspGetLocation* response) + ::grpc::ServerContext *context, const ::aurum::ReqGetLocation *request, + ::aurum::RspGetLocation *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::sendKey(::grpc::ServerContext* context, - const ::aurum::ReqKey* request, - ::aurum::RspKey* response) +::grpc::Status aurumServiceImpl::sendKey(::grpc::ServerContext *context, + const ::aurum::ReqKey *request, + ::aurum::RspKey *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), false); } -::grpc::Status aurumServiceImpl::takeScreenshot(::grpc::ServerContext* context, - const ::aurum::ReqTakeScreenshot* request, - ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer) +::grpc::Status aurumServiceImpl::takeScreenshot(::grpc::ServerContext *context, + const ::aurum::ReqTakeScreenshot *request, + ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *writer) { std::unique_ptr cmd = std::make_unique(request, writer); return execute(cmd.get(), false); @@ -210,7 +210,7 @@ aurumServiceImpl::~aurumServiceImpl() ::grpc::Status aurumServiceImpl::dumpObjectTree(::grpc::ServerContext *context, const ::aurum::ReqDumpObjectTree *request, - ::aurum::RspDumpObjectTree * response) + ::aurum::RspDumpObjectTree *response) { std::unique_ptr cmd = std::make_unique(request, response); return execute(cmd.get(), true); diff --git a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc index 0edd35d..7255afd 100644 --- a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc +++ b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc @@ -15,14 +15,14 @@ using namespace grpc; typedef struct _ServiceContext { GMainLoop *loop; - GThread *thread; + GThread *thread; std::unique_ptr server; } ServiceContext; static gpointer _grpc_thread_func (gpointer data) { - ServiceContext *ctx = (ServiceContext*)data; + ServiceContext *ctx = (ServiceContext *)data; std::string binding("0.0.0.0:50051"); aurumServiceImpl service; ServerBuilder builder; @@ -38,7 +38,7 @@ _grpc_thread_func (gpointer data) static bool _service_app_create(void *data) { - ServiceContext *ctx = (ServiceContext*)data; + ServiceContext *ctx = (ServiceContext *)data; ctx->loop = g_main_loop_new ( NULL , FALSE ); ctx->thread = g_thread_new("grpc_thread", _grpc_thread_func, ctx); @@ -48,7 +48,7 @@ static bool _service_app_create(void *data) static void _service_app_terminate(void *data) { - ServiceContext *ctx = (ServiceContext*)data; + ServiceContext *ctx = (ServiceContext *)data; ctx->server->Shutdown(); g_main_loop_unref(ctx->loop); g_thread_join(ctx->thread); @@ -56,7 +56,7 @@ static void _service_app_terminate(void *data) static void _service_app_control(app_control_h app_control, void *data) { - ServiceContext *ctx = (ServiceContext*)data; + ServiceContext *ctx = (ServiceContext *)data; if (!ctx) LOGE("Service context is empty!"); } diff --git a/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc index 3b80401..c48bcdb 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/ClearCommand.cc @@ -2,8 +2,8 @@ #include "ClearCommand.h" #include -ClearCommand::ClearCommand(const ::aurum::ReqClear* request, - ::aurum::RspClear* response) +ClearCommand::ClearCommand(const ::aurum::ReqClear *request, + ::aurum::RspClear *response) : mRequest{request}, mResponse{response} { } @@ -25,7 +25,7 @@ bool ClearCommand::hasHintText(std::shared_ptr obj) ::grpc::Status ClearCommand::execute() { LOGI("Clear --------------- "); - ObjectMapper* mObjMap = ObjectMapper::getInstance(); + ObjectMapper *mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); if (obj) { @@ -44,4 +44,4 @@ bool ClearCommand::hasHintText(std::shared_ptr obj) } return grpc::Status::OK; -} \ No newline at end of file +} diff --git a/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc index 0b74527..cc7a30e 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/ClickCommand.cc @@ -3,8 +3,8 @@ #include "UiObject.h" #include "UiDevice.h" -ClickCommand::ClickCommand(const ::aurum::ReqClick* request, - ::aurum::RspClick* response) +ClickCommand::ClickCommand(const ::aurum::ReqClick *request, + ::aurum::RspClick *response) : mRequest{request}, mResponse{response} { } @@ -14,7 +14,7 @@ ClickCommand::ClickCommand(const ::aurum::ReqClick* request, return grpc::Status::CANCELLED; } -std::unique_ptr ClickCommand::createCommand(const ::aurum::ReqClick* request, ::aurum::RspClick* response) +std::unique_ptr ClickCommand::createCommand(const ::aurum::ReqClick *request, ::aurum::RspClick *response) { ::aurum::ReqClick_RequestType type = request->type(); @@ -30,7 +30,7 @@ std::unique_ptr ClickCommand::createCommand(const ::aurum::ReqClic ::grpc::Status ClickElementCommand::execute() { - ObjectMapper* mObjMap = ObjectMapper::getInstance(); + ObjectMapper *mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); LOGI("ClickElementCommand execute %p", obj.get()); @@ -55,7 +55,7 @@ std::unique_ptr ClickCommand::createCommand(const ::aurum::ReqClic ::grpc::Status ClickAtspiCommand::execute() { - ObjectMapper* mObjMap = ObjectMapper::getInstance(); + ObjectMapper *mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); LOGI("ClickAtspiCommand execute %p", obj.get()); diff --git a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc index e1d0b51..c1073f4 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/CloseAppCommand.cc @@ -6,8 +6,8 @@ #include #endif -CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp* request, - ::aurum::RspCloseApp* response) +CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp *request, + ::aurum::RspCloseApp *response) : mRequest{request}, mResponse{response} { } @@ -42,4 +42,4 @@ CloseAppCommand::CloseAppCommand(const ::aurum::ReqCloseApp* request, LOGI("Wait for 1500ms"); 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/DumpObjectTreeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc index b8b7c71..84f0002 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/DumpObjectTreeCommand.cc @@ -6,8 +6,8 @@ #include "Sel.h" #include "ISearchable.h" -DumpObjectTreeCommand::DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree* request, - ::aurum::RspDumpObjectTree* response) +DumpObjectTreeCommand::DumpObjectTreeCommand(const ::aurum::ReqDumpObjectTree *request, + ::aurum::RspDumpObjectTree *response) : mRequest{request}, mResponse{response} { mObjMap = ObjectMapper::getInstance(); @@ -55,7 +55,7 @@ void DumpObjectTreeCommand::traverse(::aurum::Element *root, std::shared_ptrset_isselectable(obj->isSelectable()); for( auto && childNode : node->mChildren) { - ::aurum::Element* child = root->add_child(); + ::aurum::Element *child = root->add_child(); traverse(child, childNode, depth+1); } } @@ -69,7 +69,7 @@ void DumpObjectTreeCommand::traverse(::aurum::Element *root, std::shared_ptrgetDescendant(); - ::aurum::Element* root = mResponse->add_roots(); + ::aurum::Element *root = mResponse->add_roots(); traverse(root, node, 0); } 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 1238b8b..ee8f6ff 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/FindElementCommand.cc @@ -6,8 +6,8 @@ #include "Sel.h" #include "ISearchable.h" -FindElementCommand::FindElementCommand(const ::aurum::ReqFindElement* request, - ::aurum::RspFindElement* response) +FindElementCommand::FindElementCommand(const ::aurum::ReqFindElement *request, + ::aurum::RspFindElement *response) : mRequest{request}, mResponse{response} { mObjMap = ObjectMapper::getInstance(); @@ -64,14 +64,14 @@ std::vector> FindElementCommand::getSelectors(void) if (founds.size() > 0) { for (auto& found : founds) { - UiObject* obj = found.get(); + UiObject *obj = found.get(); std::string key{}; key = mObjMap->getElement(found); if (key.length() <= 0) key = mObjMap->addElement(std::move(found)); LOGI("found object : %s key:%s", obj->getAutomationId().c_str(), key.c_str()); - ::aurum::Element* elm = mResponse->add_elements(); + ::aurum::Element *elm = mResponse->add_elements(); elm->set_elementid(key); elm->set_package(obj->getApplicationPackage()); diff --git a/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc index d1703be..14fcf66 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/FlickCommand.cc @@ -3,7 +3,7 @@ #include "UiDevice.h" FlickCommand::FlickCommand(const ::aurum::ReqFlick *request, - ::aurum::RspFlick * response) + ::aurum::RspFlick *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc index 219211d..cf14e32 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAppInfoCommand.cc @@ -5,8 +5,8 @@ #include #endif -GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request, - ::aurum::RspGetAppInfo* response) +GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo *request, + ::aurum::RspGetAppInfo *response) : mRequest{request}, mResponse{response} { } @@ -21,7 +21,7 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request, package_info_h package_info; app_state_e appState; - char* label = nullptr; + char *label = nullptr; mResponse->set_status(::aurum::RspStatus::OK); mResponse->set_isinstalled(false); diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc index cba8037..1d54967 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetAttributeCommand.cc @@ -4,7 +4,7 @@ #include "UiDevice.h" GetAttributeCommand::GetAttributeCommand( - const ::aurum::ReqGetAttribute* request, ::aurum::RspGetAttribute* response) + const ::aurum::ReqGetAttribute *request, ::aurum::RspGetAttribute *response) : mRequest{request}, mResponse{response}, mObjMap{ObjectMapper::getInstance()} { } @@ -14,8 +14,8 @@ GetAttributeCommand::GetAttributeCommand( return grpc::Status::CANCELLED; } -std::unique_ptr GetAttributeCommand::createCommand(const ::aurum::ReqGetAttribute* request, - ::aurum::RspGetAttribute* response) +std::unique_ptr GetAttributeCommand::createCommand(const ::aurum::ReqGetAttribute *request, + ::aurum::RspGetAttribute*response) { LOGI("GetAttribute --------------- "); ::aurum::ReqGetAttribute_RequestType type = request->attribute(); diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc index 8403dc8..11b05e3 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetDeviceTimeCommand.cc @@ -9,8 +9,8 @@ #define BUFSIZE 64 GetDeviceTimeCommand::GetDeviceTimeCommand( - const ::aurum::ReqGetDeviceTime* request, - ::aurum::RspGetDeviceTime* response) + const ::aurum::ReqGetDeviceTime *request, + ::aurum::RspGetDeviceTime *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc index dc85706..303d763 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetLocationCommand.cc @@ -1,8 +1,8 @@ #include "bootstrap.h" #include "GetLocationCommand.h" -GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation* request, - ::aurum::RspGetLocation* response) +GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation *request, + ::aurum::RspGetLocation *response) : mRequest{request}, mResponse{response} { } @@ -10,7 +10,6 @@ GetLocationCommand::GetLocationCommand(const ::aurum::ReqGetLocation* request, ::grpc::Status GetLocationCommand::execute() { LOGI("GetLocation --------------- "); - // ObjectMapper *mObjMap = ObjectMapper::getInstance(); mResponse->set_alt(-1); mResponse->set_lat(-1); diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc index 88c7b00..cb7280a 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetSizeCommand.cc @@ -2,8 +2,8 @@ #include "GetSizeCommand.h" #include "UiObject.h" -GetSizeCommand::GetSizeCommand(const ::aurum::ReqGetSize* request, - ::aurum::RspGetSize* response) +GetSizeCommand::GetSizeCommand(const ::aurum::ReqGetSize *request, + ::aurum::RspGetSize *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc index 410af95..61c81d9 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/GetValueCommand.cc @@ -2,8 +2,8 @@ #include "GetValueCommand.h" #include "UiObject.h" -GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue* request, - ::aurum::RspGetValue* response) +GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue *request, + ::aurum::RspGetValue *response) : mRequest{request}, mResponse{response} { } @@ -11,7 +11,7 @@ GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue* request, ::grpc::Status GetValueCommand::execute() { LOGI("GetValue --------------- "); - ObjectMapper* mObjMap = ObjectMapper::getInstance(); + ObjectMapper *mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); if (obj) { @@ -21,4 +21,4 @@ GetValueCommand::GetValueCommand(const ::aurum::ReqGetValue* request, } 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 72f9e3f..c14297a 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/KillServerCommand.cc @@ -1,8 +1,8 @@ #include "bootstrap.h" #include "KillServerCommand.h" -KillServerCommand::KillServerCommand(const ::aurum::ReqEmpty* request, - ::aurum::RspEmpty* response) +KillServerCommand::KillServerCommand(const ::aurum::ReqEmpty *request, + ::aurum::RspEmpty *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc index 2d2ab15..f7c30ed 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/LaunchAppCommand.cc @@ -7,8 +7,8 @@ #include #endif -LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp* request, - ::aurum::RspLaunchApp* response) +LaunchAppCommand::LaunchAppCommand(const ::aurum::ReqLaunchApp *request, + ::aurum::RspLaunchApp *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc index 22148b5..3312c70 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/LongClickCommand.cc @@ -3,8 +3,8 @@ #include "UiObject.h" #include "UiDevice.h" -LongClickCommand::LongClickCommand(const ::aurum::ReqClick* request, - ::aurum::RspClick* response) +LongClickCommand::LongClickCommand(const ::aurum::ReqClick *request, + ::aurum::RspClick *response) : mRequest{request}, mResponse{response} { } @@ -13,7 +13,7 @@ LongClickCommand::LongClickCommand(const ::aurum::ReqClick* request, { LOGI("LongClick --------------- "); - ObjectMapper* mObjMap = ObjectMapper::getInstance(); + ObjectMapper *mObjMap = ObjectMapper::getInstance(); ::aurum::ReqClick_RequestType type = mRequest->type(); if (type == ::aurum::ReqClick_RequestType_ELEMENTID) { diff --git a/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc index 52e137f..b2ba222 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/SendKeyCommand.cc @@ -2,8 +2,8 @@ #include "SendKeyCommand.h" #include "UiDevice.h" -SendKeyCommand::SendKeyCommand(const ::aurum::ReqKey* request, - ::aurum::RspKey* response) +SendKeyCommand::SendKeyCommand(const ::aurum::ReqKey *request, + ::aurum::RspKey *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc index 30538fe..77ace73 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/SetValueCommand.cc @@ -11,8 +11,9 @@ SetValueCommand::SetValueCommand(const ::aurum::ReqSetValue* request, { LOGI("SetValue --------------- "); LOGI("text:%s", mRequest->stringvalue().c_str()); - ObjectMapper* mObjMap = ObjectMapper::getInstance(); + + ObjectMapper *mObjMap = ObjectMapper::getInstance(); std::shared_ptr obj = mObjMap->getElement(mRequest->elementid()); if (obj) obj->setText(const_cast(mRequest->stringvalue())); return grpc::Status::OK; -} \ No newline at end of file +} diff --git a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc index 6d0177c..e3cc296 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TakeScreenshotCommand.cc @@ -5,8 +5,8 @@ #include "UiDevice.h" TakeScreenshotCommand::TakeScreenshotCommand( - const ::aurum::ReqTakeScreenshot* request, - ::grpc::ServerWriter< ::aurum::RspTakeScreenshot>* writer) + const ::aurum::ReqTakeScreenshot *request, + ::grpc::ServerWriter< ::aurum::RspTakeScreenshot> *writer) : mRequest{request}, mWriter{writer} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc index c148b8a..fa42062 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchDownCommand.cc @@ -2,8 +2,8 @@ #include "TouchDownCommand.h" #include "UiDevice.h" -TouchDownCommand::TouchDownCommand(const ::aurum::ReqTouchDown* request, - ::aurum::RspTouchDown* response) +TouchDownCommand::TouchDownCommand(const ::aurum::ReqTouchDown *request, + ::aurum::RspTouchDown *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc index 2bb0423..951e4de 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchMoveCommand.cc @@ -2,8 +2,8 @@ #include "TouchMoveCommand.h" #include "UiDevice.h" -TouchMoveCommand::TouchMoveCommand(const ::aurum::ReqTouchMove* request, - ::aurum::RspTouchMove* response) +TouchMoveCommand::TouchMoveCommand(const ::aurum::ReqTouchMove *request, + ::aurum::RspTouchMove *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc b/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc index 4fd946b..432e972 100644 --- a/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc +++ b/org.tizen.aurum-bootstrap/src/Commands/TouchUpCommand.cc @@ -2,8 +2,8 @@ #include "TouchUpCommand.h" #include "UiDevice.h" -TouchUpCommand::TouchUpCommand(const ::aurum::ReqTouchUp* request, - ::aurum::RspTouchUp* response) +TouchUpCommand::TouchUpCommand(const ::aurum::ReqTouchUp *request, + ::aurum::RspTouchUp *response) : mRequest{request}, mResponse{response} { } diff --git a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc index 0e7b7b6..40c68d1 100644 --- a/org.tizen.aurum-bootstrap/src/ObjectMapper.cc +++ b/org.tizen.aurum-bootstrap/src/ObjectMapper.cc @@ -74,11 +74,9 @@ bool ObjectMapper::removeElement(std::shared_ptr object) void ObjectMapper::cleanUp() { - std::stringstream ss{}; - LOGI("clean up object map"); for(auto iter = mObjectMapReverse.begin(); iter != mObjectMapReverse.end(); ) { - auto obj = mObjectMap[iter->second]; + auto obj = mObjectMap[iter->second]; if (obj && !obj->isValid()) { iter = mObjectMapReverse.erase(iter); } else { -- 2.7.4 From 725e70d44e122e71eadd57535cee34143aa2ca98 Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Fri, 9 Jul 2021 14:13:29 +0900 Subject: [PATCH 14/16] libaurum: Delete double lock for atspi API thread safe call atspi API is safe through a unique lock at there Change-Id: I817b49086fb61f63fb98bd490c86e719f1b7b03f --- .../Impl/Accessibility/AtspiAccessibleWatcher.h | 4 +++- libaurum/inc/Impl/Accessibility/AtspiWrapper.h | 2 -- .../src/Impl/Accessibility/AtspiAccessibleNode.cc | 25 ---------------------- .../Impl/Accessibility/AtspiAccessibleWatcher.cc | 24 ++++++--------------- libaurum/src/Impl/Accessibility/AtspiWrapper.cc | 10 --------- 5 files changed, 10 insertions(+), 55 deletions(-) diff --git a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h index 5c1f9b2..d0590b4 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h +++ b/libaurum/inc/Impl/Accessibility/AtspiAccessibleWatcher.h @@ -231,5 +231,7 @@ private: /** * @brief TBD */ - static std::vector> mEventQueue; + static std::vector> mEventQueue; + + static std::mutex mMutex; }; diff --git a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h index 869ba6a..0bd3b02 100644 --- a/libaurum/inc/Impl/Accessibility/AtspiWrapper.h +++ b/libaurum/inc/Impl/Accessibility/AtspiWrapper.h @@ -29,8 +29,6 @@ public: static AtspiAccessible *Atspi_accessible_get_application (AtspiAccessible *node, GError **error); static void Atspi_accessible_clear_cache (AtspiAccessible *node); - static void lock(); - static void unlock(); private: static std::recursive_mutex mMutex; //static std::unique_lock mLock; diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc index a5641f9..e196ab4 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleNode.cc @@ -28,26 +28,20 @@ AtspiAccessibleNode::~AtspiAccessibleNode() int AtspiAccessibleNode::getChildCount() const { - AtspiWrapper::lock(); if (!isValid()) { - AtspiWrapper::unlock(); return 0; } int count = AtspiWrapper::Atspi_accessible_get_child_count(mNode, NULL); - AtspiWrapper::unlock(); if (count <= 0) return 0; return count; } std::shared_ptr AtspiAccessibleNode::getChildAt(int index) const { - AtspiWrapper::lock(); if (!isValid()) { - AtspiWrapper::unlock(); return std::make_shared(nullptr); } AtspiAccessible *rawChild = AtspiWrapper::Atspi_accessible_get_child_at_index(mNode, index, NULL); - AtspiWrapper::unlock(); return std::make_shared(rawChild); } @@ -64,13 +58,10 @@ std::vector> AtspiAccessibleNode::getChildren() std::shared_ptr AtspiAccessibleNode::getParent() const { - AtspiWrapper::lock(); if (!isValid()) { - AtspiWrapper::unlock(); return std::make_shared(nullptr); } AtspiAccessible *rawParent = AtspiWrapper::Atspi_accessible_get_parent(mNode, NULL); - AtspiWrapper::unlock(); return std::make_shared(rawParent); } @@ -96,8 +87,6 @@ void* AtspiAccessibleNode::getRawHandler(void) const void AtspiAccessibleNode::refresh() { - AtspiWrapper::lock(); - AtspiWrapper::Atspi_accessible_clear_cache(mNode); if (isValid()) { @@ -175,17 +164,13 @@ void AtspiAccessibleNode::refresh() } else { setFeatureProperty(ATSPI_STATE_INVALID); } - AtspiWrapper::unlock(); } std::vector AtspiAccessibleNode::getActions() const { - AtspiWrapper::lock(); - std::vector result{}; AtspiAction *action; if (!isValid()) { - AtspiWrapper::unlock(); return result; } @@ -203,18 +188,14 @@ std::vector AtspiAccessibleNode::getActions() const g_object_unref(action); } - AtspiWrapper::unlock(); - return result; } bool AtspiAccessibleNode::doAction(std::string actionName) { - AtspiWrapper::lock(); AtspiAction *action; if (!isValid()) { - AtspiWrapper::unlock(); return false; } @@ -226,7 +207,6 @@ bool AtspiAccessibleNode::doAction(std::string actionName) for (a = 0; a < n_actions; a++) { char *action_name = AtspiWrapper::Atspi_action_get_action_name(action, a, NULL); if (!action_name) { - AtspiWrapper::unlock(); return false; } @@ -234,22 +214,18 @@ bool AtspiAccessibleNode::doAction(std::string actionName) AtspiWrapper::Atspi_action_do_action(action, a, NULL); g_free(action_name); g_object_unref(action); - AtspiWrapper::unlock(); return true; } g_free(action_name); } g_object_unref(action); } - AtspiWrapper::unlock(); return false; } void AtspiAccessibleNode::setValue(std::string text) { - AtspiWrapper::lock(); if (!isValid()){ - AtspiWrapper::unlock(); return; } @@ -261,7 +237,6 @@ void AtspiAccessibleNode::setValue(std::string text) AtspiWrapper::Atspi_editable_text_insert_text(iface, 0, text.c_str(), text.length(), NULL); } - AtspiWrapper::unlock(); } void AtspiAccessibleNode::setFeatureProperty(AtspiStateType type) diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index a58a89f..79de9e0 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -13,6 +13,7 @@ std::vector> AtspiAccessibleWatcher::mEventQueue; GThread *AtspiAccessibleWatcher::mEventThread = nullptr; +std::mutex AtspiAccessibleWatcher::mMutex = std::mutex{}; static bool iShowingNode(AtspiAccessible *node) { @@ -139,10 +140,8 @@ AtspiAccessibleWatcher::~AtspiAccessibleWatcher() void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *user_data) { - AtspiWrapper::lock(); if (!event->source) { - AtspiWrapper::unlock(); return; } char *name = NULL, *pkg = NULL; @@ -158,7 +157,9 @@ void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *user_data) else pkg = strdup(""); + mMutex.lock(); mEventQueue.push_back(std::make_shared(std::string(event->type), std::string(name), std::string(pkg))); + mMutex.unlock(); if (!strcmp(event->type, "object:state-changed:defunct")) { instance->onObjectDefunct( @@ -166,8 +167,6 @@ void AtspiAccessibleWatcher::onAtspiEvents(AtspiEvent *event, void *user_data) } if (name) free(name); if (pkg) free(pkg); - - AtspiWrapper::unlock(); } void AtspiAccessibleWatcher::print_debug() @@ -228,37 +227,29 @@ void AtspiAccessibleWatcher::onObjectDefunct(AtspiAccessible *node) int AtspiAccessibleWatcher::getApplicationCount(void) const { - AtspiWrapper::lock(); - AtspiAccessible *root = AtspiWrapper::Atspi_get_desktop(0); int nchild = AtspiWrapper::Atspi_accessible_get_child_count(root, NULL); g_object_unref(root); - AtspiWrapper::unlock(); - if (nchild <= 0) return 0; return nchild; } std::shared_ptr AtspiAccessibleWatcher::getApplicationAt(int index) const { - AtspiWrapper::lock(); AtspiAccessible *root = AtspiWrapper::Atspi_get_desktop(0); AtspiAccessible *child = AtspiWrapper::Atspi_accessible_get_child_at_index(root, index, NULL); g_object_unref(root); - AtspiWrapper::unlock(); return std::make_shared(std::make_shared(child)); } std::vector> AtspiAccessibleWatcher::getApplications(void) const { - AtspiWrapper::lock(); std::vector> ret{}; AtspiAccessible *root = AtspiWrapper::Atspi_get_desktop(0); int nchild = AtspiWrapper::Atspi_accessible_get_child_count(root, NULL); if (nchild <= 0) { g_object_unref(root); - AtspiWrapper::unlock(); return ret; } @@ -269,7 +260,6 @@ std::vector> AtspiAccessibleWatcher::getA } } g_object_unref(root); - AtspiWrapper::unlock(); return ret; } @@ -278,9 +268,9 @@ std::vector> AtspiAccessibleWatcher::getA bool AtspiAccessibleWatcher::executeAndWaitForEvents(const Runnable *cmd, const A11yEvent type, const int timeout) { - AtspiWrapper::lock(); + mMutex.lock(); mEventQueue.clear(); - AtspiWrapper::unlock(); + mMutex.unlock(); if (cmd) cmd->run(); @@ -289,10 +279,10 @@ bool AtspiAccessibleWatcher::executeAndWaitForEvents(const Runnable *cmd, const while (true) { std::vector> localEvents; - AtspiWrapper::lock(); + mMutex.lock(); localEvents.assign(mEventQueue.begin(), mEventQueue.end()); mEventQueue.clear(); - AtspiWrapper::unlock(); + mMutex.unlock(); if (!localEvents.empty()) { diff --git a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc index cf76dcd..109d0cc 100644 --- a/libaurum/src/Impl/Accessibility/AtspiWrapper.cc +++ b/libaurum/src/Impl/Accessibility/AtspiWrapper.cc @@ -1,7 +1,6 @@ #include "AtspiWrapper.h" std::recursive_mutex AtspiWrapper::mMutex = std::recursive_mutex{}; -//std::unique_lock AtspiWrapper::mLock = std::unique_lock(mMutex, std::defer_lock); GArray *AtspiWrapper::Atspi_state_set_get_states(AtspiStateSet *set) { @@ -140,12 +139,3 @@ void AtspiWrapper::Atspi_accessible_clear_cache (AtspiAccessible *node) std::unique_lock lock(mMutex); return atspi_accessible_clear_cache(node); } -void AtspiWrapper::lock() -{ - mMutex.lock(); -} - -void AtspiWrapper::unlock() -{ - mMutex.unlock(); -} -- 2.7.4 From 5647cb0ccfd2d66a3e9eb3211403e0c3f768b364 Mon Sep 17 00:00:00 2001 From: Hosang Kim Date: Fri, 9 Jul 2021 17:00:56 +0900 Subject: [PATCH 15/16] libaurum: fix critical error on glib. Change-Id: Ied81da3a54afa8cd844835778a873af0f70ed849 --- .../src/Impl/Accessibility/AtspiAccessibleWatcher.cc | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc index 79de9e0..544c56d 100644 --- a/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc +++ b/libaurum/src/Impl/Accessibility/AtspiAccessibleWatcher.cc @@ -93,8 +93,9 @@ static gpointer _event_thread_loop (gpointer data) AtspiAccessibleWatcher::AtspiAccessibleWatcher() : mDbusProxy{nullptr} { - GVariant *enabled_variant = nullptr, *result = nullptr; + GVariant *result = nullptr; GError *error = nullptr; + atspi_set_main_context (g_main_context_default ()); atspi_init(); @@ -106,32 +107,28 @@ AtspiAccessibleWatcher::AtspiAccessibleWatcher() "org.a11y.Bus", "/org/a11y/bus", "org.freedesktop.DBus.Properties", NULL, &error); - enabled_variant = g_variant_new_boolean(true); result = g_dbus_proxy_call_sync( mDbusProxy, "Set", - g_variant_new("(ssv)", "org.a11y.Status", "IsEnabled", enabled_variant), + g_variant_new("(ssv)", "org.a11y.Status", "IsEnabled", g_variant_new_boolean(true)), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); - g_variant_unref(enabled_variant); g_variant_unref(result); - g_error_free(error); + if (error) g_error_free(error); } AtspiAccessibleWatcher::~AtspiAccessibleWatcher() { - GVariant *enabled_variant = nullptr, *result = nullptr; + GVariant *result = nullptr; GError *error = nullptr; - enabled_variant = g_variant_new_boolean(false); result = g_dbus_proxy_call_sync( mDbusProxy, "Set", - g_variant_new("(ssv)", "org.a11y.Status", "IsEnabled", enabled_variant), + g_variant_new("(ssv)", "org.a11y.Status", "IsEnabled", g_variant_new_boolean(false)), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); g_object_unref(mDbusProxy); - g_variant_unref(enabled_variant); g_variant_unref(result); - g_error_free(error); + if (error) g_error_free(error); atspi_event_quit(); g_thread_join(mEventThread); -- 2.7.4 From 0ff9860541bb67fc3372d1261a047c1d29e24412 Mon Sep 17 00:00:00 2001 From: Hosang Kim Date: Tue, 20 Jul 2021 12:43:26 +0900 Subject: [PATCH 16/16] bootstrap: remove unnecessary mainloop and thread. There is problem of CPU usage. Unnecessary mainloop and thread make its problem. Change-Id: Ib892b611ed087bcf37dc4066dde77b3d04a4b96e --- org.tizen.aurum-bootstrap/src/BootstrapServer.cc | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc index 7255afd..0ae861e 100644 --- a/org.tizen.aurum-bootstrap/src/BootstrapServer.cc +++ b/org.tizen.aurum-bootstrap/src/BootstrapServer.cc @@ -14,13 +14,10 @@ using namespace grpc; typedef struct _ServiceContext { - GMainLoop *loop; - GThread *thread; std::unique_ptr server; } ServiceContext; -static gpointer -_grpc_thread_func (gpointer data) +static bool _service_app_create(void *data) { ServiceContext *ctx = (ServiceContext *)data; std::string binding("0.0.0.0:50051"); @@ -33,16 +30,6 @@ _grpc_thread_func (gpointer data) ctx->server = std::move(builder.BuildAndStart()); ctx->server->Wait(); - return NULL; -} - -static bool _service_app_create(void *data) -{ - ServiceContext *ctx = (ServiceContext *)data; - - ctx->loop = g_main_loop_new ( NULL , FALSE ); - ctx->thread = g_thread_new("grpc_thread", _grpc_thread_func, ctx); - return true; } @@ -50,8 +37,6 @@ static void _service_app_terminate(void *data) { ServiceContext *ctx = (ServiceContext *)data; ctx->server->Shutdown(); - g_main_loop_unref(ctx->loop); - g_thread_join(ctx->thread); } static void _service_app_control(app_control_h app_control, void *data) -- 2.7.4