From 4ef76f7bbf24973e77013504579eb4622232de4c Mon Sep 17 00:00:00 2001
From: jags <jc2161@cam.ac.uk>
Date: Tue, 22 Nov 2022 16:44:08 +0000
Subject: [PATCH] renamed some files

---
 exer4_base_model.xmlv3.txt | 160 +++++++++++++++++++++++++++++++++++++
 exer5_base_model.xmlv3.txt |  50 +++---------
 2 files changed, 169 insertions(+), 41 deletions(-)
 create mode 100644 exer4_base_model.xmlv3.txt

diff --git a/exer4_base_model.xmlv3.txt b/exer4_base_model.xmlv3.txt
new file mode 100644
index 0000000..66ab73b
--- /dev/null
+++ b/exer4_base_model.xmlv3.txt
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<cheddar>
+ <core_units>
+  <core_unit id="id_1">
+   <object_type>CORE_OBJECT_TYPE</object_type>
+   <name>core1</name>
+   <scheduling>
+    <scheduling_parameters>
+     <scheduler_type>RATE_MONOTONIC_PROTOCOL</scheduler_type>
+     <quantum>0</quantum>
+     <preemptive_type>PREEMPTIVE</preemptive_type>
+     <capacity>0</capacity>
+     <period>0</period>
+     <priority>0</priority>
+     <start_time>0</start_time>
+    </scheduling_parameters>
+   </scheduling>
+   <speed>1</speed>
+   <worstcase_perequest_intrabank_memory_interference>0</worstcase_perequest_intrabank_memory_interference>
+   <worstcase_perequest_interbank_memory_interference>0</worstcase_perequest_interbank_memory_interference>
+   <isa>I386</isa>
+  </core_unit>
+ </core_units>
+ <processors>
+  <mono_core_processor id="id_12">
+   <object_type>PROCESSOR_OBJECT_TYPE</object_type>
+   <name>cpu1</name>
+   <processor_type>MONOCORE_TYPE</processor_type>
+   <migration_type>NO_MIGRATION_TYPE</migration_type>
+   <core ref="id_1">
+   </core>
+  </mono_core_processor>
+ </processors>
+ <address_spaces>
+  <address_space id="id_14">
+   <object_type>ADDRESS_SPACE_OBJECT_TYPE</object_type>
+   <name>ea1</name>
+   <cpu_name>cpu1</cpu_name>
+   <text_memory_size>0</text_memory_size>
+   <stack_memory_size>0</stack_memory_size>
+   <data_memory_size>0</data_memory_size>
+   <heap_memory_size>0</heap_memory_size>
+   <scheduling>
+    <scheduling_parameters>
+     <scheduler_type>NO_SCHEDULING_PROTOCOL</scheduler_type>
+     <quantum>0</quantum>
+     <preemptive_type>PREEMPTIVE</preemptive_type>
+     <capacity>0</capacity>
+     <period>0</period>
+     <priority>0</priority>
+     <start_time>0</start_time>
+    </scheduling_parameters>
+   </scheduling>
+   <mils_confidentiality_level>UNCLASSIFIED</mils_confidentiality_level>
+   <mils_integrity_level>LOW</mils_integrity_level>
+   <mils_component>SLS</mils_component>
+   <mils_partition>DEVICE</mils_partition>
+   <mils_compliant>FALSE</mils_compliant>
+  </address_space>
+ </address_spaces>
+ <tasks>
+  <periodic_task id="id_4">
+   <object_type>TASK_OBJECT_TYPE</object_type>
+   <name>T1</name>
+   <task_type>PERIODIC_TYPE</task_type>
+   <cpu_name>cpu1</cpu_name>
+   <address_space_name>ea1</address_space_name>
+   <capacity>2</capacity>
+   <capacity_low>0</capacity_low>
+   <energy_consumption>0</energy_consumption>
+   <deadline>6</deadline>
+   <start_time>0</start_time>
+   <priority>100</priority>
+   <blocking_time>0</blocking_time>
+   <policy>SCHED_FIFO</policy>
+   <text_memory_size>0</text_memory_size>
+   <text_memory_start_address>0</text_memory_start_address>
+   <stack_memory_size>0</stack_memory_size>
+   <criticality>0</criticality>
+   <context_switch_overhead>0</context_switch_overhead>
+   <cfg_relocatable>FALSE</cfg_relocatable>
+   <mils_confidentiality_level>UNCLASSIFIED</mils_confidentiality_level>
+   <mils_integrity_level>LOW</mils_integrity_level>
+   <mils_component>SLS</mils_component>
+   <mils_task>APPLICATION</mils_task>
+   <mils_compliant>FALSE</mils_compliant>
+   <access_memory_number>0</access_memory_number>
+   <maximum_number_of_memory_request_per_job>0</maximum_number_of_memory_request_per_job>
+   <period>6</period>
+   <jitter>0</jitter>
+   <every>0</every>
+   <completion_time>0</completion_time>
+  </periodic_task>
+  <periodic_task id="id_5">
+   <object_type>TASK_OBJECT_TYPE</object_type>
+   <name>T2</name>
+   <task_type>PERIODIC_TYPE</task_type>
+   <cpu_name>cpu1</cpu_name>
+   <address_space_name>ea1</address_space_name>
+   <capacity>2</capacity>
+   <capacity_low>0</capacity_low>
+   <energy_consumption>0</energy_consumption>
+   <deadline>8</deadline>
+   <start_time>0</start_time>
+   <priority>40</priority>
+   <blocking_time>0</blocking_time>
+   <policy>SCHED_FIFO</policy>
+   <text_memory_size>0</text_memory_size>
+   <text_memory_start_address>0</text_memory_start_address>
+   <stack_memory_size>0</stack_memory_size>
+   <criticality>0</criticality>
+   <context_switch_overhead>0</context_switch_overhead>
+   <cfg_relocatable>FALSE</cfg_relocatable>
+   <mils_confidentiality_level>UNCLASSIFIED</mils_confidentiality_level>
+   <mils_integrity_level>LOW</mils_integrity_level>
+   <mils_component>SLS</mils_component>
+   <mils_task>APPLICATION</mils_task>
+   <mils_compliant>FALSE</mils_compliant>
+   <access_memory_number>0</access_memory_number>
+   <maximum_number_of_memory_request_per_job>0</maximum_number_of_memory_request_per_job>
+   <period>8</period>
+   <jitter>0</jitter>
+   <every>0</every>
+   <completion_time>0</completion_time>
+  </periodic_task>
+  <periodic_task id="id_34">
+   <object_type>TASK_OBJECT_TYPE</object_type>
+   <name>T3</name>
+   <task_type>PERIODIC_TYPE</task_type>
+   <cpu_name>cpu1</cpu_name>
+   <address_space_name>ea1</address_space_name>
+   <capacity>5</capacity>
+   <capacity_low>0</capacity_low>
+   <energy_consumption>0</energy_consumption>
+   <deadline>12</deadline>
+   <start_time>0</start_time>
+   <priority>10</priority>
+   <blocking_time>0</blocking_time>
+   <policy>SCHED_FIFO</policy>
+   <text_memory_size>0</text_memory_size>
+   <text_memory_start_address>0</text_memory_start_address>
+   <stack_memory_size>0</stack_memory_size>
+   <criticality>0</criticality>
+   <context_switch_overhead>0</context_switch_overhead>
+   <cfg_relocatable>FALSE</cfg_relocatable>
+   <mils_confidentiality_level>UNCLASSIFIED</mils_confidentiality_level>
+   <mils_integrity_level>LOW</mils_integrity_level>
+   <mils_component>SLS</mils_component>
+   <mils_task>APPLICATION</mils_task>
+   <mils_compliant>FALSE</mils_compliant>
+   <access_memory_number>0</access_memory_number>
+   <maximum_number_of_memory_request_per_job>0</maximum_number_of_memory_request_per_job>
+   <period>12</period>
+   <jitter>0</jitter>
+   <every>0</every>
+   <completion_time>0</completion_time>
+  </periodic_task>
+ </tasks>
+</cheddar>
+
diff --git a/exer5_base_model.xmlv3.txt b/exer5_base_model.xmlv3.txt
index 66ab73b..3b7d757 100644
--- a/exer5_base_model.xmlv3.txt
+++ b/exer5_base_model.xmlv3.txt
@@ -65,12 +65,12 @@
    <task_type>PERIODIC_TYPE</task_type>
    <cpu_name>cpu1</cpu_name>
    <address_space_name>ea1</address_space_name>
-   <capacity>2</capacity>
+   <capacity>8</capacity>
    <capacity_low>0</capacity_low>
    <energy_consumption>0</energy_consumption>
-   <deadline>6</deadline>
+   <deadline>31</deadline>
    <start_time>0</start_time>
-   <priority>100</priority>
+   <priority>50</priority>
    <blocking_time>0</blocking_time>
    <policy>SCHED_FIFO</policy>
    <text_memory_size>0</text_memory_size>
@@ -86,7 +86,7 @@
    <mils_compliant>FALSE</mils_compliant>
    <access_memory_number>0</access_memory_number>
    <maximum_number_of_memory_request_per_job>0</maximum_number_of_memory_request_per_job>
-   <period>6</period>
+   <period>31</period>
    <jitter>0</jitter>
    <every>0</every>
    <completion_time>0</completion_time>
@@ -97,44 +97,12 @@
    <task_type>PERIODIC_TYPE</task_type>
    <cpu_name>cpu1</cpu_name>
    <address_space_name>ea1</address_space_name>
-   <capacity>2</capacity>
+   <capacity>8</capacity>
    <capacity_low>0</capacity_low>
    <energy_consumption>0</energy_consumption>
-   <deadline>8</deadline>
-   <start_time>0</start_time>
-   <priority>40</priority>
-   <blocking_time>0</blocking_time>
-   <policy>SCHED_FIFO</policy>
-   <text_memory_size>0</text_memory_size>
-   <text_memory_start_address>0</text_memory_start_address>
-   <stack_memory_size>0</stack_memory_size>
-   <criticality>0</criticality>
-   <context_switch_overhead>0</context_switch_overhead>
-   <cfg_relocatable>FALSE</cfg_relocatable>
-   <mils_confidentiality_level>UNCLASSIFIED</mils_confidentiality_level>
-   <mils_integrity_level>LOW</mils_integrity_level>
-   <mils_component>SLS</mils_component>
-   <mils_task>APPLICATION</mils_task>
-   <mils_compliant>FALSE</mils_compliant>
-   <access_memory_number>0</access_memory_number>
-   <maximum_number_of_memory_request_per_job>0</maximum_number_of_memory_request_per_job>
-   <period>8</period>
-   <jitter>0</jitter>
-   <every>0</every>
-   <completion_time>0</completion_time>
-  </periodic_task>
-  <periodic_task id="id_34">
-   <object_type>TASK_OBJECT_TYPE</object_type>
-   <name>T3</name>
-   <task_type>PERIODIC_TYPE</task_type>
-   <cpu_name>cpu1</cpu_name>
-   <address_space_name>ea1</address_space_name>
-   <capacity>5</capacity>
-   <capacity_low>0</capacity_low>
-   <energy_consumption>0</energy_consumption>
-   <deadline>12</deadline>
-   <start_time>0</start_time>
-   <priority>10</priority>
+   <deadline>30</deadline>
+   <start_time>2</start_time>
+   <priority>100</priority>
    <blocking_time>0</blocking_time>
    <policy>SCHED_FIFO</policy>
    <text_memory_size>0</text_memory_size>
@@ -150,7 +118,7 @@
    <mils_compliant>FALSE</mils_compliant>
    <access_memory_number>0</access_memory_number>
    <maximum_number_of_memory_request_per_job>0</maximum_number_of_memory_request_per_job>
-   <period>12</period>
+   <period>30</period>
    <jitter>0</jitter>
    <every>0</every>
    <completion_time>0</completion_time>
-- 
GitLab