Mercurial > hg > Papers > 2020 > menikon-thesis

changeset 13:d393f08644e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add fig fsInterface
author menikon
date Tue, 11 Feb 2020 07:02:42 +0900
parents 996a70147cb0
children 14feebd2285c
files final_main/appendix.tex final_main/chapter4.tex final_main/chapter5.tex final_main/fig/Interface.graffle final_main/fig/fsInterface.graffle final_main/fig/fsInterface.pdf final_main/main.out final_main/main.pdf final_main/main.tex rewrite_xv6_FileSystem_in_CbC.mm
diffstat 10 files changed, 77 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/final_main/appendix.tex	Tue Feb 11 04:51:05 2020 +0900
+++ b/final_main/appendix.tex	Tue Feb 11 07:02:42 2020 +0900
@@ -1,6 +1,6 @@
 \chapter*{付録}
 
 \lstinputlisting[label=fs.ds,  caption=FileSystem の Interface]{src/fs.dg}
-\lstinputlisting[label=fs_impl.h,  caption=]{src/fs_impl.h}
-\lstinputlisting[label=fs_impl.cbc,  caption=FileSystem の 実装]{src/fs_impl.cbc}
-\lstinputlisting[label=fs_impl_private.cbc,  caption=FileSystem の 実装]{src/fs_impl_private.cbc}
\ No newline at end of file
+\lstinputlisting[label=fs_impl.h,  caption=fs private のヘッダーファイル]{src/fs_impl.h}
+\lstinputlisting[label=fs_impl.cbc,  caption=fs の 実装]{src/fs_impl.cbc}
+\lstinputlisting[label=fs_impl_private.cbc,  caption=fs の 実装の private]{src/fs_impl_private.cbc}
\ No newline at end of file
--- a/final_main/chapter4.tex	Tue Feb 11 04:51:05 2020 +0900
+++ b/final_main/chapter4.tex	Tue Feb 11 07:02:42 2020 +0900
@@ -22,6 +22,8 @@
     \label{fig:xv6filesystem}
 \end{figure}
 
+\begin{comment}
+優先度が低いのでコメントアウト中説明するなら外す
 \begin{itemize}
   \item File descriptor 階層
   Unixの資源はファイルとして表現され,コンソールのようなデバイスはもちろん,実際のファイルもファイルとして表現されている.
@@ -66,15 +68,26 @@
   \\Logging 階層の log が格納されている.
   
 \end{itemize}
+\end{comment}
 
-\section{FilleSystem の API} %関数や構造体などを解説しそのまま利用されているところをかく
-
+\section{FilleSystem の API} 
+%関数や構造体などを解説しそのまま利用されているところをかく
+%FileSystemの構造よりも重要だからこっちの方のを優先的に説明したい！
 \begin{itemize}
-  \item 
-  \item 
-  \item 
-  \item 
-  \item 
-  \item 
-  \item 
+  \item iinit
+  \item ialloc
+  \item iupdate
+  \item idup
+  \item ilock 
+  \item iunlock
+  \item iput
+  \item iunlockput
+  \item stati
+  \item readi
+  \item writei
+  \item namecmp
+  \item dirlookup
+  \item dirlink
+  \item namei
+  \item nameiparent
 \end{itemize}
--- a/final_main/chapter5.tex	Tue Feb 11 04:51:05 2020 +0900
+++ b/final_main/chapter5.tex	Tue Feb 11 07:02:42 2020 +0900
@@ -1,10 +1,20 @@
 \chapter{CbCによるFileSystemの書き換え}
-
-
-
 \section{書き換え方針}
+%\newpage
 \section{FileSystem の Interface の定義(fs.dg)}
+\begin{figure}[ht]
+     \begin{center}
+     \includegraphics[width=100mm]{fig/fsInterface.pdf}
+     \end{center}
+     \caption{xv6 FileSystem の Interface と実装}
+    \label{fig:fsfilesystem}
+\end{figure}
 
-\lstinputlisting[label=fs_interface,  caption=FileSystemのInterface]{src/fs.dg}
+%\newpage
+FileSystem の Interface を記述したコードをソースコード\ref{fs_interface}に示す.
 
-\section{CbC による FileSystem の書き換え}
+\lstinputlisting[label=fs_interface,  caption=FileSystem の Interface]{src/fs.dg}
+
+\section{FileSystem の Interface の実装(fs\_impl.cbc)}
+
+\lstinputlisting[label=fs_interface_impl,  caption=FileSystem の Interface の実装]{src/fs_impl.cbc}
\ No newline at end of file
Binary file final_main/fig/Interface.graffle has changed
Binary file final_main/fig/fsInterface.graffle has changed
Binary file final_main/fig/fsInterface.pdf has changed
--- a/final_main/main.out	Tue Feb 11 04:51:05 2020 +0900
+++ b/final_main/main.out	Tue Feb 11 07:02:42 2020 +0900
@@ -6,7 +6,7 @@
 \BOOKMARK [0][-]{chapter.3}{第3章 GearsOS}{}% 6
 \BOOKMARK [1][-]{section.3.1}{3.1 GearsOS の概要}{chapter.3}% 7
 \BOOKMARK [1][-]{section.3.2}{3.2 Context}{chapter.3}% 8
-\BOOKMARK [1][-]{section.3.3}{3.3 inetrface}{chapter.3}% 9
+\BOOKMARK [1][-]{section.3.3}{3.3 Inetrface}{chapter.3}% 9
 \BOOKMARK [0][-]{chapter.4}{第4章 xv6}{}% 10
 \BOOKMARK [1][-]{section.4.1}{4.1 xv6 の概要}{chapter.4}% 11
 \BOOKMARK [1][-]{section.4.2}{4.2 FileSystem}{chapter.4}% 12
@@ -14,6 +14,6 @@
 \BOOKMARK [1][-]{section.4.4}{4.4 FilleSystem の API}{chapter.4}% 14
 \BOOKMARK [0][-]{chapter.5}{第5章 CbCによるFileSystemの書き換え}{}% 15
 \BOOKMARK [1][-]{section.5.1}{5.1 書き換え方針}{chapter.5}% 16
-\BOOKMARK [1][-]{section.5.2}{5.2 FileSystemのInterface}{chapter.5}% 17
-\BOOKMARK [1][-]{section.5.3}{5.3 CbC による FileSystem の書き換え}{chapter.5}% 18
+\BOOKMARK [1][-]{section.5.2}{5.2 FileSystem の Interface の定義\(fs.dg\)}{chapter.5}% 17
+\BOOKMARK [1][-]{section.5.3}{5.3 FileSystem の Interface の実装\(fs\137impl.cbc\)}{chapter.5}% 18
 \BOOKMARK [0][-]{chapter.6}{第6章 まとめと今後の課題}{}% 19
Binary file final_main/main.pdf has changed
--- a/final_main/main.tex	Tue Feb 11 04:51:05 2020 +0900
+++ b/final_main/main.tex	Tue Feb 11 07:02:42 2020 +0900
@@ -3,6 +3,7 @@
 \usepackage{mythesis}
 \usepackage{multirow}
 \usepackage{here}
+\usepackage{comment}
 \usepackage[dvipdfmx]{hyperref,graphicx}
 % for hyperref
 \usepackage{pxjahyper}
--- a/rewrite_xv6_FileSystem_in_CbC.mm	Tue Feb 11 04:51:05 2020 +0900
+++ b/rewrite_xv6_FileSystem_in_CbC.mm	Tue Feb 11 07:02:42 2020 +0900
@@ -45,15 +45,15 @@
 </node>
 <node CREATED="1580706172440" ID="ID_1527149818" MODIFIED="1581361596230" TEXT="xv6&#x306e;FileSystem">
 <font NAME="SansSerif" SIZE="28"/>
-<node CREATED="1581361557320" ID="ID_635990116" MODIFIED="1581361587969" TEXT="&#x69cb;&#x9020;&#x306e;&#x56f3;&#x306f;&#x3044;&#x308b;&#xff1f;">
-<font NAME="SansSerif" SIZE="28"/>
-</node>
 <node CREATED="1581361597791" ID="ID_1656649225" MODIFIED="1581361616139" TEXT="&#x3069;&#x3093;&#x306a;&#x3082;&#x306e;&#x304b;&#x8aac;&#x660e;">
 <font NAME="SansSerif" SIZE="28"/>
 </node>
 <node CREATED="1581361616930" ID="ID_477433469" MODIFIED="1581361652830" TEXT="&#x4ed6;&#x306e;OS&#x306e;FileSystem&#x3068;&#x3069;&#x3046;&#x9055;&#x3046;&#x304b;&#x8aac;&#x660e;">
 <font NAME="SansSerif" SIZE="28"/>
 </node>
+<node CREATED="1581361557320" ID="ID_635990116" MODIFIED="1581365370821" TEXT="&#x69cb;&#x9020;&#x306e;&#x56f3;&#x306f;&#x3044;&#x308b;&#xff1f;">
+<font NAME="SansSerif" SIZE="28"/>
+</node>
 </node>
 <node CREATED="1581235020303" ID="ID_1352679515" MODIFIED="1581235049686" TEXT="FilleSystem &#x306e; API">
 <font NAME="SansSerif" SIZE="28"/>
@@ -70,14 +70,20 @@
 <node CREATED="1580706952084" ID="ID_379916374" MODIFIED="1580707101276" TEXT="&#x66f8;&#x304d;&#x63db;&#x3048;&#x65b9;&#x91dd;">
 <font NAME="SansSerif" SIZE="28"/>
 </node>
-<node CREATED="1580706968810" ID="ID_1139395838" MODIFIED="1581363980199" TEXT="FileSystem &#x306e; Interface &#x306e;&#x5b9a;&#x7fa9;(fs.dg)">
+<node CREATED="1581235077097" ID="ID_1378839864" MODIFIED="1581235087525" TEXT="CbC &#x306b;&#x3088;&#x308b; FileSystem &#x306e;&#x66f8;&#x304d;&#x63db;&#x3048;">
+<font NAME="SansSerif" SIZE="28"/>
+<node CREATED="1580706968810" ID="ID_1139395838" MODIFIED="1581366346918" TEXT="FileSystem &#x306e; Interface &#x306e;&#x5b9a;&#x7fa9;(fs.dg)">
 <font NAME="SansSerif" SIZE="28"/>
 </node>
-<node CREATED="1581363980690" ID="ID_346293316" MODIFIED="1581364042483" TEXT="FileSystem &#x306e; Interface &#x306e;&#x5b9f;&#x88c5;(fs_impl.CbC)">
+<node CREATED="1581363980690" ID="ID_346293316" MODIFIED="1581366351414" TEXT="FileSystem &#x306e; Interface &#x306e;&#x5b9f;&#x88c5;(fs_impl.CbC)">
 <font NAME="SansSerif" SIZE="28"/>
 </node>
-<node CREATED="1581235077097" ID="ID_1378839864" MODIFIED="1581235087525" TEXT="CbC &#x306b;&#x3088;&#x308b; FileSystem &#x306e;&#x66f8;&#x304d;&#x63db;&#x3048;">
+<node CREATED="1581366444540" ID="ID_522190874" MODIFIED="1581366621235" TEXT="fs &#x306e; Context &#x3092;&#x8f09;&#x305b;&#x3066;Interface&#x3068;&#x6bd4;&#x8f03;&#x3059;&#x308b;&#x306e;&#x3082;&#x3042;&#x308a;&#xff1f;">
 <font NAME="SansSerif" SIZE="28"/>
+<node CREATED="1581366506336" ID="ID_184279536" MODIFIED="1581366583430" TEXT="Context&#x306b;&#x306f;&#x5168;&#x3066;&#x306e;DataGear&#x3068;CodeGear&#x304c;&#x3042;&#x308b;&#x304c;Interface&#x306f;&#x5229;&#x7528;&#x3059;&#x308b;&#x306e;&#x3060;&#x3051;&#x307f;&#x305f;&#x3044;&#x306b;">
+<font NAME="SansSerif" SIZE="28"/>
+</node>
+</node>
 </node>
 </node>
 <node CREATED="1580705969920" ID="ID_1514151978" MODIFIED="1581234828368" POSITION="right" TEXT="&#x307e;&#x3068;&#x3081;&#x3068;&#x4eca;&#x5f8c;&#x306e;&#x8ab2;&#x984c;">
@@ -89,6 +95,27 @@
 <font NAME="SansSerif" SIZE="28"/>
 </node>
 </node>
+<node CREATED="1581366729483" ID="ID_644300244" MODIFIED="1581366738527" POSITION="right" TEXT="&#x53c2;&#x8003;&#x6587;&#x732e;">
+<font NAME="SansSerif" SIZE="28"/>
+<node CREATED="1581366741813" ID="ID_1154134012" MODIFIED="1581366752782" TEXT="CbC">
+<font NAME="SansSerif" SIZE="28"/>
+</node>
+<node CREATED="1581366756844" ID="ID_1532337404" MODIFIED="1581366767541" TEXT="GearsOS">
+<font NAME="SansSerif" SIZE="28"/>
+</node>
+<node CREATED="1581366768095" ID="ID_190100523" MODIFIED="1581366774618" TEXT="ARM">
+<font NAME="SansSerif" SIZE="28"/>
+</node>
+<node CREATED="1581366775954" ID="ID_76640911" MODIFIED="1581366780684" TEXT="LLVM">
+<font NAME="SansSerif" SIZE="28"/>
+</node>
+<node CREATED="1581366782012" ID="ID_849271483" MODIFIED="1581366787024" TEXT="GCC">
+<font NAME="SansSerif" SIZE="28"/>
+</node>
+<node CREATED="1581366798874" ID="ID_441381318" MODIFIED="1581366804291" TEXT="xv6">
+<font NAME="SansSerif" SIZE="28"/>
+</node>
+</node>
 <node CREATED="1580706250190" HGAP="19" ID="ID_336597035" MODIFIED="1580707101275" POSITION="right" TEXT="&#x8b1d;&#x8f9e;" VSHIFT="11">
 <font NAME="SansSerif" SIZE="28"/>
 </node>