rust/sat-rs
rust/sat-rs
5
1
Fork 0
Code Issues 9 Pull Requests Projects Releases 22 Wiki Activity

some bugfixes

Browse Source
This commit is contained in:
Robin Müller 2022-05-26 19:19:16 +02:00
parent be2a4ac3a2
commit 35aa7c450c
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/executable.rs
View File

@ -10,14 +10,8 @@ pub enum ExecutionType {
pub trait Executable: Send { pub trait Executable: Send {
type Error; type Error;
//const EXEC_TYPE: ExecutionType;
//const TASK_NAME: &'static str;
fn exec_type(&self) -> ExecutionType;// { fn exec_type(&self) -> ExecutionType;
// return Self::EXEC_TYPE; fn task_name(&self) -> &'static str;
//}
fn task_name(&self) -> &'static str;//{
// return Self::TASK_NAME;
//}
fn periodic_op(&mut self, op_code: i32) -> Result<OpResult, Self::Error>; fn periodic_op(&mut self, op_code: i32) -> Result<OpResult, Self::Error>;
} }

36
src/main.rs
View File

@ -60,7 +60,7 @@ impl Executable for FixedCyclesTask {
type Error = ExampleError; type Error = ExampleError;
fn exec_type(&self) -> ExecutionType { fn exec_type(&self) -> ExecutionType {
ExecutionType::Cycles(5) ExecutionType::Cycles(3)
} }
fn task_name(&self) -> &'static str { fn task_name(&self) -> &'static str {
@ -103,10 +103,11 @@ impl Executable for PeriodicTask {
fn test0() { fn test0() {
let exec_task = OneShotTask {}; let exec_task = OneShotTask {};
let task_vec = vec![Box::new(exec_task)]; let task_vec = vec![Box::new(exec_task)];
let jhandle = test_thread(task_vec, Some(Duration::from_millis(500)), 0); let jhandle = executable_scheduler(task_vec, Some(Duration::from_millis(100)), 0);
let exec_task2 = FixedCyclesTask {}; let exec_task2 = FixedCyclesTask {};
let task_vec2 = vec![Box::new(exec_task2)]; let task_vec2: Vec<Box<dyn Executable<Error = ExampleError> + Send>> =
let jhandle2 = test_thread(task_vec2, Some(Duration::from_millis(1000)), 1); vec![Box::new(exec_task2)];
let jhandle2 = executable_scheduler(task_vec2, Some(Duration::from_millis(100)), 1);
jhandle jhandle
.join() .join()
@ -117,21 +118,28 @@ fn test0() {
.expect("Joining thread 2 failed") .expect("Joining thread 2 failed")
.expect("Task 2 failed"); .expect("Task 2 failed");
} }
fn main() {
fn test1() {
thread::sleep(Duration::from_millis(1000));
let one_shot_in_vec = OneShotTask {}; let one_shot_in_vec = OneShotTask {};
let cycles_in_vec = FixedCyclesTask {}; let cycles_in_vec = FixedCyclesTask {};
let test_vec: Vec<Box<dyn Executable<Error=ExampleError>>> = vec![Box::new(one_shot_in_vec), Box::new(cycles_in_vec)]; let test_vec: Vec<Box<dyn Executable<Error = ExampleError>>> =
let jhandle3 = test_thread(test_vec, Some(Duration::from_millis(500)), 3); vec![Box::new(one_shot_in_vec), Box::new(cycles_in_vec)];
let jhandle3 = executable_scheduler(test_vec, Some(Duration::from_millis(100)), 3);
jhandle3 jhandle3
.join() .join()
.expect("Joining thread 3 failed") .expect("Joining thread 3 failed")
.expect("Task 3 failed"); .expect("Task 3 failed");
} }
fn main() {
test0();
thread::sleep(Duration::from_millis(1000));
test1();
}
fn test_thread<T: Executable<Error = E> + Send + 'static + ?Sized, E: Error + Send + 'static>( fn executable_scheduler<
T: Executable<Error = E> + Send + 'static + ?Sized,
E: Error + Send + 'static,
>(
mut executable_vec: Vec<Box<T>>, mut executable_vec: Vec<Box<T>>,
task_freq: Option<Duration>, task_freq: Option<Duration>,
op_code: i32, op_code: i32,
@ -157,13 +165,15 @@ fn test_thread<T: Executable<Error = E> + Send + 'static + ?Sized, E: Error + Se
} }
} }
} }
executable_vec.retain(|_| !*removal_flags.iter().next().unwrap()); let mut removal_iter = removal_flags.iter();
executable_vec.retain(|_| !*removal_iter.next().unwrap());
removal_iter = removal_flags.iter();
cycle_counts.retain(|_| !*removal_iter.next().unwrap());
removal_flags.retain(|&i| !i); removal_flags.retain(|&i| !i);
if executable_vec.is_empty() { if executable_vec.is_empty() {
return Ok(OpResult::Ok); return Ok(OpResult::Ok);
} }
let freq = task_freq let freq = task_freq.unwrap_or_else(|| panic!("No task frequency specified"));
.unwrap_or_else(|| panic!("No task frequency specified"));
thread::sleep(freq); thread::sleep(freq);
}) })
} }