tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

followup: server/state: rename task_count to internal_task_count 

so that the relation with spawn_internal_task is made more clear

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-07-24 12:11:33 +02:00
parent beaa683a52
commit 3da9b7e0dd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/state.rs
View File

@ -19,7 +19,7 @@ pub struct ServerState {
pub shutdown_listeners: BroadcastData<()>, pub shutdown_listeners: BroadcastData<()>,
pub last_worker_listeners: BroadcastData<()>, pub last_worker_listeners: BroadcastData<()>,
pub worker_count: usize, pub worker_count: usize,
pub task_count: usize, pub internal_task_count: usize,
pub reload_request: bool, pub reload_request: bool,
} }
@ -29,7 +29,7 @@ lazy_static! {
shutdown_listeners: BroadcastData::new(), shutdown_listeners: BroadcastData::new(),
last_worker_listeners: BroadcastData::new(), last_worker_listeners: BroadcastData::new(),
worker_count: 0, worker_count: 0,
task_count: 0, internal_task_count: 0,
reload_request: false, reload_request: false,
}); });
} }
@ -111,7 +111,7 @@ pub fn set_worker_count(count: usize) {
pub fn check_last_worker() { pub fn check_last_worker() {
let mut data = SERVER_STATE.lock().unwrap(); let mut data = SERVER_STATE.lock().unwrap();
if !(data.mode == ServerMode::Shutdown && data.worker_count == 0 && data.task_count == 0) { return; } if !(data.mode == ServerMode::Shutdown && data.worker_count == 0 && data.internal_task_count == 0) { return; }
data.last_worker_listeners.notify_listeners(Ok(())); data.last_worker_listeners.notify_listeners(Ok(()));
} }
@ -125,15 +125,15 @@ where
T::Output: Send + 'static, T::Output: Send + 'static,
{ {
let mut data = SERVER_STATE.lock().unwrap(); let mut data = SERVER_STATE.lock().unwrap();
data.task_count += 1; data.internal_task_count += 1;
tokio::spawn(async move { tokio::spawn(async move {
let _ = tokio::spawn(task).await; // ignore errors let _ = tokio::spawn(task).await; // ignore errors
{ // drop mutex { // drop mutex
let mut data = SERVER_STATE.lock().unwrap(); let mut data = SERVER_STATE.lock().unwrap();
if data.task_count > 0 { if data.internal_task_count > 0 {
data.task_count -= 1; data.internal_task_count -= 1;
} }
} }