From 96cfcef5810cf4ce58435297cb4440b90edf04ff Mon Sep 17 00:00:00 2001 From: byndyx Date: Wed, 11 Oct 2023 16:04:00 +0800 Subject: [PATCH 1/4] hicollie Signed-off-by: byndyx --- bundle.json | 1 + common/include/constants_dinput.h | 5 +++++ services/sink/transport/BUILD.gn | 1 + .../transport/src/distributed_input_sink_transport.cpp | 9 +++++++++ services/source/sourcemanager/BUILD.gn | 1 + .../src/distributed_input_source_manager.cpp | 9 +++++++++ 6 files changed, 26 insertions(+) diff --git a/bundle.json b/bundle.json index e3174fa..47194c0 100755 --- a/bundle.json +++ b/bundle.json @@ -39,6 +39,7 @@ "c_utils", "distributed_hardware_fwk", "config_policy", + "hicollie", "hisysevent", "hitrace", "graphic_2d", diff --git a/common/include/constants_dinput.h b/common/include/constants_dinput.h index e7604ff..3fee6bc 100644 --- a/common/include/constants_dinput.h +++ b/common/include/constants_dinput.h @@ -1,3 +1,6 @@ +/* + * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved. + */ /* * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -84,6 +87,8 @@ namespace DistributedInput { constexpr int32_t EPOLL_WAITTIME = 100; + constexpr uint64_t WATCHDOG_INTERVAL_TIME_MS = 20 * 1000; + /* The input device is a keyboard or has buttons. */ constexpr uint32_t INPUT_DEVICE_CLASS_KEYBOARD = 0x00000001; diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index 240becf..b8756ae 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -55,6 +55,7 @@ ohos_shared_library("libdinput_sink_trans") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "hicollie:libhicollie", "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index af0e0ef..52c0d37 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -1,3 +1,6 @@ +/* + * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved. + */ /* * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -31,6 +34,7 @@ #include "hidumper.h" #include "session.h" #include "softbus_bus_center.h" +#include "xcollie/watchdog.h" #include "distributed_input_transport_base.h" @@ -41,6 +45,11 @@ DistributedInputSinkTransport::DistributedInputSinkTransport() : mySessionName_( { std::shared_ptr runner = AppExecFwk::EventRunner::Create(true); eventHandler_ = std::make_shared(runner); + + if (OHOS::HiviewDFX::Watchdog::GetInstance().AddThread("dinputwatchdog", eventHandler_, + WATCHDOG_INTERVAL_TIME_MS)) { + DHLOGE("HiviewDFX::Watchdog::GetInstance().AddThread() Failed."); + } DHLOGI("DistributedInputSinkTransport ctor."); } diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index 7bfd57f..5acbfe6 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -109,6 +109,7 @@ ohos_shared_library("libdinput_source") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "hicollie:libhicollie", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index 4cfaeb4..77c714e 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -1,3 +1,6 @@ +/* + * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved. + */ /* * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,6 +39,7 @@ #include "distributed_input_source_transport.h" #include "distributed_input_transport_base.h" #include "dinput_softbus_define.h" +#include "xcollie/watchdog.h" #include "hisysevent_util.h" #include "hidumper.h" #include "input_check_param.h" @@ -118,6 +122,11 @@ bool DistributedInputSourceManager::InitAuto() DHLOGI("init success"); std::shared_ptr runner = AppExecFwk::EventRunner::Create(true); callBackHandler_ = std::make_shared(runner, this); + + if (OHOS::HiviewDFX::Watchdog::GetInstance().AddThread("dinputsourcewatchdog", callBackHandler_, + WATCHDOG_INTERVAL_TIME_MS)) { + DHLOGE("HiviewDFX::Watchdog::GetInstance().AddThread() Failed."); + } return true; } -- Gitee From fbfda323b1ba998298a09044a32e6049e4b3f3a4 Mon Sep 17 00:00:00 2001 From: byndyx Date: Wed, 11 Oct 2023 17:22:06 +0800 Subject: [PATCH 2/4] for test/gn Signed-off-by: byndyx --- services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn | 1 + services/sink/transport/test/sinktransunittest/BUILD.gn | 1 + services/transportbase/test/transbaseunittest/BUILD.gn | 1 + test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn | 1 + 4 files changed, 4 insertions(+) diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index 2ab18a6..d60aceb 100755 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -103,6 +103,7 @@ ohos_unittest("distributed_input_sinkmanager_test") { "dsoftbus:softbus_client", "eventhandler:libeventhandler", "graphic_2d:surface", + "hicollie:libhicollie", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index e817dc5..43fea74 100755 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -92,6 +92,7 @@ ohos_unittest("distributed_input_sinktrans_test") { "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", "graphic_2d:surface", + "hicollie:libhicollie", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", diff --git a/services/transportbase/test/transbaseunittest/BUILD.gn b/services/transportbase/test/transbaseunittest/BUILD.gn index 60d4bf9..89e9d86 100644 --- a/services/transportbase/test/transbaseunittest/BUILD.gn +++ b/services/transportbase/test/transbaseunittest/BUILD.gn @@ -83,6 +83,7 @@ ohos_unittest("distributed_input_transbase_test") { "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", + "hicollie:libhicollie", "hitrace:hitrace_meter", ] diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index 7ac18c0..bc36bed 100755 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -62,6 +62,7 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", + "hicollie:libhicollie", "ipc:ipc_core", "safwk:system_ability_fwk", ] -- Gitee From d2f8efe4fc87d5914b67f6cdb0b09c3bf6a3486e Mon Sep 17 00:00:00 2001 From: byndyx Date: Wed, 11 Oct 2023 20:36:52 +0800 Subject: [PATCH 3/4] hicollie Signed-off-by: byndyx --- .../source/sourcemanager/test/sourcemanagerunittest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index f3b3755..3fdd814 100755 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -126,6 +126,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { "c_utils:utils", "distributed_hardware_fwk:libdhfwk_sdk", "eventhandler:libeventhandler", + "hicollie:libhicollie", "hisysevent:libhisysevent", "hitrace:hitrace_meter", "ipc:ipc_core", -- Gitee From 633d4bba437c54e62f45105a6ff25563eaf96be4 Mon Sep 17 00:00:00 2001 From: byndyx Date: Fri, 13 Oct 2023 16:30:57 +0800 Subject: [PATCH 4/4] hicollie Signed-off-by: byndyx --- common/include/constants_dinput.h | 3 --- .../sink/transport/src/distributed_input_sink_transport.cpp | 3 --- .../sourcemanager/src/distributed_input_source_manager.cpp | 3 --- 3 files changed, 9 deletions(-) diff --git a/common/include/constants_dinput.h b/common/include/constants_dinput.h index 3fee6bc..2add0fd 100644 --- a/common/include/constants_dinput.h +++ b/common/include/constants_dinput.h @@ -1,6 +1,3 @@ -/* - * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved. - */ /* * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index 52c0d37..876a3f1 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -1,6 +1,3 @@ -/* - * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved. - */ /* * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index 77c714e..e1a8656 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -1,6 +1,3 @@ -/* - * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved. - */ /* * Copyright (c) 2021-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); -- Gitee