diff --git a/Makefile b/Makefile index 5bec61f..f331964 100644 --- a/Makefile +++ b/Makefile @@ -8,3 +8,5 @@ upload: all rsync --chmod=Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r -avcL www/ deploy@lctp:/srv/http/lctp watch: cd bericht && make watch + +.PHONY: all diff --git a/bericht/Makefile b/bericht/Makefile index 6e3c22c..1a2afe1 100644 --- a/bericht/Makefile +++ b/bericht/Makefile @@ -4,13 +4,19 @@ ./check_cmds.sh .inotifywait inotifywait %.pdf: %.tex latexmk -pdf $< -bericht.pdf: $(wildcard abschnitte/*.tex) $(wildcard bilder/*) + all: .cmd_ok bericht.pdf -clean: - latexmk -CA + +iozone: + make -C benchmarks all + +bericht.pdf: $(wildcard abschnitte/*.tex) $(wildcard bilder/*) iozone + watch: .inotifywait echo "Abort with Ctrl+C" while (true); do\ inotifywait -e MOVE_SELF -e "modify" abschnitte/*.tex bilder/* bericht.tex;\ latexmk -pdf bericht.tex; \ done + +.PHONY: all benchmarks clean diff --git a/bericht/abschnitte/bench-imb.tex b/bericht/abschnitte/bench-imb.tex index 2407ee9..4cafbf0 100644 --- a/bericht/abschnitte/bench-imb.tex +++ b/bericht/abschnitte/bench-imb.tex @@ -41,32 +41,35 @@ fs t s \begin{tikzpicture} \begin{axis}[ - xmin=1, - xmax=536870912, - xmode=log, - ymode=log, - ytick pos=left, - log basis x=2, - xlabel={Dateigröße in KiB}, - ylabel={Zugriffszeit in $\mu$s}, - y axis line style=blue, - width=15cm, height=10cm + xmin=1, + xmax=536870912, + xmode=log, + ymode=log, + ytick pos=left, + log basis x=2, + xlabel={Dateigröße in KiB}, + ylabel={Zugriffszeit in $\mu$s}, + y axis line style=blue, + x axis line style=black, + width=15cm, height=10cm ] - \addplot[smooth,blue] table[x={fs}, y={t}] {\imbpingpong}; + \addplot[smooth,blue] table[x={fs}, y={t}] {\imbpingpong}; \end{axis} \begin{axis}[ - xmin=1, - xmax=536870912, - xmode=log, - ytick pos=right, - axis y line* = right, - hide x axis, - ylabel={Übertragungsgeschwindigkeit in MiB/s}, - ylabel near ticks, - y axis line style=red, - width=15cm, height=10cm - ] - \addplot[smooth,red] table[x={fs}, y={s}] {\imbpingpong}; + xmin=1, + xmax=536870912, + xmode=log, + ytick pos=right, + axis y line* = right, + hide x axis, + ylabel={Übertragungsgeschwindigkeit in MiB/s}, + ylabel={{\"U}bertragungsgeschwindigkeit in MiB/s}, + ylabel near ticks, + y axis line style=red, + x axis line style=black, + width=15cm, height=10cm + ] + \addplot[smooth,red] table[x={fs}, y={s}] {\imbpingpong}; \end{axis} \end{tikzpicture} @@ -85,223 +88,48 @@ Verzögerungszeiten: (jeweils Mittelwert aus 1000 Messläufen) \paragraph{2 Prozesse} \mbox{}\\ -\pgfplotstableread{ -0 0.15 -1 143.44 -2 143.50 -4 143.05 -8 144.55 -16 143.11 -32 145.24 -64 255.02 -128 273.25 -256 282.80 -512 286.73 -1024 287.12 -2048 245.55 -4096 335.79 -8192 371.86 -16384 456.60 -32768 669.11 -65536 2821.84 -}\imballtoall - -\begin{tikzpicture} - \begin{axis}[ - xmin=1, - xmax=65536, - xmode=log, - log basis x=2, - xlabel={Dateigröße in MiB}, - ylabel={Zugriffszeit in $\mu$s}, - width=15cm, height=10cm - ] - \addplot[smooth,blue] table {\imballtoall}; - \end{axis} -\end{tikzpicture} +\begin{figure}[h!] + \centering + \includegraphics{benchmarks/all-to-all-2.pdf} +\end{figure} \paragraph{4 Prozesse} \mbox{}\\ -\pgfplotstableread{ -0 0.16 -1 286.87 -2 977.17 -4 286.50 -8 1233.80 -16 294.61 -32 1661.17 -64 5119.18 -128 341.65 -256 807.20 -512 359.30 -1024 4582.34 -2048 425.47 -4096 805.06 -8192 1238.56 -16384 1859.28 -32768 2307.79 -65536 7490.86 -}\imballtoall - -\begin{tikzpicture} - \begin{axis}[ - xmin=1, - xmax=65536, - xmode=log, - log basis x=2, - xlabel={Dateigröße in MiB}, - ylabel={Zugriffszeit in $\mu$s}, - width=15cm, height=10cm - ] - \addplot[smooth,blue] table {\imballtoall}; - \end{axis} -\end{tikzpicture} +\begin{figure}[h!] + \centering + \includegraphics{benchmarks/all-to-all-4.pdf} +\end{figure} \pagebreak \paragraph{8 Prozesse} \mbox{}\\ -\pgfplotstableread{ -0 0.17 -1 29772.58 -2 30518.69 -4 31073.18 -8 23189.25 -16 9623.66 -32 37315.96 -64 19665.14 -128 37998.11 -256 54676.67 -512 68468.67 -1024 143223.38 -2048 9301.88 -4096 170422.20 -8192 7619.07 -16384 27772.60 -32768 276603.04 -65536 351964.27 -}\imballtoall - -\begin{tikzpicture} - \begin{axis}[ - xmin=1, - xmax=65536, - xmode=log, - log basis x=2, - xlabel={Dateigröße in MiB}, - ylabel={Zugriffszeit in $\mu$s}, - width=15cm, height=10cm - ] - \addplot[smooth,blue] table {\imballtoall}; - \end{axis} -\end{tikzpicture} - +\begin{figure}[h!] + \centering + \includegraphics{benchmarks/all-to-all-8.pdf} +\end{figure} \subsubsection{All-Reduce} \paragraph{2 Prozesse} \mbox{}\\ -\pgfplotstableread{ -0 0.15 -4 144.45 -8 143.73 -16 144.26 -32 148.73 -64 256.37 -128 282.03 -256 253.17 -512 269.54 -1024 286.83 -2048 184.63 -4096 324.95 -8192 377.51 -16384 717.09 -32768 866.90 -65536 1293.20 -}\imballtoall - -\begin{tikzpicture} - \begin{axis}[ - xmin=1, - xmax=65536, - xmode=log, - log basis x=2, - xlabel={Dateigröße in MiB}, - ylabel={Zugriffszeit in $\mu$s}, - width=15cm, height=10cm - ] - \addplot[smooth,blue] table {\imballtoall}; - \end{axis} -\end{tikzpicture} +\begin{figure}[h!] + \centering + \includegraphics{benchmarks/all-reduce-2.pdf} +\end{figure} \pagebreak \paragraph{4 Prozesse} \mbox{}\\ -\pgfplotstableread{ -0 0.16 -4 269.55 -8 222.32 -16 271.71 -32 222.10 -64 289.93 -128 291.06 -256 289.65 -512 293.38 -1024 349.66 -2048 321.04 -4096 488.41 -8192 587.40 -16384 2010.40 -32768 2396.95 -65536 3498.13 -}\imballtoall - -\begin{tikzpicture} - \begin{axis}[ - xmin=1, - xmax=65536, - xmode=log, - log basis x=2, - xlabel={Dateigröße in MiB}, - ylabel={Zugriffszeit in $\mu$s}, - width=15cm, height=10cm - ] - \addplot[smooth,blue] table {\imballtoall}; - \end{axis} -\end{tikzpicture} +\begin{figure}[h!] + \centering + \includegraphics{benchmarks/all-reduce-4.pdf} +\end{figure} \paragraph{8 Prozesse} \mbox{}\\ -\pgfplotstableread{ -0 0.16 -4 7048.69 -8 8410.30 -16 7831.95 -32 8408.59 -64 6417.31 -128 11163.88 -256 18099.17 -512 27901.94 -1024 29209.31 -2048 2598.34 -4096 2781.34 -8192 2232.44 -16384 4275.79 -32768 5040.09 -65536 7782.45 -}\imballtoall - -\begin{tikzpicture} - \begin{axis}[ - xmin=1, - xmax=65536, - xmode=log, - log basis x=2, - xlabel={Dateigröße in MiB}, - ylabel={Zugriffszeit in $\mu$s}, - width=15cm, height=10cm - ] - \addplot[smooth,blue] table {\imballtoall}; - \end{axis} -\end{tikzpicture} \ No newline at end of file +\begin{figure}[h!] + \centering + \includegraphics{benchmarks/all-reduce-8.pdf} +\end{figure} diff --git a/bericht/abschnitte/bench-iozone.tex b/bericht/abschnitte/bench-iozone.tex index 5ece4fd..46d3cfb 100644 --- a/bericht/abschnitte/bench-iozone.tex +++ b/bericht/abschnitte/bench-iozone.tex @@ -8,31 +8,11 @@ Testaufruf: \shellcmd{./iozone -azcR -I -U /mnt/data -f /mnt/data/testfile -b excel-nfs.xls}\\ -\begin{tikzpicture} - \begin{axis}[ - title=Lesen, - width=15cm, height=10cm, - xlabel={Dateigröße [KiB]}, - xmode=log, log basis x=2, - ylabel={Record-Größe [KiB]}, - ymode=log, log basis y=2 - ] - \addplot3 [patch, patch table={iozone-nfs-read.out}] table {iozone-nfs-read}; - \end{axis} -\end{tikzpicture} - -\begin{tikzpicture} - \begin{axis}[ - title=Schreiben, - width=15cm, height=10cm, - xlabel={Dateigröße [KiB]}, - xmode=log, log basis x=2, - ylabel={Record-Größe [KiB]}, - ymode=log, log basis y=2 - ] - \addplot3 [patch, patch table={iozone-nfs-write.out}] table {iozone-nfs-write}; - \end{axis} -\end{tikzpicture} +\begin{figure}[h!] + \centering + \includegraphics{benchmarks/iozone-nfs-read-tmpl.pdf} + \includegraphics{benchmarks/iozone-nfs-write-tmpl.pdf} +\end{figure} \subsubsection{FastFS} @@ -40,28 +20,9 @@ Testaufruf: \shellcmd{./iozone -azcR -+q 1 -U /fastfs -f /fastfs/testfile -b excel-fastfs.xls}\\ -\begin{tikzpicture} - \begin{axis}[ - title=Lesen, - width=15cm, height=10cm, - xlabel={Dateigröße [KiB]}, - xmode=log, log basis x=2, - ylabel={Record-Größe [KiB]}, - ymode=log, log basis y=2 - ] - \addplot3 [patch, patch table={iozone-fastfs-read.out}] table {iozone-fastfs-read}; - \end{axis} -\end{tikzpicture} +\begin{figure}[h!] + \centering + \includegraphics{benchmarks/iozone-fastfs-read-tmpl.pdf} + \includegraphics{benchmarks/iozone-fastfs-write-tmpl.pdf} +\end{figure} -\begin{tikzpicture} - \begin{axis}[ - title=Schreiben, - width=15cm, height=10cm, - xlabel={Dateigröße [KiB]}, - xmode=log, log basis x=2, - ylabel={Record-Größe [KiB]}, - ymode=log, log basis y=2 - ] - \addplot3 [patch, patch table={iozone-fastfs-write.out}] table {iozone-fastfs-write}; - \end{axis} -\end{tikzpicture} \ No newline at end of file diff --git a/bericht/benchmarks/Makefile b/bericht/benchmarks/Makefile new file mode 100644 index 0000000..5d6e83c --- /dev/null +++ b/bericht/benchmarks/Makefile @@ -0,0 +1,10 @@ +IOZONE_GRAPH_TEX=$(wildcard *.tex) +IOZONE_GRAPH_PDF=$(IOZONE_GRAPH_TEX:.tex=.pdf) + +%.pdf: %.tex + latexmk -pdf $< + +all: $(IOZONE_GRAPH_PDF) + +clean: + latexm -CA diff --git a/bericht/benchmarks/all-reduce-2.tex b/bericht/benchmarks/all-reduce-2.tex new file mode 100644 index 0000000..a848ac0 --- /dev/null +++ b/bericht/benchmarks/all-reduce-2.tex @@ -0,0 +1,40 @@ +\documentclass{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\pgfplotstableread{ +0 0.15 +4 144.45 +8 143.73 +16 144.26 +32 148.73 +64 256.37 +128 282.03 +256 253.17 +512 269.54 +1024 286.83 +2048 184.63 +4096 324.95 +8192 377.51 +16384 717.09 +32768 866.90 +65536 1293.20 +}\imballtoall + +\begin{tikzpicture} + \begin{axis}[ + xmin=1, + xmax=65536, + xmode=log, + log basis x=2, + xlabel={Dateigröße in MiB}, + ylabel={Zugriffszeit in $\mu$s}, + width=15cm, height=10cm + ] + \addplot[smooth,blue] table {\imballtoall}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/benchmarks/all-reduce-4.tex b/bericht/benchmarks/all-reduce-4.tex new file mode 100644 index 0000000..7ccffcb --- /dev/null +++ b/bericht/benchmarks/all-reduce-4.tex @@ -0,0 +1,40 @@ +\documentclass{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\pgfplotstableread{ +0 0.16 +4 269.55 +8 222.32 +16 271.71 +32 222.10 +64 289.93 +128 291.06 +256 289.65 +512 293.38 +1024 349.66 +2048 321.04 +4096 488.41 +8192 587.40 +16384 2010.40 +32768 2396.95 +65536 3498.13 +}\imballtoall + +\begin{tikzpicture} + \begin{axis}[ + xmin=1, + xmax=65536, + xmode=log, + log basis x=2, + xlabel={Dateigröße in MiB}, + ylabel={Zugriffszeit in $\mu$s}, + width=15cm, height=10cm + ] + \addplot[smooth,blue] table {\imballtoall}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/benchmarks/all-reduce-8.tex b/bericht/benchmarks/all-reduce-8.tex new file mode 100644 index 0000000..2d8bfa8 --- /dev/null +++ b/bericht/benchmarks/all-reduce-8.tex @@ -0,0 +1,40 @@ +\documentclass{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\pgfplotstableread{ +0 0.16 +4 7048.69 +8 8410.30 +16 7831.95 +32 8408.59 +64 6417.31 +128 11163.88 +256 18099.17 +512 27901.94 +1024 29209.31 +2048 2598.34 +4096 2781.34 +8192 2232.44 +16384 4275.79 +32768 5040.09 +65536 7782.45 +}\imballtoall + +\begin{tikzpicture} + \begin{axis}[ + xmin=1, + xmax=65536, + xmode=log, + log basis x=2, + xlabel={Dateigröße in MiB}, + ylabel={Zugriffszeit in $\mu$s}, + width=15cm, height=10cm + ] + \addplot[smooth,blue] table {\imballtoall}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/benchmarks/all-to-all-2.tex b/bericht/benchmarks/all-to-all-2.tex new file mode 100644 index 0000000..6180ac0 --- /dev/null +++ b/bericht/benchmarks/all-to-all-2.tex @@ -0,0 +1,42 @@ +\documentclass{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\pgfplotstableread{ +0 0.15 +1 143.44 +2 143.50 +4 143.05 +8 144.55 +16 143.11 +32 145.24 +64 255.02 +128 273.25 +256 282.80 +512 286.73 +1024 287.12 +2048 245.55 +4096 335.79 +8192 371.86 +16384 456.60 +32768 669.11 +65536 2821.84 +}\imballtoall + +\begin{tikzpicture} + \begin{axis}[ + xmin=1, + xmax=65536, + xmode=log, + log basis x=2, + xlabel={Dateigröße in MiB}, + ylabel={Zugriffszeit in $\mu$s}, + width=15cm, height=10cm + ] + \addplot[smooth,blue] table {\imballtoall}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/benchmarks/all-to-all-4.tex b/bericht/benchmarks/all-to-all-4.tex new file mode 100644 index 0000000..35e589b --- /dev/null +++ b/bericht/benchmarks/all-to-all-4.tex @@ -0,0 +1,42 @@ +\documentclass{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\pgfplotstableread{ +0 0.16 +1 286.87 +2 977.17 +4 286.50 +8 1233.80 +16 294.61 +32 1661.17 +64 5119.18 +128 341.65 +256 807.20 +512 359.30 +1024 4582.34 +2048 425.47 +4096 805.06 +8192 1238.56 +16384 1859.28 +32768 2307.79 +65536 7490.86 +}\imballtoall + +\begin{tikzpicture} + \begin{axis}[ + xmin=1, + xmax=65536, + xmode=log, + log basis x=2, + xlabel={Dateigröße in MiB}, + ylabel={Zugriffszeit in $\mu$s}, + width=15cm, height=10cm + ] + \addplot[smooth,blue] table {\imballtoall}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/benchmarks/all-to-all-8.tex b/bericht/benchmarks/all-to-all-8.tex new file mode 100644 index 0000000..7a98679 --- /dev/null +++ b/bericht/benchmarks/all-to-all-8.tex @@ -0,0 +1,42 @@ +\documentclass{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\pgfplotstableread{ +0 0.17 +1 29772.58 +2 30518.69 +4 31073.18 +8 23189.25 +16 9623.66 +32 37315.96 +64 19665.14 +128 37998.11 +256 54676.67 +512 68468.67 +1024 143223.38 +2048 9301.88 +4096 170422.20 +8192 7619.07 +16384 27772.60 +32768 276603.04 +65536 351964.27 +}\imballtoall + +\begin{tikzpicture} + \begin{axis}[ + xmin=1, + xmax=65536, + xmode=log, + log basis x=2, + xlabel={Dateigröße in MiB}, + ylabel={Zugriffszeit in $\mu$s}, + width=15cm, height=10cm + ] + \addplot[smooth,blue] table {\imballtoall}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/iozone-fastfs-read b/bericht/benchmarks/iozone-fastfs-read similarity index 100% rename from bericht/iozone-fastfs-read rename to bericht/benchmarks/iozone-fastfs-read diff --git a/bericht/benchmarks/iozone-fastfs-read-tmpl.tex b/bericht/benchmarks/iozone-fastfs-read-tmpl.tex new file mode 100644 index 0000000..acb15a1 --- /dev/null +++ b/bericht/benchmarks/iozone-fastfs-read-tmpl.tex @@ -0,0 +1,20 @@ +\documentclass[german,plainarticle,utf8]{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\begin{tikzpicture} + \begin{axis}[ + title=Lesen, + width=15cm, height=10cm, + xlabel={Dateigr\"{o}{\ss}e [KiB]}, + xmode=log, log basis x=2, + ylabel={Record-Gr\"{o}{\ss}e [KiB]}, + ymode=log, log basis y=2 + ] + \addplot3 [patch, patch table={iozone-fastfs-read.out}] table {iozone-fastfs-read}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/iozone-fastfs-read.octave b/bericht/benchmarks/iozone-fastfs-read.octave similarity index 100% rename from bericht/iozone-fastfs-read.octave rename to bericht/benchmarks/iozone-fastfs-read.octave diff --git a/bericht/iozone-fastfs-write b/bericht/benchmarks/iozone-fastfs-write similarity index 100% rename from bericht/iozone-fastfs-write rename to bericht/benchmarks/iozone-fastfs-write diff --git a/bericht/benchmarks/iozone-fastfs-write-tmpl.tex b/bericht/benchmarks/iozone-fastfs-write-tmpl.tex new file mode 100644 index 0000000..42e23e1 --- /dev/null +++ b/bericht/benchmarks/iozone-fastfs-write-tmpl.tex @@ -0,0 +1,20 @@ +\documentclass[german,plainarticle,utf8]{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\begin{tikzpicture} + \begin{axis}[ + title=Schreiben, + width=15cm, height=10cm, + xlabel={Dateigr\"{o}{\ss}e [KiB]}, + xmode=log, log basis x=2, + ylabel={Record-Gr\"{o}{\ss}e [KiB]}, + ymode=log, log basis y=2 + ] + \addplot3 [patch, patch table={iozone-fastfs-write.out}] table {iozone-fastfs-write}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/iozone-fastfs-write.octave b/bericht/benchmarks/iozone-fastfs-write.octave similarity index 100% rename from bericht/iozone-fastfs-write.octave rename to bericht/benchmarks/iozone-fastfs-write.octave diff --git a/bericht/iozone-nfs-read b/bericht/benchmarks/iozone-nfs-read similarity index 100% rename from bericht/iozone-nfs-read rename to bericht/benchmarks/iozone-nfs-read diff --git a/bericht/benchmarks/iozone-nfs-read-tmpl.tex b/bericht/benchmarks/iozone-nfs-read-tmpl.tex new file mode 100644 index 0000000..673759f --- /dev/null +++ b/bericht/benchmarks/iozone-nfs-read-tmpl.tex @@ -0,0 +1,21 @@ +\documentclass[german,plainarticle,utf8]{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\begin{tikzpicture} + \begin{axis}[ + title=Lesen, + width=15cm, height=10cm, + xlabel={Dateigr\"{o}{\ss}e [KiB]}, + xmode=log, log basis x=2, + ylabel={Record-Gr\"{o}{\ss}e [KiB]}, + ymode=log, log basis y=2 + ] + \addplot3 [patch, patch table={iozone-nfs-read.out}] table {iozone-nfs-read}; + \end{axis} +\end{tikzpicture} +\end{document} + diff --git a/bericht/iozone-nfs-read.octave b/bericht/benchmarks/iozone-nfs-read.octave similarity index 100% rename from bericht/iozone-nfs-read.octave rename to bericht/benchmarks/iozone-nfs-read.octave diff --git a/bericht/iozone-nfs-write b/bericht/benchmarks/iozone-nfs-write similarity index 100% rename from bericht/iozone-nfs-write rename to bericht/benchmarks/iozone-nfs-write diff --git a/bericht/benchmarks/iozone-nfs-write-tmpl.tex b/bericht/benchmarks/iozone-nfs-write-tmpl.tex new file mode 100644 index 0000000..5a6b8f7 --- /dev/null +++ b/bericht/benchmarks/iozone-nfs-write-tmpl.tex @@ -0,0 +1,20 @@ +\documentclass[german,plainarticle,utf8]{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} +\begin{tikzpicture} + \begin{axis}[ + title=Schreiben, + width=15cm, height=10cm, + xlabel={Dateigr\"{o}{\ss}e [KiB]}, + xmode=log, log basis x=2, + ylabel={Record-Gr\"{o}{\ss}e [KiB]}, + ymode=log, log basis y=2 + ] + \addplot3 [patch, patch table={iozone-nfs-write.out}] table {iozone-nfs-write}; + \end{axis} +\end{tikzpicture} +\end{document} diff --git a/bericht/iozone-nfs-write.octave b/bericht/benchmarks/iozone-nfs-write.octave similarity index 100% rename from bericht/iozone-nfs-write.octave rename to bericht/benchmarks/iozone-nfs-write.octave diff --git a/bericht/benchmarks/ping-pong.tex b/bericht/benchmarks/ping-pong.tex new file mode 100644 index 0000000..c6dd21e --- /dev/null +++ b/bericht/benchmarks/ping-pong.tex @@ -0,0 +1,146 @@ +\documentclass{standalone} +\usepackage{pgfplots} +\usepgfplotslibrary{dateplot} +\usepackage{tikz} +\usepackage{pgfplotstable} + +\begin{document} + +\begin{tikzpicture} +\pgfplotstableread{ +fs t s +0 88.99 0.00 +1 109.42 0.01 +2 109.43 0.02 +4 109.62 0.03 +8 109.83 0.07 +16 109.87 0.14 +32 110.12 0.28 +64 143.19 0.43 +128 149.24 0.82 +256 150.41 1.62 +512 155.65 3.14 +1024 160.39 6.09 +2048 164.54 11.87 +4096 217.32 17.97 +8192 308.20 25.35 +16384 434.78 35.94 +32768 573.14 54.52 +65536 1742.36 35.87 +131072 1800.80 69.41 +262144 3070.65 81.42 +524288 5457.60 91.62 +1048576 10350.31 96.62 +2097152 20150.02 99.26 +4194304 38953.70 102.69 +8388608 77368.40 103.40 +16777216 154088.97 103.84 +33554432 319229.01 100.24 +67108864 634328.48 100.89 +134217728 1262632.97 101.38 +268435456 2514089.47 101.83 +536870912 5052755.00 101.33 +}\imbpingpong + +\begin{tikzpicture} + \begin{axis}[ + xmin=1, + xmax=536870912, + xmode=log, + ymode=log, + ytick pos=left, + log basis x=2, + xlabel={Dateigröße in KiB}, + ylabel={Zugriffszeit in $\mu$s}, + y axis line style=blue, + x axis line style=black, + width=15cm, height=10cm + ] + \addplot[smooth,blue] table[x={fs}, y={t}] {\imbpingpong}; + \end{axis} + \begin{axis}[ + xmin=1, + xmax=536870912, + xmode=log, + ytick pos=right, + axis y line* = right, + hide x axis, + ylabel={Übertragungsgeschwindigkeit in MiB/s}, + ylabel={{\"U}bertragungsgeschwindigkeit in MiB/s}, + ylabel near ticks, + y axis line style=red, + x axis line style=black, + width=15cm, height=10cm + ] + \addplot[smooth,red] table[x={fs}, y={s}] {\imbpingpong}; + \end{axis} +\end{tikzpicture} +\pgfplotstableread{ +fs t s +0 88.99 0.00 +1 109.42 0.01 +2 109.43 0.02 +4 109.62 0.03 +8 109.83 0.07 +16 109.87 0.14 +32 110.12 0.28 +64 143.19 0.43 +128 149.24 0.82 +256 150.41 1.62 +512 155.65 3.14 +1024 160.39 6.09 +2048 164.54 11.87 +4096 217.32 17.97 +8192 308.20 25.35 +16384 434.78 35.94 +32768 573.14 54.52 +65536 1742.36 35.87 +131072 1800.80 69.41 +262144 3070.65 81.42 +524288 5457.60 91.62 +1048576 10350.31 96.62 +2097152 20150.02 99.26 +4194304 38953.70 102.69 +8388608 77368.40 103.40 +16777216 154088.97 103.84 +33554432 319229.01 100.24 +67108864 634328.48 100.89 +134217728 1262632.97 101.38 +268435456 2514089.47 101.83 +536870912 5052755.00 101.33 +}\imbpingpong + +\begin{tikzpicture} + \begin{axis}[ + xmin=1, + xmax=536870912, + xmode=log, + ymode=log, + ytick pos=left, + log basis x=2, + xlabel={Dateigr{\"o}{\ss}e in KiB}, + ylabel={Zugriffszeit in $\mu$s}, + y axis line style=blue, + x axis line style=black, + width=15cm, height=10cm + ] + \addplot[smooth,blue] table[x={fs}, y={t}] {\imbpingpong}; + \end{axis} + \begin{axis}[ + xmin=1, + xmax=536870912, + xmode=log, + ytick pos=right, + axis y line* = right, + hide x axis, + ylabel={{\"U}bertragungsgeschwindigkeit in MiB/s}, + ylabel near ticks, + y axis line style=red, + x axis line style=black, + width=15cm, height=10cm + ] + \addplot[smooth,red] table[x={fs}, y={s}] {\imbpingpong}; + \end{axis} +\end{tikzpicture} +\end{tikzpicture} +\end{document} diff --git a/bericht/bericht.tex b/bericht/bericht.tex index 826ad72..0c6c449 100644 --- a/bericht/bericht.tex +++ b/bericht/bericht.tex @@ -32,7 +32,6 @@ citecolor=black } - \author{Patrick Schöps, Jörg Thalheim, Alfred Krohmer} \title{LCTP – Praktikum Wintersemester 2013 / 2014} diff --git a/bericht/iozone-fastfs-read.out b/bericht/iozone-fastfs-read.out deleted file mode 100644 index 0c3c5c4..0000000 --- a/bericht/iozone-fastfs-read.out +++ /dev/null @@ -1,214 +0,0 @@ -85 74 86 -98 86 111 -98 110 111 -84 85 74 -64 45 86 -64 74 86 -54 64 45 -63 54 64 -35 27 45 -26 19 27 -18 19 12 -44 35 45 -44 54 45 -43 44 35 -6 10 11 -6 11 12 -6 5 2 -6 2 12 -123 124 111 -123 110 111 -98 85 97 -98 85 86 -98 109 97 -98 109 110 -122 123 110 -122 109 110 -96 109 97 -96 108 109 -96 85 97 -96 84 85 -121 122 109 -121 108 109 -83 84 74 -83 73 74 -120 121 108 -120 107 108 -63 73 74 -63 64 74 -95 96 84 -95 83 84 -95 96 108 -95 107 108 -82 83 73 -82 72 73 -119 120 107 -119 106 107 -62 63 73 -62 72 73 -94 95 107 -94 106 107 -94 95 83 -94 82 83 -81 82 72 -81 71 72 -118 119 106 -118 105 106 -61 62 72 -61 71 72 -80 81 71 -80 70 71 -93 94 82 -93 81 82 -93 94 106 -93 105 106 -117 118 105 -117 104 105 -53 62 63 -53 63 54 -53 61 62 -53 61 52 -79 80 70 -79 69 70 -92 80 81 -92 93 81 -92 93 105 -92 104 105 -116 117 104 -116 103 104 -18 25 26 -18 26 19 -78 79 69 -78 68 69 -91 79 80 -91 92 80 -91 92 104 -91 103 104 -115 116 103 -115 102 103 -41 51 52 -41 42 52 -34 41 42 -34 41 33 -34 26 27 -34 35 27 -34 25 26 -34 33 25 -43 34 42 -43 34 35 -43 53 52 -43 42 52 -43 53 54 -43 44 54 -60 61 52 -60 51 52 -60 50 59 -60 50 51 -60 61 71 -60 70 71 -60 69 70 -60 59 69 -77 78 68 -77 67 68 -90 78 79 -90 91 79 -90 91 103 -90 102 103 -114 115 102 -114 101 102 -4 3 0 -4 1 0 -17 18 12 -17 11 12 -76 65 75 -76 66 65 -76 77 67 -76 66 67 -89 77 78 -89 90 78 -89 90 102 -89 101 102 -113 99 112 -113 100 99 -113 114 101 -113 100 101 -5 4 1 -5 1 2 -40 41 33 -40 32 33 -40 31 32 -40 31 39 -40 41 51 -40 50 51 -40 49 50 -40 39 49 -24 33 25 -24 32 33 -24 31 23 -24 31 32 -24 18 25 -24 17 18 -16 24 23 -16 24 17 -58 50 59 -58 49 50 -58 68 69 -58 59 69 -58 67 68 -58 57 67 -56 55 65 -56 66 65 -56 66 67 -56 57 67 -88 87 75 -88 76 75 -88 76 77 -88 89 77 -88 87 99 -88 100 99 -88 89 101 -88 100 101 -10 17 11 -10 16 17 -48 39 49 -48 38 39 -48 58 49 -48 58 57 -15 16 23 -15 22 23 -29 28 36 -29 37 36 -47 46 55 -47 56 55 -47 56 57 -47 48 57 -47 36 46 -47 37 36 -47 48 38 -47 37 38 -8 3 7 -8 4 3 -21 20 28 -21 29 28 -30 31 23 -30 22 23 -30 21 29 -30 21 22 -30 31 39 -30 38 39 -30 29 37 -30 37 38 -9 10 16 -9 15 16 -9 6 5 -9 6 10 -9 5 4 -9 8 4 -14 13 20 -14 21 20 -14 15 22 -14 21 22 -14 7 13 -14 8 7 -14 9 15 -14 9 8 diff --git a/bericht/iozone-fastfs-write.out b/bericht/iozone-fastfs-write.out deleted file mode 100644 index 1c12d5f..0000000 --- a/bericht/iozone-fastfs-write.out +++ /dev/null @@ -1,248 +0,0 @@ -79 67 80 -24 17 25 -55 66 67 -16 10 17 -44 55 54 -34 33 25 -34 44 43 -9 10 4 -131 144 145 -131 132 145 -130 143 144 -130 131 144 -118 131 132 -118 119 132 -118 130 131 -118 130 117 -129 142 143 -129 130 143 -129 130 117 -129 116 117 -104 116 117 -104 103 116 -102 103 116 -102 115 116 -128 141 142 -128 129 142 -128 129 116 -128 115 116 -105 106 119 -105 118 119 -105 118 117 -105 104 117 -105 93 106 -105 93 92 -91 105 104 -91 105 92 -101 102 115 -101 114 115 -127 140 141 -127 128 141 -127 128 115 -127 114 115 -79 66 67 -79 66 78 -79 93 80 -79 93 92 -79 91 92 -79 91 78 -100 101 114 -100 113 114 -90 104 103 -90 91 104 -90 102 103 -90 89 102 -90 91 78 -90 77 78 -90 76 77 -90 76 89 -88 100 101 -88 100 87 -88 101 102 -88 89 102 -126 139 140 -126 127 140 -126 127 114 -126 113 114 -75 76 89 -75 88 89 -99 100 87 -99 86 87 -99 100 113 -99 112 113 -125 138 139 -125 126 139 -125 126 113 -125 112 113 -32 24 25 -32 33 25 -74 88 87 -74 75 88 -16 24 23 -16 24 17 -31 32 24 -31 24 23 -65 55 54 -65 55 66 -65 66 78 -65 77 78 -65 76 77 -65 64 76 -73 86 87 -73 74 87 -122 135 136 -122 123 136 -124 125 112 -124 111 112 -124 110 111 -124 110 123 -124 137 138 -124 125 138 -124 136 137 -124 123 136 -98 99 112 -98 111 112 -98 110 97 -98 110 111 -98 99 86 -98 85 86 -98 84 85 -98 97 84 -6 1 0 -6 5 0 -63 75 76 -63 64 76 -53 65 54 -53 65 64 -53 63 64 -53 63 52 -53 44 54 -53 44 43 -42 53 52 -42 53 43 -34 42 43 -34 42 33 -72 73 86 -72 85 86 -121 120 133 -121 134 133 -121 134 135 -121 122 135 -109 122 123 -109 110 123 -7 1 2 -7 6 1 -22 31 23 -22 30 31 -22 16 23 -22 16 15 -62 74 75 -62 63 75 -62 63 52 -62 51 52 -41 32 33 -41 42 33 -41 42 52 -41 51 52 -71 84 85 -71 72 85 -108 107 120 -108 121 120 -108 121 122 -108 109 122 -96 110 97 -96 109 110 -96 97 84 -96 83 84 -8 2 3 -8 7 2 -61 73 74 -61 62 74 -61 62 51 -61 50 51 -40 31 32 -40 41 32 -40 41 51 -40 50 51 -70 71 84 -70 83 84 -95 94 107 -95 108 107 -95 108 109 -95 96 109 -95 81 94 -95 82 81 -95 96 83 -95 82 83 -9 3 4 -9 8 3 -9 16 15 -9 16 10 -9 14 15 -9 14 8 -21 22 15 -21 14 15 -21 22 30 -21 29 30 -13 8 7 -13 14 8 -60 72 73 -60 61 73 -60 61 50 -60 49 50 -39 30 31 -39 40 31 -39 40 50 -39 49 50 -69 68 81 -69 82 81 -69 70 83 -69 82 83 -20 21 29 -20 28 29 -20 21 14 -20 13 14 -12 6 5 -12 11 5 -12 7 6 -12 13 7 -19 11 18 -19 12 11 -19 20 13 -19 12 13 -19 18 26 -19 27 26 -19 20 28 -19 27 28 -59 60 49 -59 48 49 -59 71 72 -59 60 72 -59 70 71 -59 58 70 -38 39 49 -38 48 49 -38 29 30 -38 39 30 -38 28 29 -38 37 28 -57 45 56 -57 46 45 -57 56 68 -57 69 68 -57 69 70 -57 58 70 -47 59 48 -47 59 58 -47 57 46 -47 57 58 -47 38 48 -47 38 37 -36 35 45 -36 46 45 -36 47 46 -36 47 37 -36 26 35 -36 27 26 -36 27 28 -36 37 28 diff --git a/bericht/iozone-nfs-read.out b/bericht/iozone-nfs-read.out deleted file mode 100644 index 1c12d5f..0000000 --- a/bericht/iozone-nfs-read.out +++ /dev/null @@ -1,248 +0,0 @@ -79 67 80 -24 17 25 -55 66 67 -16 10 17 -44 55 54 -34 33 25 -34 44 43 -9 10 4 -131 144 145 -131 132 145 -130 143 144 -130 131 144 -118 131 132 -118 119 132 -118 130 131 -118 130 117 -129 142 143 -129 130 143 -129 130 117 -129 116 117 -104 116 117 -104 103 116 -102 103 116 -102 115 116 -128 141 142 -128 129 142 -128 129 116 -128 115 116 -105 106 119 -105 118 119 -105 118 117 -105 104 117 -105 93 106 -105 93 92 -91 105 104 -91 105 92 -101 102 115 -101 114 115 -127 140 141 -127 128 141 -127 128 115 -127 114 115 -79 66 67 -79 66 78 -79 93 80 -79 93 92 -79 91 92 -79 91 78 -100 101 114 -100 113 114 -90 104 103 -90 91 104 -90 102 103 -90 89 102 -90 91 78 -90 77 78 -90 76 77 -90 76 89 -88 100 101 -88 100 87 -88 101 102 -88 89 102 -126 139 140 -126 127 140 -126 127 114 -126 113 114 -75 76 89 -75 88 89 -99 100 87 -99 86 87 -99 100 113 -99 112 113 -125 138 139 -125 126 139 -125 126 113 -125 112 113 -32 24 25 -32 33 25 -74 88 87 -74 75 88 -16 24 23 -16 24 17 -31 32 24 -31 24 23 -65 55 54 -65 55 66 -65 66 78 -65 77 78 -65 76 77 -65 64 76 -73 86 87 -73 74 87 -122 135 136 -122 123 136 -124 125 112 -124 111 112 -124 110 111 -124 110 123 -124 137 138 -124 125 138 -124 136 137 -124 123 136 -98 99 112 -98 111 112 -98 110 97 -98 110 111 -98 99 86 -98 85 86 -98 84 85 -98 97 84 -6 1 0 -6 5 0 -63 75 76 -63 64 76 -53 65 54 -53 65 64 -53 63 64 -53 63 52 -53 44 54 -53 44 43 -42 53 52 -42 53 43 -34 42 43 -34 42 33 -72 73 86 -72 85 86 -121 120 133 -121 134 133 -121 134 135 -121 122 135 -109 122 123 -109 110 123 -7 1 2 -7 6 1 -22 31 23 -22 30 31 -22 16 23 -22 16 15 -62 74 75 -62 63 75 -62 63 52 -62 51 52 -41 32 33 -41 42 33 -41 42 52 -41 51 52 -71 84 85 -71 72 85 -108 107 120 -108 121 120 -108 121 122 -108 109 122 -96 110 97 -96 109 110 -96 97 84 -96 83 84 -8 2 3 -8 7 2 -61 73 74 -61 62 74 -61 62 51 -61 50 51 -40 31 32 -40 41 32 -40 41 51 -40 50 51 -70 71 84 -70 83 84 -95 94 107 -95 108 107 -95 108 109 -95 96 109 -95 81 94 -95 82 81 -95 96 83 -95 82 83 -9 3 4 -9 8 3 -9 16 15 -9 16 10 -9 14 15 -9 14 8 -21 22 15 -21 14 15 -21 22 30 -21 29 30 -13 8 7 -13 14 8 -60 72 73 -60 61 73 -60 61 50 -60 49 50 -39 30 31 -39 40 31 -39 40 50 -39 49 50 -69 68 81 -69 82 81 -69 70 83 -69 82 83 -20 21 29 -20 28 29 -20 21 14 -20 13 14 -12 6 5 -12 11 5 -12 7 6 -12 13 7 -19 11 18 -19 12 11 -19 20 13 -19 12 13 -19 18 26 -19 27 26 -19 20 28 -19 27 28 -59 60 49 -59 48 49 -59 71 72 -59 60 72 -59 70 71 -59 58 70 -38 39 49 -38 48 49 -38 29 30 -38 39 30 -38 28 29 -38 37 28 -57 45 56 -57 46 45 -57 56 68 -57 69 68 -57 69 70 -57 58 70 -47 59 48 -47 59 58 -47 57 46 -47 57 58 -47 38 48 -47 38 37 -36 35 45 -36 46 45 -36 47 46 -36 47 37 -36 26 35 -36 27 26 -36 27 28 -36 37 28 diff --git a/bericht/iozone-nfs-write.out b/bericht/iozone-nfs-write.out deleted file mode 100644 index 1c12d5f..0000000 --- a/bericht/iozone-nfs-write.out +++ /dev/null @@ -1,248 +0,0 @@ -79 67 80 -24 17 25 -55 66 67 -16 10 17 -44 55 54 -34 33 25 -34 44 43 -9 10 4 -131 144 145 -131 132 145 -130 143 144 -130 131 144 -118 131 132 -118 119 132 -118 130 131 -118 130 117 -129 142 143 -129 130 143 -129 130 117 -129 116 117 -104 116 117 -104 103 116 -102 103 116 -102 115 116 -128 141 142 -128 129 142 -128 129 116 -128 115 116 -105 106 119 -105 118 119 -105 118 117 -105 104 117 -105 93 106 -105 93 92 -91 105 104 -91 105 92 -101 102 115 -101 114 115 -127 140 141 -127 128 141 -127 128 115 -127 114 115 -79 66 67 -79 66 78 -79 93 80 -79 93 92 -79 91 92 -79 91 78 -100 101 114 -100 113 114 -90 104 103 -90 91 104 -90 102 103 -90 89 102 -90 91 78 -90 77 78 -90 76 77 -90 76 89 -88 100 101 -88 100 87 -88 101 102 -88 89 102 -126 139 140 -126 127 140 -126 127 114 -126 113 114 -75 76 89 -75 88 89 -99 100 87 -99 86 87 -99 100 113 -99 112 113 -125 138 139 -125 126 139 -125 126 113 -125 112 113 -32 24 25 -32 33 25 -74 88 87 -74 75 88 -16 24 23 -16 24 17 -31 32 24 -31 24 23 -65 55 54 -65 55 66 -65 66 78 -65 77 78 -65 76 77 -65 64 76 -73 86 87 -73 74 87 -122 135 136 -122 123 136 -124 125 112 -124 111 112 -124 110 111 -124 110 123 -124 137 138 -124 125 138 -124 136 137 -124 123 136 -98 99 112 -98 111 112 -98 110 97 -98 110 111 -98 99 86 -98 85 86 -98 84 85 -98 97 84 -6 1 0 -6 5 0 -63 75 76 -63 64 76 -53 65 54 -53 65 64 -53 63 64 -53 63 52 -53 44 54 -53 44 43 -42 53 52 -42 53 43 -34 42 43 -34 42 33 -72 73 86 -72 85 86 -121 120 133 -121 134 133 -121 134 135 -121 122 135 -109 122 123 -109 110 123 -7 1 2 -7 6 1 -22 31 23 -22 30 31 -22 16 23 -22 16 15 -62 74 75 -62 63 75 -62 63 52 -62 51 52 -41 32 33 -41 42 33 -41 42 52 -41 51 52 -71 84 85 -71 72 85 -108 107 120 -108 121 120 -108 121 122 -108 109 122 -96 110 97 -96 109 110 -96 97 84 -96 83 84 -8 2 3 -8 7 2 -61 73 74 -61 62 74 -61 62 51 -61 50 51 -40 31 32 -40 41 32 -40 41 51 -40 50 51 -70 71 84 -70 83 84 -95 94 107 -95 108 107 -95 108 109 -95 96 109 -95 81 94 -95 82 81 -95 96 83 -95 82 83 -9 3 4 -9 8 3 -9 16 15 -9 16 10 -9 14 15 -9 14 8 -21 22 15 -21 14 15 -21 22 30 -21 29 30 -13 8 7 -13 14 8 -60 72 73 -60 61 73 -60 61 50 -60 49 50 -39 30 31 -39 40 31 -39 40 50 -39 49 50 -69 68 81 -69 82 81 -69 70 83 -69 82 83 -20 21 29 -20 28 29 -20 21 14 -20 13 14 -12 6 5 -12 11 5 -12 7 6 -12 13 7 -19 11 18 -19 12 11 -19 20 13 -19 12 13 -19 18 26 -19 27 26 -19 20 28 -19 27 28 -59 60 49 -59 48 49 -59 71 72 -59 60 72 -59 70 71 -59 58 70 -38 39 49 -38 48 49 -38 29 30 -38 39 30 -38 28 29 -38 37 28 -57 45 56 -57 46 45 -57 56 68 -57 69 68 -57 69 70 -57 58 70 -47 59 48 -47 59 58 -47 57 46 -47 57 58 -47 38 48 -47 38 37 -36 35 45 -36 46 45 -36 47 46 -36 47 37 -36 26 35 -36 27 26 -36 27 28 -36 37 28 diff --git a/etckeeper b/etckeeper index b63daf5..7abd329 160000 --- a/etckeeper +++ b/etckeeper @@ -1 +1 @@ -Subproject commit b63daf5cbc2272cd20277a157bf025c695a5bb45 +Subproject commit 7abd329ac66148a9b6adcf5c022e84893b72a36b diff --git a/logs b/logs index 4577c74..e67584a 160000 --- a/logs +++ b/logs @@ -1 +1 @@ -Subproject commit 4577c74a7b11d23834a2fd53d0f0646e0d6d0622 +Subproject commit e67584ad2c8222932e65a5d340e3469780acc3b4