update

Signed-off-by: Satoru Takeuchi <[email protected]>
zulinx86 · Aug 14, 2022 · c1e740d · c1e740d
1 parent 42835ff
commit c1e740d
Show file tree

Hide file tree

Showing 48 changed files with 16 additions and 117 deletions.
diff --git a/01-operating-system-overview/hello b/01-operating-system-overview/hello
diff --git a/01-operating-system-overview/inf-loop → 01-operating-system-overview/inf-loop.py b/01-operating-system-overview/inf-loop → 01-operating-system-overview/inf-loop.py
diff --git a/01-operating-system-overview/pause b/01-operating-system-overview/pause
diff --git a/...perating-system-overview/syscall-inf-loop → ...ating-system-overview/syscall-inf-loop.py b/...perating-system-overview/syscall-inf-loop → ...ating-system-overview/syscall-inf-loop.py
diff --git a/02-process-management-1/fork-and-exec → 02-process-management-1/fork-and-exec.py b/02-process-management-1/fork-and-exec → 02-process-management-1/fork-and-exec.py
diff --git a/02-process-management-1/fork → 02-process-management-1/fork.py b/02-process-management-1/fork → 02-process-management-1/fork.py
diff --git a/02-process-management-1/intignore → 02-process-management-1/intignore.py b/02-process-management-1/intignore → 02-process-management-1/intignore.py
diff --git a/...ocess-management-1/spawn-by-fork-and-exec → ...ss-management-1/spawn-by-fork-and-exec.py b/...ocess-management-1/spawn-by-fork-and-exec → ...ss-management-1/spawn-by-fork-and-exec.py
diff --git a/02-process-management-1/spawn → 02-process-management-1/spawn.py b/02-process-management-1/spawn → 02-process-management-1/spawn.py
diff --git a/02-process-management-1/wait-ret → 02-process-management-1/wait-ret.sh b/02-process-management-1/wait-ret → 02-process-management-1/wait-ret.sh
diff --git a/03-process-scheduler/src/cpuperf → 03-process-scheduler/cpuperf.sh b/03-process-scheduler/src/cpuperf → 03-process-scheduler/cpuperf.sh
diff --git a/03-process-scheduler/src/inf-loop → 03-process-scheduler/inf-loop.py b/03-process-scheduler/src/inf-loop → 03-process-scheduler/inf-loop.py
diff --git a/03-process-scheduler/src/load → 03-process-scheduler/load.py b/03-process-scheduler/src/load → 03-process-scheduler/load.py
diff --git a/03-process-scheduler/src/multiload → 03-process-scheduler/multiload.py b/03-process-scheduler/src/multiload → 03-process-scheduler/multiload.py
@@ -41,7 +41,7 @@
 fi
 
 for ((i=0;i<CONCURRENCY;i++)) do
-    time "${SCRIPT_DIR}/load" &
+    time "${SCRIPT_DIR}/load.py" &
 done
 
 for ((i=0;i<CONCURRENCY;i++)) do

diff --git a/03-process-scheduler/src/plot-perf → 03-process-scheduler/plot-perf.py b/03-process-scheduler/src/plot-perf → 03-process-scheduler/plot-perf.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 import sys
-import plot
+import plot_sched
 
 def usage():
     print("""使い方: sched <最大プロセス数>
@@ -16,5 +16,5 @@ def usage():
     usage()
 
 max_nproc = int(sys.argv[1])
-plot.plot_avg_tat(max_nproc)
-plot.plot_throughput(max_nproc)
+plot_sched.plot_avg_tat(max_nproc)
+plot_sched.plot_throughput(max_nproc)
diff --git a/03-process-scheduler/src/plot.py → 03-process-scheduler/plot_sched.py b/03-process-scheduler/src/plot.py → 03-process-scheduler/plot_sched.py
diff --git a/03-process-scheduler/src/sched-nice → 03-process-scheduler/sched-nice.py b/03-process-scheduler/src/sched-nice → 03-process-scheduler/sched-nice.py
@@ -3,7 +3,7 @@
 import sys
 import time
 import os
-import plot
+import plot_sched
 
 def usage():
     print("""使い方: {} <nice値>
@@ -68,4 +68,4 @@ def child_fn(n):
 for i in range(concurrency):
     os.wait()
 
-plot.plot_sched(concurrency)
+plot_sched.plot_sched(concurrency)
diff --git a/03-process-scheduler/src/sched → 03-process-scheduler/sched.py b/03-process-scheduler/src/sched → 03-process-scheduler/sched.py
@@ -3,7 +3,7 @@
 import sys
 import time
 import os
-import plot
+import plot_sched
 
 def usage():
     print("""使い方: sched <プロセス数>
@@ -64,4 +64,4 @@ def child_fn(n):
 for i in range(concurrency):
     os.wait()
 
-plot.plot_sched(concurrency)
+plot_sched.plot_sched(concurrency)
diff --git a/03-process-scheduler/src/.gitignore b/03-process-scheduler/src/.gitignore
diff --git a/04-memory-management/buff-cache → 04-memory-management/buff-cache.sh b/04-memory-management/buff-cache → 04-memory-management/buff-cache.sh
diff --git a/04-memory-management/capture → 04-memory-management/capture.sh b/04-memory-management/capture → 04-memory-management/capture.sh
diff --git a/04-memory-management/demand-paging → 04-memory-management/demand-paging.py b/04-memory-management/demand-paging → 04-memory-management/demand-paging.py
diff --git a/04-memory-management/memuse → 04-memory-management/memuse.py b/04-memory-management/memuse → 04-memory-management/memuse.py
diff --git a/04-memory-management/mmap b/04-memory-management/mmap
diff --git a/04-memory-management/segv b/04-memory-management/segv
diff --git a/04-memory-management/segv-c b/04-memory-management/segv-c
diff --git a/05-process-management-2/cow → 05-process-management-2/cow.py b/05-process-management-2/cow → 05-process-management-2/cow.py
diff --git a/05-process-management-2/inc-lock b/05-process-management-2/inc-lock
diff --git a/05-process-management-2/inc-lock.sh b/05-process-management-2/inc-lock.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+flock lock ./inc.sh
diff --git a/05-process-management-2/inc-wrong-lock → 05-process-management-2/inc-wrong-lock.sh b/05-process-management-2/inc-wrong-lock → 05-process-management-2/inc-wrong-lock.sh
diff --git a/05-process-management-2/inc → 05-process-management-2/inc.sh b/05-process-management-2/inc → 05-process-management-2/inc.sh
diff --git a/05-process-management-2/non-shared-memory → 05-process-management-2/non-shared-memory.py b/05-process-management-2/non-shared-memory → 05-process-management-2/non-shared-memory.py
diff --git a/05-process-management-2/processes.c b/05-process-management-2/processes.c
diff --git a/05-process-management-2/shared-memory → 05-process-management-2/shared-memory.py b/05-process-management-2/shared-memory → 05-process-management-2/shared-memory.py
diff --git a/05-process-management-2/threads.c b/05-process-management-2/threads.c
diff --git a/07-filesystem/filemap b/07-filesystem/filemap
diff --git a/07-filesystem/testfile b/07-filesystem/testfile
diff --git a/08-storage-hierarchy/cache b/08-storage-hierarchy/cache
diff --git a/08-storage-hierarchy/cache.go b/08-storage-hierarchy/cache.go
@@ -56,7 +56,7 @@ func main() {
 		end := time.Since(start)
 		f.Write([]byte(fmt.Sprintf("%f\t%f\n", i, float64(NACCESS)/float64(end.Nanoseconds()))))
 	}
-	command := exec.Command("./plot")
+	command := exec.Command("./plot-cache.py")
 	out, err := command.Output()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "コマンド実行に失敗しました: %q: %q", err, string(out))

diff --git a/08-storage-hierarchy/cache.jpg b/08-storage-hierarchy/cache.jpg
diff --git a/08-storage-hierarchy/out.txt b/08-storage-hierarchy/out.txt
diff --git a/08-storage-hierarchy/plot → 08-storage-hierarchy/plot-cache.py b/08-storage-hierarchy/plot → 08-storage-hierarchy/plot-cache.py
diff --git a/09-block-layer/measure → 09-block-layer/measure.sh b/09-block-layer/measure → 09-block-layer/measure.sh
@@ -147,6 +147,6 @@ for SCHED in ${SCHEDULERS} ; do
     done
 done
 
-./plot
+./plot-block.py
 
 rm ${DATA_FILE}
diff --git a/09-block-layer/plot → 09-block-layer/plot-block.py b/09-block-layer/plot → 09-block-layer/plot-block.py
diff --git a/10-virtualization/inf-loop → 10-virtualization/inf-loop.py b/10-virtualization/inf-loop → 10-virtualization/inf-loop.py
diff --git a/10-virtualization/plot.py → 10-virtualization/plot_sched_virt.py b/10-virtualization/plot.py → 10-virtualization/plot_sched_virt.py
diff --git a/10-virtualization/sched2 → 10-virtualization/sched-virt.py b/10-virtualization/sched2 → 10-virtualization/sched-virt.py
@@ -3,12 +3,12 @@
 import sys
 import time
 import os
-import plot
+import plot_sched_virt
 
 def usage():
     print("""使い方: {} <並列度>
         * 論理CPU0上で<並列度>の数だけ同時に100ミリ秒程度CPUリソースを消費する負荷処理を起動した後に、すべてのプロセスの終了を待つ。
-        * "<処理の番号(0~(並列度-1)>.jpg"というファイルに実行結果を示したグラフを書き出す。
+        * "sched-<処理の番号(0~(並列度-1)>.jpg"というファイルに実行結果を示したグラフを書き出す。
         * グラフのx軸はプロセス開始からの経過時間[ミリ秒]、y軸は進捗[%]""".format(progname, file=sys.stderr))
     sys.exit(1)
 
@@ -66,4 +66,4 @@ def child_fn(n):
 for i in range(concurrency):
     os.wait()
 
-plot.plot_sched(concurrency)
+plot_sched_virt.plot_sched(concurrency)
diff --git a/12-cgroups/inf-loop → 12-cgroups/inf-loop.py b/12-cgroups/inf-loop → 12-cgroups/inf-loop.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,6 +147,6 @@ for SCHED in ${SCHEDULERS} ; do @@
         done
     done
-    ./plot
+    ./plot-block.py
     rm ${DATA_FILE}