Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1829] trunk
|
From: <tm...@us...> - 2013-06-24 10:15:12
|
Revision: 1829
http://sourceforge.net/p/scstudio/code/1829
Author: tmarton
Date: 2013-06-24 10:15:07 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
fixed time relevant ordering test
Modified Paths:
--------------
trunk/src/check/time/module.cpp
Added Paths:
-----------
trunk/tests/time_relevant_ordering/tro_test24.tex.result2
trunk/tests/time_relevant_ordering/tro_test25.tex.result2
Modified: trunk/src/check/time/module.cpp
===================================================================
--- trunk/src/check/time/module.cpp 2013-06-22 10:09:51 UTC (rev 1828)
+++ trunk/src/check/time/module.cpp 2013-06-24 10:15:07 UTC (rev 1829)
@@ -30,7 +30,7 @@
Checker **result = new Checker* [5];
result[0] = new ConstraintsChecker();
result[1] = new ConsistencyChecker();
- result[2] = new TimeRaceChecker();
+ result[2] = new TimeRaceChecker();
result[3] = new AbsoluteTimeConsistencyChecker();
result[4] = NULL;
@@ -43,10 +43,10 @@
extern "C" SCTIME_EXPORT
Transformer** init_transformers()
{
- Transformer **result = new Transformer* [2];
-// result[0] = new Tighter();
- result[0] = new AbsoluteTimeTighter();
- result[1] = NULL;
+ Transformer **result = new Transformer* [3];
+ result[0] = new Tighter();
+ result[1] = new AbsoluteTimeTighter();
+ result[2] = NULL;
return result;
}
Added: trunk/tests/time_relevant_ordering/tro_test24.tex.result2
===================================================================
--- trunk/tests/time_relevant_ordering/tro_test24.tex.result2 (rev 0)
+++ trunk/tests/time_relevant_ordering/tro_test24.tex.result2 2013-06-24 10:15:07 UTC (rev 1829)
@@ -0,0 +1,180 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{tro\_test24}
+\setmsckeyword{Pcap}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{20mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{13mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{11mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{8mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+
+
+%%%% Width of absolute time:
+\def\absoluteTimeWidthA{10mm*\real{\mscScaleX}}
+
+
+%%%% Absolute time slope:
+\def\absoluteTimeSlopeA{5mm*\real{\mscScaleY}}
+
+\setlength{\markdist}{\absoluteTimeSlopeA}
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+%%%% Width of instance head/foot:
+\def\instanceWidthA{15mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{30mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{192.168.69.2}{}
+\declinst{1_inst}{192.168.69.1}{}
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_34059\_DST\_80\_TCP\_SYN\_SEQ\_0\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[5.9e-005]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[5.9e-005]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_80\_DST\_34059\_TCP\_SYN\_ACK\_SEQ\_0\_ACK\_1\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.000153]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_34059\_DST\_80\_TCP\_ACK\_SEQ\_1\_ACK\_1\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.000153]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.000282]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_I\_SRC\_34059\_DST\_80\_TCP\_PSH\_ACK\_SEQ\_1\_ACK\_1\_HTTP\_GET\_cerberus\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.000282]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.00033]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.00033]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_80\_DST\_34059\_TCP\_ACK\_SEQ\_1\_ACK\_446\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.021452]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.021452]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_I\_SRC\_80\_DST\_34059\_TCP\_PSH\_ACK\_SEQ\_1\_ACK\_446\_HTTP\_STATUS\_CODE\_200\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.021629]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_34059\_DST\_80\_TCP\_ACK\_SEQ\_446\_ACK\_403\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.021629]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.021755]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.021755]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_80\_DST\_34059\_TCP\_FIN\_ACK\_SEQ\_403\_ACK\_446\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.022677]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_34059\_DST\_80\_TCP\_FIN\_ACK\_SEQ\_446\_ACK\_404\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.022677]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.022715]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.022715]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_80\_DST\_34059\_TCP\_ACK\_SEQ\_404\_ACK\_447\_}{1_inst}[0.3]{0_inst}[1]
+\end{msc}
+\end{document}
Added: trunk/tests/time_relevant_ordering/tro_test25.tex.result2
===================================================================
--- trunk/tests/time_relevant_ordering/tro_test25.tex.result2 (rev 0)
+++ trunk/tests/time_relevant_ordering/tro_test25.tex.result2 2013-06-24 10:15:07 UTC (rev 1829)
@@ -0,0 +1,159 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{tro\_test25}
+\setmsckeyword{Pcap}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{18mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{13mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{11mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{8mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+\def\slopeB{\levelA+\levelA+\levelA}
+\def\slopeC{\levelA+\levelA}
+
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+
+%%%% Time interval slope:
+\def\timeIntervalSlopeA{\levelA}
+\def\timeIntervalSlopeB{\levelA+\levelA}
+\def\timeIntervalSlopeC{0mm*\real{\mscScaleY}}
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+%%%% Width of instance head/foot:
+\def\instanceWidthA{15mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{30mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{192.168.69.2}{}
+\declinst{1_inst}{192.168.69.1}{}
+
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[5.9e-005]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{1\_TCP\_SYN\_SEQ\_0\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[5.9e-005]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[9.4e-005]}{0_inst}{0_inst}[1]
+\measure[l]{[9.4e-005]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{2\_TCP\_SYN\_ACK\_SEQ\_0\_ACK\_1\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000129]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{3\_TCP\_ACK\_SEQ\_1\_ACK\_1\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.000129]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[4.8e-005]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{4\_HTTP\_GET\_cerberus\_ALL\_DATA\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[4.8e-005]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[0.021122]}{0_inst}{0_inst}[1]
+\measure[l]{[0.021122]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{5\_TCP\_ACK\_SEQ\_1\_ACK\_446\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\measure[l]{[0.001225]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.000303]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{6\_HTTP\_STATUS\_CODE\_200\_ALL\_DATA\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000922]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\slopeB}
+\mess{8\_TCP\_FIN\_ACK\_SEQ\_403\_ACK\_446\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\measure[l]{[0.000126]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[0.001048]}{0_inst}{1_inst}[1]
+\mess{9\_TCP\_FIN\_ACK\_SEQ\_446\_ACK\_404\_2\_packets\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[3.8e-005]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\slopeC}
+\mess{10\_TCP\_ACK\_SEQ\_404\_ACK\_447\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.00096]}{0_inst}{0_inst}[1]
+\nextlevel
+
+\end{msc}
+\end{document}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
