lumither/nocturne
1
0 Fork 0
mirror of https://github.com/Lumither/nocturne.git synced 2026-10-17 10:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(scheduler) remove unnecessary field

Browse Source
This commit is contained in:
lumither committed 2024-10-30 23:07:22 -07:00
1 parent 6f45a140ba
commit d98aa3f745
1 file changed
+14 -12
Download Patch File Download Diff File Expand all files Collapse all files
backend/api_server/src/scheduler/mod.rs
+14 -12
View File
@@ -7,6 +7,7 @@ use crate::{
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::RwLock; use std::sync::RwLock;
use std::{collections::HashMap, sync::Arc, thread}; use std::{collections::HashMap, sync::Arc, thread};
use tracing::log::error;
use uuid::Uuid; use uuid::Uuid;
pub mod scheduler_error; pub mod scheduler_error;
@@ -23,7 +24,6 @@ struct TaskStatus {
pub struct Scheduler { pub struct Scheduler {
tasks: Arc<RwLock<HashMap<Uuid, Arc<Box<dyn Task>>>>>, tasks: Arc<RwLock<HashMap<Uuid, Arc<Box<dyn Task>>>>>,
running: Arc<RwLock<HashMap<Uuid, Arc<TaskStatus>>>>, running: Arc<RwLock<HashMap<Uuid, Arc<TaskStatus>>>>,
stopped: Arc<RwLock<Vec<Uuid>>>,
} }
impl Scheduler { impl Scheduler {
@@ -40,7 +40,6 @@ impl Scheduler {
fn run_task( fn run_task(
running: Arc<RwLock<HashMap<Uuid, Arc<TaskStatus>>>>, running: Arc<RwLock<HashMap<Uuid, Arc<TaskStatus>>>>,
stopped: Arc<RwLock<Vec<Uuid>>>,
id: Uuid, id: Uuid,
task: Arc<Box<dyn Task>>, task: Arc<Box<dyn Task>>,
) -> Result<(), SchedulerError> { ) -> Result<(), SchedulerError> {
@@ -69,7 +68,6 @@ impl Scheduler {
let mut running_lock_guard = running.write()?; let mut running_lock_guard = running.write()?;
running_lock_guard.remove(&id); running_lock_guard.remove(&id);
} }
stopped.write()?.push(id);
return Ok(()); return Ok(());
} else { } else {
let sleeper = Arc::from(SkippableSleeper::from(next_execution)); let sleeper = Arc::from(SkippableSleeper::from(next_execution));
@@ -89,7 +87,7 @@ impl Scheduler {
} }
} }
} else { } else {
stopped.write()?.push(id); error!("unexpected error ");
break; break;
} }
} }
@@ -100,7 +98,7 @@ impl Scheduler {
pub fn run(&self, id: &Uuid) -> Result<(), SchedulerError> { pub fn run(&self, id: &Uuid) -> Result<(), SchedulerError> {
let id = id.to_owned(); let id = id.to_owned();
if let Some(task) = self.tasks.read()?.get(&id) { if let Some(task) = self.tasks.read()?.get(&id) {
Self::run_task(self.running.clone(), self.stopped.clone(), id, task.clone()) Self::run_task(self.running.clone(), id, task.clone())
} else { } else {
Err(IdNotFound) Err(IdNotFound)
} }
@@ -110,9 +108,8 @@ impl Scheduler {
let id = id.to_owned(); let id = id.to_owned();
if let Some(task) = self.tasks.read()?.get(&id) { if let Some(task) = self.tasks.read()?.get(&id) {
let running_clone = self.running.clone(); let running_clone = self.running.clone();
let stopped_clone = self.stopped.clone();
let task_clone = task.clone(); let task_clone = task.clone();
thread::spawn(move || Self::run_task(running_clone, stopped_clone, id, task_clone)); thread::spawn(move || Self::run_task(running_clone, id, task_clone));
Ok(()) Ok(())
} else { } else {
Err(IdNotFound) Err(IdNotFound)
@@ -174,11 +171,16 @@ mod tests {
let scheduler = Scheduler::default(); let scheduler = Scheduler::default();
let task = BasicTask::new(|| println!("test print"), "* * * * * *")?; let task = BasicTask::new(|| println!("test print"), "* * * * * *")?;
let id = scheduler.insert(Box::new(task))?; let id = scheduler.insert(Box::new(task))?;
scheduler.run_non_blocking(&id)?; for i in 1..=2 {
thread::sleep(Duration::from_secs(4)); println!("Loop {} start", i);
scheduler.stop(&id)?; println!("Run {}", i);
// test termination scheduler.run_non_blocking(&id)?;
thread::sleep(Duration::from_secs(5)); thread::sleep(Duration::from_secs(4));
scheduler.stop(&id)?;
println!("Stop {}", i);
thread::sleep(Duration::from_secs(2));
println!("Loop {} finished", i);
}
Ok(()) Ok(())
} }
} }