schedule good until week 7 and various fixes

RHIT-CSSE · Nov 30, 2024 · 7b83e26 · 7b83e26
1 parent 8b47a05
commit 7b83e26
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 240 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -43,3 +43,25 @@
       class.
     - Also includes a quick bash crash course for those who are not comfortable
       with a terminal window.
+
+2024-11-29 Mohammad Noureddine
+
+  Made changes to the schedule up to week 7.
+
+  * _data/schedule.yml:
+    - Because of the break, it doesn't make sense to split exam 1, a part before
+      break and one two weeks later, so I put them back to back.
+    - Had to do the same for exam 2 since we also lose a day for MLK day being a
+      holiday now.
+    - Had to remove heap manager II because of the lost lab day, we now do heap
+      manager I and then directly COW.
+      - We might replace one or both of these with ELF if done in time.
+    - Exam 2 is now week 7 back to back, similar to exam 1, so we can start the
+      project on week 8 and have three weeks for it.
+    - We are left with three lab dates, which we can consider what to introduce
+      there. We have the scheduling activity (simple), ext2 (nice), and stack
+      smashing (might nix this), and userspace threads (xv6 and userspace
+      versions), and userspace threads 2 (only userspace version beacuse no
+      signals in xv6).
+    - Added worksheets and solutions links to the schedule.
+
diff --git a/_data/assignments.csv b/_data/assignments.csv
@@ -2,15 +2,15 @@ name,dirname,date,grader,moodle,notes
 C Assessment Quiz,,2024-12-04 23:59,,[Moodle Quiz](https://moodle.rose-hulman.edu/mod/quiz/view.php?id=4683206), Day 2.5
 WSL2 Install,wsl,2024-12-02 23:59,,No submission needed,Day 1
 Lab01: C Review & xv6 Introduction,lab00/,2024-12-05 23:59,,[Submission box]({{ site.gradescope_url }}),Day 3
-# Lab02: Simple Shell,simpleshell/,2024-06-06 23:59,,[Submission box]({{ site.gradescope_url }}),Day 5
-# Lab03: Process Lab,processlab/,2024-06-10 23:59,,[Submission box]({{ site.gradescope_url }}),Day 7
-# Lab04: Debugging Lab,debug/,2024-06-13 23:59,,[Submission box]({{ site.gradescope_url }}),Day 9
-# [Challenge] Lab05: Heap Manager I,heapmm/,2024-06-17 23:59,,[Submission box]({{ site.gradescope_url }}),Day 9
-# [Challenge] Lab06: Heap Manager II,buddy/,2024-06-27 23:59,,[Submission box]({{ site.gradescope_url }}),Day 16
-# [Challenge] Lab07: Copy-on-Write,cow,2024-07-07 23:59,,[Submission box]({{ site.gradescope_url }}),Day 19
-# Lab 08: Threads & Mutex Basics,threads_basics,2024-07-18 23:59,,[Submission box]({{ site.gradescope_url }}),Day 21
-# Lab 09: Condition Variables Basics,condvar,2024-07-22 23:59,,[Submission box]({{ site.gradescope_url }}),Day 23
-# [Challenge] Lab 10: Condition Variables II,condvar_challenge,2024-07-25 23:59,,[Submission box]({{ site.gradescope_url }}),Day 25
+Lab02: Simple Shell,simpleshell/,2024-12-09 23:59,,[Submission box]({{ site.gradescope_url }}),Day 5
+Lab03: Process Lab,processlab/,2024-12-12 23:59,,[Submission box]({{ site.gradescope_url }}),Day 7
+Lab04: Debugging Lab,debug/,2024-12-16 23:59,,[Submission box]({{ site.gradescope_url }}),Day 9
+[Challenge] Lab05: Heap Manager I,heapmm/,2025-01-09 23:59,,[Submission box]({{ site.gradescope_url }}),Day 15
+# [Challenge] Lab06: Heap Manager II,buddy/,2025-01-13 23:59,,[Submission box]({{ site.gradescope_url }}),Day 17
+[Challenge] Lab06: Copy-on-Write,cow,2025-01-13 23:59,,[Submission box]({{ site.gradescope_url }}),Day 17
+Lab 08: Threads & Mutex Basics,threads_basics,2025-01-16 23:59,,[Submission box]({{ site.gradescope_url }}),Day 21
+Lab 09: Condition Variables Basics,condvar,2025-01-23 23:59,,[Submission box]({{ site.gradescope_url }}),Day 23
+[Challenge] Lab 10: Condition Variables II,condvar_challenge,2025-01-27 23:59,,[Submission box]({{ site.gradescope_url }}),Day 25
 # Lab 11: Memory Organization and Safety,smlab,2024-08-01 23:59,,[Submission box]({{ site.gradescope_url }}),Day 33
 # Project Milestone 1,milestone1,2024-08-05 23:59,,[Submission box]({{site.gradescope_url}}),Day 33
 # Lab 12: The xv6 Scheduler,sched,2024-08-09 23:59,,[Submission box]({{ site.gradescope_url }}),Day 36

diff --git a/_data/schedule.yml b/_data/schedule.yml
@@ -6,26 +6,20 @@
 ###############################################################################
 # WEEK 1
 ###############################################################################
-# 1:
-#   reading:
-#     - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/intro.pdf"> Chapter 1 of OSTEP </a>
-#   topics:
-#     - '<a href="{{ site.url }}{{ site.baseurl}}/notes/introduction/">OS Introduction</a>'
-#   materials:
-
 1:
   reading:
+    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/intro.pdf"> Chapter 1 of OSTEP </a>
   topics:
-    # - '<a href="{{ site.url }}{{ site.baseurl}}/notes/boot">The boot process</a>'
-    - <a href="{{ site.url }}{{ site.baseurl}}/notes/session01/">C Review Part 1</a>
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/introduction/">OS Introduction</a>'
   materials:
 
 2:
   reading:
   topics:
-    # - '<a href="{{ site.url }}{{ site.baseurl}}/notes/boot">The boot process</a>'
-    - <a href="{{ site.url }}{{ site.baseurl}}/notes/session01/">C Review Part 2</a>
+    - <a href="{{ site.url }}{{ site.baseurl}}/notes/session01/">C Review</a>
   materials:
+    - <a href="{{ site.url }}{{ site.baseurl}}/assets/files/quiz/quiz01.pdf">Quiz Sheet</a>
+    - <a href="{{ site.url }}{{ site.baseurl}}/assets/files/quiz/quiz01_solution.pdf">Quiz Solution</a>
 
 3:
   reading:
@@ -70,75 +64,85 @@
 
 8:
   reading:
+    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/file-devices.pdf"> Section 36.4 of Chapter 16 </a>
   topics:
-    - Debugging in xv6
-  materials: 
+    # - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session18"> Threads: Lightweight Processes </a>'
+    - Interrupts and Traps
+  materials:
+    <a href="{{site.url}}{{site.baseurl}}/docs/activities/systrace/"> Activity </a>
 
 ###############################################################################
 # WEEK 3
 ###############################################################################
 9:
   reading:
-    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/file-devices.pdf"> Section 36.4 of Chapter 16 </a>
+    # - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/file-devices.pdf"> Section 36.4 of Chapter 16 </a>
   topics:
     # - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session18"> Threads: Lightweight Processes </a>'
-    - Interrupts and Traps
+    - Implementing system calls
   materials:
-    <a href="{{site.url}}{{site.baseurl}}/docs/activities/systrace/"> Activity </a>
+    # <a href="{{site.url}}{{site.baseurl}}/docs/activities/systrace/"> Activity </a>
 
 10:
   reading:
-    - '<a href="{{ site.baseurl }}/labs/heapmm/">Lab 05: Heap Manager I </a>'
+    # - '<a href="{{ site.baseurl }}/labs/heapmm/">Lab 05: Heap Manager I </a>'
   topics:
-    - '<b> Hacking Day: Lab 05 </b>'
+    # - '<b> Hacking Day: Lab 05 </b>'
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session09"> Exam 1 Review </a>'
   materials: 
 
 
 11:
   reading:
-    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/vm-mechanism.pdf"> Chapter 15 of OSTEP </a>
   topics:
-    - <a href="{{ site.url }}{{ site.baseurl}}/notes/paging"> Introduction to Paging </a>
+    - Exam 1 Part 1
   materials: 
 
 12:
   reading:
-    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/vm-paging.pdf"> Chapter 18 of OSTEP </a>
   topics:
-    - <a href="{{ site.url }}{{ site.baseurl}}/notes/session15"> Paging </a>
+    - Exam 1 Part 2
   materials:
-    <a href="{{site.url}}{{site.baseurl}}/docs/activities/paging/"> Activity </a>
 
+
+###############################################################################
+# WEEK 4
+###############################################################################
 13:
   reading:
+    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/vm-mechanism.pdf"> Chapter 15 of OSTEP </a>
   topics:
-    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session09"> Exam 1 Review </a>'
+    - <a href="{{ site.url }}{{ site.baseurl}}/notes/paging"> Introduction to Paging </a>
   materials:
 
 14:
   reading:
+    # - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/vm-paging.pdf"> Chapter 18 of OSTEP </a>
   topics:
-    - '<b> No class: Prep for exam 1 </b>'
+    - <a href="{{ site.url }}{{ site.baseurl}}/notes/session15"> Paging </a>
   materials:
+    <a href="{{site.url}}{{site.baseurl}}/docs/activities/paging/"> Activity </a>
 
-###############################################################################
-# WEEK 4
-###############################################################################
 
 15:
   reading:
-    - '<a href="{{site.baseurl}}/labs/buddy/">Lab 06: Heap Manager II </a>'
+    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/vm-smalltables.pdf"> Chapter 20 of OSTEP </a>
   topics:
-    - '<b> Lab 06: Heap Manager II </b>'
+    - <a href="{{ site.url }}{{ site.baseurl}}/notes/session16"> Multi-level Page Tables </a>
   materials:
 
 16:
   reading:
-    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/vm-smalltables.pdf"> Chapter 20 of OSTEP </a>
+    # - '<a href="{{site.baseurl}}/labs/buddy/">Lab 06: Heap Manager II </a>'
+    - '<a href="{{site.baseurl}}/labs/cow/">Lab 07: Copy-on-Write </a>'
   topics:
-    - <a href="{{ site.url }}{{ site.baseurl}}/notes/session16"> Multi-level Page Tables </a>
   materials:
+    # - '<b> Lab 06: Heap Manager II </b>'
+    - '<b> Lab 07: Copy-On-Write </b>'
 
+###############################################################################
+# WEEK 5
+###############################################################################
 17:
   reading:
   topics:
@@ -147,104 +151,102 @@
 
 18:
   reading:
-    - '<a href="{{site.baseurl}}/labs/cow/">Lab 07: Copy-on-Write </a>'
+    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-intro.pdf"> Chapter 26 of OSTEP </a>
   topics:
-    - '<b> Lab 07: Copy-On-Write </b>'
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session18"> Threads: Lightweight Processes </a>'
   materials:
 
-
-###############################################################################
-# WEEK 5
-###############################################################################
-
 19:
   reading:
+    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-locks.pdf"> Chapter 28 of OSTEP </a>
   topics:
-    - Bash Crash Course
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session19"> Concurrency: Mutex & Condition Variables </a>'
   materials:
 
 20:
   reading:
-    # - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-intro.pdf"> Chapter 26 of OSTEP </a>
   topics:
-    # - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session18"> Threads: Lightweight Processes </a>'
-    - <b> No class, enjoy the break </b>
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session20"> Mutex locks practice </a>'
   materials:
+    <a href="{{site.url}}{{site.baseurl}}/docs/activities/generic/"> Activity </a>
 
 ###############################################################################
 # WEEK 6
 ###############################################################################
 21:
   reading:
-    # - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-locks.pdf"> Chapter 28 of OSTEP </a>
-    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-intro.pdf"> Chapter 26 of OSTEP </a>
+    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-cv.pdf"> Chapter 30 of OSTEP </a>
   topics:
-    # - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session19"> Concurrency: Mutex & Condition Variables </a>'
-    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session18"> Threads: Lightweight Processes </a>'
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session20"> Concurrency: Condition Variables </a>'
   materials:
     <a href="{{site.url}}{{site.baseurl}}/docs/activities/generic/"> Activity </a>
 
 22:
   reading:
+    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-cv.pdf"> Chapter 30 of OSTEP </a>
   topics:
-    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session20"> Mutex locks practice </a>'
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session20"> Concurrency: Condition Variables Practice </a>'
   materials:
     <a href="{{site.url}}{{site.baseurl}}/docs/activities/generic/"> Activity </a>
 
 23:
   reading:
-    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-cv.pdf"> Chapter 30 of OSTEP </a>
+    - <a href="https://en.wikipedia.org/wiki/Producer%E2%80%93consumer_problem"> Wiki Page for Prod/Cons Problem </a>
   topics:
-    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session20"> Concurrency: Condition Variables </a>'
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session21"> Concurrency: Producer-consumer Problem </a>'
   materials:
     <a href="{{site.url}}{{site.baseurl}}/docs/activities/generic/"> Activity </a>
 
+###############################################################################
+# WEEK 7
+###############################################################################
 24:
   reading:
+    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session22"> Concurrency: Readers/Writers Problem </a>'
   topics:
-    - <b> No class, Mohammad was out sick</b>
   materials:
-
-###############################################################################
-# WEEK 6
-###############################################################################
+    <a href="{{site.url}}{{site.baseurl}}/docs/activities/generic/"> Activity </a>
 
 25:
   reading:
-    - <a href="https://pages.cs.wisc.edu/~remzi/OSTEP/threads-cv.pdf"> Chapter 30 of OSTEP </a>
   topics:
-    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session20"> Concurrency: Condition Variables Practice </a>'
+    - Exam 2 Review and Practice
   materials:
-    <a href="{{site.url}}{{site.baseurl}}/docs/activities/generic/"> Activity </a>
 
 26:
   reading:
-    - <a href="https://en.wikipedia.org/wiki/Producer%E2%80%93consumer_problem"> Wiki Page for Prod/Cons Problem </a>
   topics:
-    # - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session23"> Concurrency: Deadlocks </a>'
-    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session21"> Concurrency: Producer-consumer Problem </a>'
+    - <b> Exam 2 Part 1 </b>
   materials:
-    <a href="{{site.url}}{{site.baseurl}}/docs/activities/generic/"> Activity </a>
 
 27:
   reading:
   topics:
-    - '<a href="{{ site.url }}{{ site.baseurl}}/notes/session22"> Concurrency: Readers/Writers Problem </a>'
+    - <b> Exam 2 Part 2 </b>
   materials:
-    <a href="{{site.url}}{{site.baseurl}}/docs/activities/generic/"> Activity </a>
 
+# ################################################################################
+#  WEEK 8
+# ################################################################################
 28:
   reading:
   topics:
-    - Exam 2 Review
   materials:
 
-# 28:
-#   reading:
-#   topics:
-#     - '<b> No class: Prep for exam 2 </b>'
-#   materials:
+29:
+  reading:
+  topics:
+  materials:
 
+30:
+  reading:
+  topics:
+  materials:
+
+31:
+  reading:
+  topics:
+  materials:
 
 
 # ################################################################################

diff --git a/assets/files/quiz/quiz01.pdf b/assets/files/quiz/quiz01.pdf
diff --git a/assets/files/quiz/quiz01_solution.pdf b/assets/files/quiz/quiz01_solution.pdf