diff --git a/srp_analysis/example/output1.json b/srp_analysis/example/output1.json index ad191fb82cd1aac75a10b6324adc648c05a0d09d..ef381521a54478b1bf1c42176479c0c91aa28cf9 100644 --- a/srp_analysis/example/output1.json +++ b/srp_analysis/example/output1.json @@ -1 +1 @@ -[{"task":{"id":"T1","prio":1,"deadline":100,"inter_arrival":100,"trace":{"id":"T1","start":0,"end":10,"inner":[]}},"response_time":100,"wcet":10,"block_time":0,"preemtion_time":90},{"task":{"id":"T2","prio":2,"deadline":200,"inter_arrival":200,"trace":{"id":"T2","start":0,"end":30,"inner":[{"id":"R1","start":10,"end":20,"inner":[{"id":"R2","start":12,"end":16,"inner":[]}]},{"id":"R1","start":22,"end":28,"inner":[]}]}},"response_time":90,"wcet":30,"block_time":0,"preemtion_time":60},{"task":{"id":"T3","prio":3,"deadline":50,"inter_arrival":50,"trace":{"id":"T3","start":0,"end":30,"inner":[{"id":"R2","start":10,"end":20,"inner":[]}]}},"response_time":34,"wcet":30,"block_time":4,"preemtion_time":0}] \ No newline at end of file +[{"task":{"id":"T1","prio":1,"deadline":100,"inter_arrival":100,"trace":{"id":"T1","start":0,"end":10,"inner":[]}},"response_time":100,"wcet":10,"block_time":0,"preemption_time":90},{"task":{"id":"T2","prio":2,"deadline":200,"inter_arrival":200,"trace":{"id":"T2","start":0,"end":30,"inner":[{"id":"R1","start":10,"end":20,"inner":[{"id":"R2","start":12,"end":16,"inner":[]}]},{"id":"R1","start":22,"end":28,"inner":[]}]}},"response_time":90,"wcet":30,"block_time":0,"preemption_time":60},{"task":{"id":"T3","prio":3,"deadline":50,"inter_arrival":50,"trace":{"id":"T3","start":0,"end":30,"inner":[{"id":"R2","start":10,"end":20,"inner":[]}]}},"response_time":34,"wcet":30,"block_time":4,"preemption_time":0}] \ No newline at end of file diff --git a/srp_analysis/example/output1.txt b/srp_analysis/example/output1.txt index 6219ffaeeae3e637e50f63eacd5c743769fe1c44..37e15d9ba65080998f74f1072716d76b52810ab9 100644 --- a/srp_analysis/example/output1.txt +++ b/srp_analysis/example/output1.txt @@ -1,24 +1,24 @@ Overview Total Util: 0.85 Tasks: T1 T2 T3 - Priority: P(T1) = 1 P(T3) = 3 P(T2) = 2 P(R2) = 3 P(R1) = 2 + Priority: P(R1) = 2 P(T2) = 2 P(T1) = 1 P(R2) = 3 P(T3) = 3 Task Resources: T2:( R1 R2 ) T3:( R2 ) Analysis of T1 Response Time: 100 wcet: 10 Block Time: 0 - Preemtion Time: 90 + Preemption Time: 90 Analysis of T2 Response Time: 90 wcet: 30 Block Time: 0 - Preemtion Time: 60 + Preemption Time: 60 Analysis of T3 Response Time: 34 wcet: 30 Block Time: 4 - Preemtion Time: 0 + Preemption Time: 0 Task T1 Priority: 1 diff --git a/srp_analysis/src/formater.rs b/srp_analysis/src/formater.rs index 7b7fd8abf1530e034a4c95d9a48ee67fca373d2f..a88491d6b6be0f33cd54d9d5b089a3108519a7cc 100644 --- a/srp_analysis/src/formater.rs +++ b/srp_analysis/src/formater.rs @@ -78,7 +78,7 @@ pub fn format_analysed_task(task: &AnalysedTask) -> String { let res_t = format!("Response Time: {}", task.response_time); let wcet = format!("wcet: {}", task.wcet); let block_t = format!("Block Time: {}", task.block_time); - let pre_t = format!("Preemtion Time: {}", task.preemtion_time); + let pre_t = format!("Preemption Time: {}", task.preemption_time); return format!("{}\n\t{}\n\t{}\n\t{}\n\t{}", header, res_t, wcet, block_t, pre_t); } diff --git a/srp_analysis/src/srp_analyser.rs b/srp_analysis/src/srp_analyser.rs index dad43930ba31699d658abda9ea1b3bfa37df4eee..3251f6d87c98694131bfb6d5f27b4313061c5414 100644 --- a/srp_analysis/src/srp_analyser.rs +++ b/srp_analysis/src/srp_analyser.rs @@ -8,7 +8,7 @@ pub struct AnalysedTask { pub response_time: u32, pub wcet: u32, pub block_time: u32, - pub preemtion_time: u32, + pub preemption_time: u32, } @@ -189,7 +189,7 @@ pub fn analyse(tasks: &Tasks, ip: &IdPrio, tr: &TaskResources, approx: bool) -> response_time: response_time(t, tasks, ip, tr, approx), wcet: wcet(&t.trace), block_time: block_time(t, tasks, ip, tr), - preemtion_time: interference_time(t, tasks, ip, tr, approx).unwrap(), + preemption_time: interference_time(t, tasks, ip, tr, approx).unwrap(), }); } return analysis;