From 3138e1f1c091fd48e7e7e1e2a176cea1eb053422 Mon Sep 17 00:00:00 2001
From: rubenasplund <ruben.asplund@hotmail.com>
Date: Wed, 13 Jan 2021 18:31:13 +0100
Subject: [PATCH] Moved TaskData struct to common.rs
---
srp_analysis/src/analysis.rs | 9 ---------
srp_analysis/src/common.rs | 9 ++++++++-
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/srp_analysis/src/analysis.rs b/srp_analysis/src/analysis.rs
index 0377e45..e91754a 100644
--- a/srp_analysis/src/analysis.rs
+++ b/srp_analysis/src/analysis.rs
@@ -1,15 +1,6 @@
use crate::common::*;
use std::collections::HashSet;
-#[derive(Debug, Clone)]
-pub struct TaskData {
- pub task: Task,
- pub response_time: u32,
- pub wcet: u32,
- pub blocking_time: u32,
- pub preemption_time: u32
-}
-
// Prints out vector with [task id, response time, wcet time, blocking time, preemption time]
pub fn analysis(tasks: &Tasks, exact: bool) -> Vec<TaskData>{
let mut analysis: Vec<TaskData> = vec!();
diff --git a/srp_analysis/src/common.rs b/srp_analysis/src/common.rs
index c98b28c..40db8b7 100644
--- a/srp_analysis/src/common.rs
+++ b/srp_analysis/src/common.rs
@@ -1,6 +1,13 @@
use std::collections::{HashMap, HashSet};
-// common data structures
+#[derive(Debug, Clone)]
+pub struct TaskData {
+ pub task: Task,
+ pub response_time: u32,
+ pub wcet: u32,
+ pub blocking_time: u32,
+ pub preemption_time: u32
+}
#[derive(Debug, Clone)]
pub struct Task {
--
GitLab