From 947c7dbb971d9cb621f9566bb96fd04f02a45db6 Mon Sep 17 00:00:00 2001 From: fufesou Date: Mon, 27 Mar 2023 22:56:48 +0800 Subject: [PATCH 1/5] try wait hw check config subprocess Signed-off-by: fufesou --- libs/scrap/src/common/hwcodec.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs index fa1c00976..f55fd452a 100644 --- a/libs/scrap/src/common/hwcodec.rs +++ b/libs/scrap/src/common/hwcodec.rs @@ -3,7 +3,7 @@ use crate::{ hw, ImageFormat, HW_STRIDE_ALIGN, }; use hbb_common::{ - anyhow::{anyhow, Context}, + anyhow::{allow_err, anyhow, Context}, bytes::Bytes, config::HwCodecConfig, get_time, lazy_static, log, @@ -352,7 +352,19 @@ pub fn check_config_process(force_reset: bool) { let second = 3; std::thread::sleep(std::time::Duration::from_secs(second)); // kill: Different platforms have different results - child.kill().ok(); + allow_err!(child.kill()); + std::thread::sleep(std::time::Duration::from_millis(30)); + match ps.try_wait() { + Ok(Some(status)) => log::info!("Check hwcodec config, exit with: {status}"), + Ok(None) => { + log::info!( + "Check hwcodec config, status not ready yet, let's really wait" + ); + let res = child.wait(); + log::info!("Check hwcodec config, wait result: {res:?}"); + } + Err(e) => println!("Check hwcodec config, error attempting to wait: {e}"), + } HwCodecConfig::refresh(); } } From ee1fbb0a76c1d3c4eca5bdfd0da26e18ea57bc5a Mon Sep 17 00:00:00 2001 From: fufesou Date: Mon, 27 Mar 2023 23:29:28 +0800 Subject: [PATCH 2/5] fix build Signed-off-by: fufesou --- libs/scrap/src/common/hwcodec.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs index f55fd452a..db8c6b2ef 100644 --- a/libs/scrap/src/common/hwcodec.rs +++ b/libs/scrap/src/common/hwcodec.rs @@ -3,7 +3,8 @@ use crate::{ hw, ImageFormat, HW_STRIDE_ALIGN, }; use hbb_common::{ - anyhow::{allow_err, anyhow, Context}, + allow_err, + anyhow::{anyhow, Context}, bytes::Bytes, config::HwCodecConfig, get_time, lazy_static, log, @@ -354,7 +355,7 @@ pub fn check_config_process(force_reset: bool) { // kill: Different platforms have different results allow_err!(child.kill()); std::thread::sleep(std::time::Duration::from_millis(30)); - match ps.try_wait() { + match child.try_wait() { Ok(Some(status)) => log::info!("Check hwcodec config, exit with: {status}"), Ok(None) => { log::info!( From a1d1c8270fbd0907aecbe21749c7bbdd20581f75 Mon Sep 17 00:00:00 2001 From: fufesou Date: Tue, 28 Mar 2023 08:20:19 +0800 Subject: [PATCH 3/5] log Signed-off-by: fufesou --- libs/scrap/src/common/hwcodec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs index db8c6b2ef..ee7d8aea7 100644 --- a/libs/scrap/src/common/hwcodec.rs +++ b/libs/scrap/src/common/hwcodec.rs @@ -364,7 +364,7 @@ pub fn check_config_process(force_reset: bool) { let res = child.wait(); log::info!("Check hwcodec config, wait result: {res:?}"); } - Err(e) => println!("Check hwcodec config, error attempting to wait: {e}"), + Err(e) => log::info!("Check hwcodec config, error attempting to wait: {e}"), } HwCodecConfig::refresh(); } From 8af20489bd92ff42a610821c784583078b5f2344 Mon Sep 17 00:00:00 2001 From: fufesou Date: Tue, 28 Mar 2023 08:21:47 +0800 Subject: [PATCH 4/5] log::error Signed-off-by: fufesou --- libs/scrap/src/common/hwcodec.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs index ee7d8aea7..6e6638b10 100644 --- a/libs/scrap/src/common/hwcodec.rs +++ b/libs/scrap/src/common/hwcodec.rs @@ -364,7 +364,7 @@ pub fn check_config_process(force_reset: bool) { let res = child.wait(); log::info!("Check hwcodec config, wait result: {res:?}"); } - Err(e) => log::info!("Check hwcodec config, error attempting to wait: {e}"), + Err(e) => log::error!("Check hwcodec config, error attempting to wait: {e}"), } HwCodecConfig::refresh(); } From eebddb2206bd1e66819be42b22f5e94bd24dd813 Mon Sep 17 00:00:00 2001 From: fufesou Date: Tue, 28 Mar 2023 08:22:46 +0800 Subject: [PATCH 5/5] format Signed-off-by: fufesou --- libs/scrap/src/common/hwcodec.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/scrap/src/common/hwcodec.rs b/libs/scrap/src/common/hwcodec.rs index 6e6638b10..42bf76cb5 100644 --- a/libs/scrap/src/common/hwcodec.rs +++ b/libs/scrap/src/common/hwcodec.rs @@ -364,7 +364,9 @@ pub fn check_config_process(force_reset: bool) { let res = child.wait(); log::info!("Check hwcodec config, wait result: {res:?}"); } - Err(e) => log::error!("Check hwcodec config, error attempting to wait: {e}"), + Err(e) => { + log::error!("Check hwcodec config, error attempting to wait: {e}") + } } HwCodecConfig::refresh(); }