diff --git a/.gitignore b/.gitignore index 7c4d6a9..4817317 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ *.xlsx -2/out -2/log* -2/lab2 +**/out +**/log* +**/lab* diff --git a/1/exporter.py b/1/exporter.py index 18a3dd9..96fecc2 100644 --- a/1/exporter.py +++ b/1/exporter.py @@ -23,6 +23,8 @@ class Proc: @property def duration(self): + if self.start is None or self.end is None: + return 0 return self.end - self.start diff --git a/1/gantt.png b/1/gantt.png deleted file mode 100644 index c560325..0000000 Binary files a/1/gantt.png and /dev/null differ diff --git a/1/lab1 b/1/lab1 deleted file mode 100755 index 1698dd9..0000000 Binary files a/1/lab1 and /dev/null differ diff --git a/1/log.txt b/1/log.txt deleted file mode 100644 index ad8b617..0000000 --- a/1/log.txt +++ /dev/null @@ -1,30 +0,0 @@ -PROC_START pid=45686 ppid=45683 depth=0 l=0 r=19999 ts=1777075170.175506 -PROC_START pid=45687 ppid=45686 depth=1 l=0 r=9999 ts=1777075170.176607 -PROC_START pid=45688 ppid=45686 depth=1 l=10000 r=19999 ts=1777075170.176646 -PROC_START pid=45690 ppid=45688 depth=2 l=10000 r=14999 ts=1777075170.177346 -PROC_START pid=45689 ppid=45687 depth=2 l=0 r=4999 ts=1777075170.177348 -PROC_START pid=45691 ppid=45687 depth=2 l=5000 r=9999 ts=1777075170.177532 -PROC_START pid=45692 ppid=45688 depth=2 l=15000 r=19999 ts=1777075170.178014 -PROC_START pid=45693 ppid=45689 depth=3 l=0 r=2499 ts=1777075170.178106 -PROC_START pid=45695 ppid=45691 depth=3 l=5000 r=7499 ts=1777075170.178382 -PROC_START pid=45698 ppid=45691 depth=3 l=7500 r=9999 ts=1777075170.178693 -PROC_START pid=45696 ppid=45689 depth=3 l=2500 r=4999 ts=1777075170.178728 -PROC_START pid=45694 ppid=45690 depth=3 l=10000 r=12499 ts=1777075170.178801 -PROC_START pid=45699 ppid=45692 depth=3 l=15000 r=17499 ts=1777075170.178864 -PROC_END pid=45693 ppid=45689 depth=3 l=0 r=2499 ts=1777075170.180091 -PROC_START pid=45697 ppid=45690 depth=3 l=12500 r=14999 ts=1777075170.180099 -PROC_END pid=45696 ppid=45689 depth=3 l=2500 r=4999 ts=1777075170.180323 -PROC_END pid=45694 ppid=45690 depth=3 l=10000 r=12499 ts=1777075170.180342 -PROC_END pid=45699 ppid=45692 depth=3 l=15000 r=17499 ts=1777075170.180396 -PROC_END pid=45698 ppid=45691 depth=3 l=7500 r=9999 ts=1777075170.180896 -PROC_START pid=45700 ppid=45692 depth=3 l=17500 r=19999 ts=1777075170.181111 -PROC_END pid=45697 ppid=45690 depth=3 l=12500 r=14999 ts=1777075170.182005 -PROC_END pid=45689 ppid=45687 depth=2 l=0 r=4999 ts=1777075170.182180 -PROC_END pid=45700 ppid=45692 depth=3 l=17500 r=19999 ts=1777075170.182464 -PROC_END pid=45690 ppid=45688 depth=2 l=10000 r=14999 ts=1777075170.182832 -PROC_END pid=45695 ppid=45691 depth=3 l=5000 r=7499 ts=1777075170.182874 -PROC_END pid=45692 ppid=45688 depth=2 l=15000 r=19999 ts=1777075170.183226 -PROC_END pid=45691 ppid=45687 depth=2 l=5000 r=9999 ts=1777075170.183675 -PROC_END pid=45688 ppid=45686 depth=1 l=10000 r=19999 ts=1777075170.184045 -PROC_END pid=45687 ppid=45686 depth=1 l=0 r=9999 ts=1777075170.184457 -PROC_END pid=45686 ppid=45683 depth=0 l=0 r=19999 ts=1777075170.185554 diff --git a/1/main.cpp b/1/main.cpp index 15b7ba9..d66a55f 100644 --- a/1/main.cpp +++ b/1/main.cpp @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/1/processes.md b/1/processes.md deleted file mode 100644 index 0edc18c..0000000 --- a/1/processes.md +++ /dev/null @@ -1,17 +0,0 @@ -| PID | PPID | Start | End | Offset | Duration | -|---|---|---|---|---|---| -| 43025 | 43024 | 1777074933.591973 | 1777074933.597747 | 0.000000 | 0.005774 | -| 43026 | 43025 | 1777074933.592392 | 1777074933.595743 | 0.000419 | 0.003351 | -| 43028 | 43026 | 1777074933.592776 | 1777074933.594957 | 0.000803 | 0.002181 | -| 43032 | 43028 | 1777074933.593184 | 1777074933.594108 | 0.001211 | 0.000924 | -| 43035 | 43028 | 1777074933.593475 | 1777074933.594547 | 0.001502 | 0.001072 | -| 43030 | 43026 | 1777074933.592938 | 1777074933.595233 | 0.000965 | 0.002295 | -| 43034 | 43030 | 1777074933.593322 | 1777074933.594447 | 0.001349 | 0.001125 | -| 43037 | 43030 | 1777074933.593732 | 1777074933.594871 | 0.001759 | 0.001139 | -| 43027 | 43025 | 1777074933.592520 | 1777074933.597099 | 0.000547 | 0.004579 | -| 43029 | 43027 | 1777074933.592913 | 1777074933.595208 | 0.000940 | 0.002295 | -| 43033 | 43029 | 1777074933.593304 | 1777074933.594236 | 0.001331 | 0.000932 | -| 43036 | 43029 | 1777074933.593614 | 1777074933.594681 | 0.001641 | 0.001067 | -| 43031 | 43027 | 1777074933.593108 | 1777074933.596602 | 0.001135 | 0.003494 | -| 43038 | 43031 | 1777074933.593782 | 1777074933.594834 | 0.001809 | 0.001052 | -| 43039 | 43031 | 1777074933.595271 | 1777074933.596147 | 0.003298 | 0.000876 | diff --git a/2/Makefile b/2/Makefile index 6c24e11..3d325b3 100644 --- a/2/Makefile +++ b/2/Makefile @@ -5,6 +5,7 @@ TARGET = lab2 SRC = main.cpp PY = python3 +EXPORTER = exporter.py # ================= BUILD ================= all: $(TARGET) @@ -38,17 +39,17 @@ bench: batch_size batch_threads # ================= ANALYSIS ================= analyze_size: - $(PY) analyze_log.py log_size_5k.txt out/size/ - $(PY) analyze_log.py log_size_10k.txt out/size/ - $(PY) analyze_log.py log_size_20k.txt out/size/ - $(PY) analyze_log.py log_size_50k.txt out/size/ - $(PY) analyze_log.py log_size_100k.txt out/size/ + $(PY) $(EXPORTER) log_size_5k.txt out/size/ + $(PY) $(EXPORTER) log_size_10k.txt out/size/ + $(PY) $(EXPORTER) log_size_20k.txt out/size/ + $(PY) $(EXPORTER) log_size_50k.txt out/size/ + $(PY) $(EXPORTER) log_size_100k.txt out/size/ analyze_threads: - $(PY) analyze_log.py log_thr_0.txt out/threads/ - $(PY) analyze_log.py log_thr_2.txt out/threads/ - $(PY) analyze_log.py log_thr_4.txt out/threads/ - $(PY) analyze_log.py log_thr_8.txt out/threads/ + $(PY) $(EXPORTER) log_thr_0.txt out/threads/ + $(PY) $(EXPORTER) log_thr_2.txt out/threads/ + $(PY) $(EXPORTER) log_thr_4.txt out/threads/ + $(PY) $(EXPORTER) log_thr_8.txt out/threads/ # ================= CLEAN ================= clean: diff --git a/2/analyze_log.py b/2/exporter.py similarity index 100% rename from 2/analyze_log.py rename to 2/exporter.py