TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-03-21 12:11:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix exceeding max allowed thread count, thread count <= available memory / 2

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages
2023-11-19 08:19:08 +08:00
parent c223d6a87d
commit 9847fc5c77
4 changed files with 34 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libs/scrap/src/common/codec.rs
View File

@@ -566,15 +566,18 @@ pub fn base_bitrate(width: u32, height: u32) -> u32 {
base_bitrate
}
pub fn codec_thread_num() -> usize {
pub fn codec_thread_num(limit: usize) -> usize {
let max: usize = num_cpus::get();
let mut res;
let info;
let mut s = System::new();
s.refresh_memory();
let memory = s.available_memory() / 1024 / 1024 / 1024;
#[cfg(windows)]
{
res = 0;
let percent = hbb_common::platform::windows::cpu_uage_one_minute();
info = format!("cpu usage:{:?}", percent);
info = format!("cpu usage: {:?}", percent);
if let Some(pecent) = percent {
if pecent < 100.0 {
res = ((100.0 - pecent) * (max as f64) / 200.0).round() as usize;
@@ -583,24 +586,41 @@ pub fn codec_thread_num() -> usize {
}
#[cfg(not(windows))]
{
let mut s = System::new();
s.refresh_cpu_usage();
// https://man7.org/linux/man-pages/man3/getloadavg.3.html
let avg = s.load_average();
info = format!("cpu loadavg:{}", avg.one);
info = format!("cpu loadavg: {}", avg.one);
res = (((max as f64) - avg.one) * 0.5).round() as usize;
}
res = std::cmp::min(res, max / 2);
if res == 0 {
res = 1;
}
res = std::cmp::min(res, memory as usize / 2);
// Use common thread count
res = match res {
_ if res >= 64 => 64,
_ if res >= 32 => 32,
_ if res >= 16 => 16,
_ if res >= 8 => 8,
_ if res >= 4 => 4,
_ if res >= 2 => 2,
_ => 1,
};
// https://aomedia.googlesource.com/aom/+/refs/heads/main/av1/av1_cx_iface.c#677
// https://aomedia.googlesource.com/aom/+/refs/heads/main/aom_util/aom_thread.h#26
// https://chromium.googlesource.com/webm/libvpx/+/refs/heads/main/vp8/vp8_cx_iface.c#148
// https://chromium.googlesource.com/webm/libvpx/+/refs/heads/main/vp9/vp9_cx_iface.c#190
// https://github.com/FFmpeg/FFmpeg/blob/7c16bf0829802534004326c8e65fb6cdbdb634fa/libavcodec/pthread.c#L65
// https://github.com/FFmpeg/FFmpeg/blob/7c16bf0829802534004326c8e65fb6cdbdb634fa/libavcodec/pthread_internal.h#L26
// libaom: MAX_NUM_THREADS = 64
// libvpx: MAX_NUM_THREADS = 64
// ffmpeg: MAX_AUTO_THREADS = 16
res = std::cmp::min(res, limit);
// avoid frequent log
let log = match THREAD_LOG_TIME.lock().unwrap().clone() {
Some(instant) => instant.elapsed().as_secs() > 1,
None => true,
};
if log {
log::info!("cpu num: {max}, {info}, codec thread: {res}");
log::info!("cpu num: {max}, {info}, available memory: {memory}G, codec thread: {res}");
*THREAD_LOG_TIME.lock().unwrap() = Some(Instant::now());
}
res