From e6d459c03aa623de2551859da530803890857e89 Mon Sep 17 00:00:00 2001 From: dana Date: Thu, 2 Jan 2025 15:33:29 -0500 Subject: [PATCH 1/4] Slightly more meaningful names modification --- .../245_ravenscar_tasking/02-tasks.rst | 6 +++--- .../04-protected_objects.rst | 6 +++--- .../06-tasking_behavior.rst | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/courses/fundamentals_of_ada/245_ravenscar_tasking/02-tasks.rst b/courses/fundamentals_of_ada/245_ravenscar_tasking/02-tasks.rst index 9da912b3f..cdb61e81f 100644 --- a/courses/fundamentals_of_ada/245_ravenscar_tasking/02-tasks.rst +++ b/courses/fundamentals_of_ada/245_ravenscar_tasking/02-tasks.rst @@ -33,8 +33,8 @@ Ravenscar Tasks Declaration Example package My_Tasks is task type Printer; - P1 : Printer; - P2 : Printer; + Printer_Task_1 : Printer; + Printer_Task_2 : Printer; end My_Tasks; :filename:`my_tasks.adb` @@ -45,7 +45,7 @@ Ravenscar Tasks Declaration Example with Ada.Real_Time; use Ada.Real_Time; package body My_Tasks is - P3 : Printer; -- correct + Printer_Task_3 : Printer; -- correct task body Printer is Period : Time_Span := Milliseconds (100); diff --git a/courses/fundamentals_of_ada/245_ravenscar_tasking/04-protected_objects.rst b/courses/fundamentals_of_ada/245_ravenscar_tasking/04-protected_objects.rst index 5189eb7c2..7da50648a 100644 --- a/courses/fundamentals_of_ada/245_ravenscar_tasking/04-protected_objects.rst +++ b/courses/fundamentals_of_ada/245_ravenscar_tasking/04-protected_objects.rst @@ -19,7 +19,7 @@ Protected Objects protected type Protected_Value is - procedure Set (V : Integer); + procedure Set (Some_Value : Integer); function Get return Integer; private Value : Integer; @@ -30,9 +30,9 @@ Protected Objects .. code:: Ada protected body Protected_Value is - procedure Set (V : Integer) is + procedure Set (Some_Value : Integer) is begin - Value := V; + Value := Some_Value; end Set; function Get return Integer is diff --git a/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst b/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst index a52b37942..a0429fd2a 100644 --- a/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst +++ b/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst @@ -139,7 +139,7 @@ Priorities procedure Main is pragma Priority (2); - task T is + task Some_Task is pragma Priority (4); protected Buffer is @@ -167,18 +167,18 @@ Ceiling Locking .. code:: - L : Lock; + The_Lock : Lock; T1 : Task (Priority => 1); T2 : Task (Priority => 2); T3 : Task (Priority => 3); - T1 locks L + T1 locks The_Lock T3 starts, get scheduled (T3 > T1) - T3 tries to get L, blocks + T3 tries to get The_Lock, blocks T2 starts, get scheduled (T2 > T1) - Result: T2 running, T1 blocked, T3 blocked through L (but T3 > T2!) + Result: T2 running, T1 blocked, T3 blocked through The_Lock (but T3 > T2!) * Solved with ceiling locking @@ -199,17 +199,17 @@ Ceiling Locking Example .. code:: Ada - protected P with Priority => 5 is - procedure Set (V : Integer); + protected Protected_Obj with Priority => 5 is + procedure Set (Val : Integer); .. code:: Ada - task T with Priority => 4 is + task Some_Task with Priority => 4 is ... - task body T is + task body Some_Task is ... - P.Set (1); + Protected_Obj.Set (1); .. image:: ravenscar_ceiling_locking.png :width: 45% From 476f5c6d1802379500965b594b04b5e6b944a837 Mon Sep 17 00:00:00 2001 From: dana Date: Thu, 2 Jan 2025 15:49:09 -0500 Subject: [PATCH 2/4] Changing ceiling example vars to single char to match image (in this case, the longer names would make an image look weird) --- .../245_ravenscar_tasking/06-tasking_behavior.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst b/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst index a0429fd2a..566798811 100644 --- a/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst +++ b/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst @@ -199,17 +199,17 @@ Ceiling Locking Example .. code:: Ada - protected Protected_Obj with Priority => 5 is + protected P with Priority => 5 is procedure Set (Val : Integer); .. code:: Ada - task Some_Task with Priority => 4 is + task T with Priority => 4 is ... - task body Some_Task is + task body T is ... - Protected_Obj.Set (1); + ProtectePd_Obj.Set (1); .. image:: ravenscar_ceiling_locking.png :width: 45% From 57187840e0edfbc022e56eaed08bf85a888297cb Mon Sep 17 00:00:00 2001 From: dana Date: Thu, 2 Jan 2025 15:57:31 -0500 Subject: [PATCH 3/4] Missed a var --- .../245_ravenscar_tasking/06-tasking_behavior.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst b/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst index 566798811..74e70037a 100644 --- a/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst +++ b/courses/fundamentals_of_ada/245_ravenscar_tasking/06-tasking_behavior.rst @@ -209,7 +209,7 @@ Ceiling Locking Example task body T is ... - ProtectePd_Obj.Set (1); + P.Set (1); .. image:: ravenscar_ceiling_locking.png :width: 45% From 18a6a06f5180b8f7803fd557f6328694719e86e8 Mon Sep 17 00:00:00 2001 From: dana Date: Wed, 8 Jan 2025 17:27:49 -0500 Subject: [PATCH 4/4] Fix for overflow on code slide --- .../245_ravenscar_tasking/04-protected_objects.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/courses/fundamentals_of_ada/245_ravenscar_tasking/04-protected_objects.rst b/courses/fundamentals_of_ada/245_ravenscar_tasking/04-protected_objects.rst index 7da50648a..5189eb7c2 100644 --- a/courses/fundamentals_of_ada/245_ravenscar_tasking/04-protected_objects.rst +++ b/courses/fundamentals_of_ada/245_ravenscar_tasking/04-protected_objects.rst @@ -19,7 +19,7 @@ Protected Objects protected type Protected_Value is - procedure Set (Some_Value : Integer); + procedure Set (V : Integer); function Get return Integer; private Value : Integer; @@ -30,9 +30,9 @@ Protected Objects .. code:: Ada protected body Protected_Value is - procedure Set (Some_Value : Integer) is + procedure Set (V : Integer) is begin - Value := Some_Value; + Value := V; end Set; function Get return Integer is