christoph/fail
1
Fork 0
Code Releases Activity

Changed BufferCache Backend to STL (as proposed), added IOPortEvent-Cache, updated class diagram

Browse Source 
git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1325 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
This commit is contained in:
unzner
2012-06-10 19:32:05 +00:00
parent db88736bb9
commit f49fa07a25
9 changed files with 394 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

525
doc/class-diagram.dia
View File

@ -2932,19 +2932,19 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O5">
<dia:attribute name="obj_pos">
<dia:point val="45.95,-20.85"/>
<dia:point val="45.95,-24.35"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="45.9,-20.9;69.215,-3"/>
<dia:rectangle val="45.9,-24.4;69.215,-2.5"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="45.95,-20.85"/>
<dia:point val="45.95,-24.35"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="23.215"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="17.800000000000004"/>
<dia:real val="21.800000000000004"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#EventList#</dia:string>
@ -3149,6 +3149,29 @@
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
<dia:string>#m_Io_cache#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#BufferCache&lt;IOPortEvent*&gt;#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="operations">
<dia:composite type="umloperation">
@ -3420,54 +3443,6 @@
</dia:attribute>
<dia:attribute name="parameters"/>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#makeActive#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#void#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters">
<dia:composite type="umlparameter">
<dia:attribute name="name">
<dia:string>#ev#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#BaseEvent*#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="kind">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#makeActive#</dia:string>
@ -3797,6 +3772,192 @@
</dia:attribute>
<dia:attribute name="parameters"/>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#getBPBuffer#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#BufferCache&lt;BPEvent*&gt;&amp;#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters"/>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#getIOBuffer#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#BufferCache&lt;IOPortEvent*&gt;&amp;#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters"/>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#addToCaches#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#void#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters">
<dia:composite type="umlparameter">
<dia:attribute name="name">
<dia:string>#ev#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#BaseEvent*#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="kind">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#removeFromCaches#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#void#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters">
<dia:composite type="umlparameter">
<dia:attribute name="name">
<dia:string>#ev#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#BaseEvent*#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="kind">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#clearCaches#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#void#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters"/>
</dia:composite>
</dia:attribute>
<dia:attribute name="template">
<dia:boolean val="false"/>
@ -4374,17 +4535,17 @@
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="69.165,-16.55"/>
<dia:point val="69.165,-20.05"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="68.415,-17.35;85.62,-14.15"/>
<dia:rectangle val="68.415,-20.85;85.62,-14.15"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="69.165,-16.55"/>
<dia:point val="85.035,-16.55"/>
<dia:point val="69.165,-20.05"/>
<dia:point val="85.035,-20.05"/>
<dia:point val="85.035,-14.95"/>
</dia:attribute>
<dia:attribute name="orth_orient">
@ -17451,19 +17612,19 @@
</dia:object>
<dia:object type="UML - Class" version="0" id="O86">
<dia:attribute name="obj_pos">
<dia:point val="18,-20.35"/>
<dia:point val="13.6,-17.95"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="17.95,-21.1;38.97,-8.9"/>
<dia:rectangle val="13.55,-18.7;38.42,-9.7"/>
</dia:attribute>
<dia:attribute name="elem_corner">
<dia:point val="18,-20.35"/>
<dia:point val="13.6,-17.95"/>
</dia:attribute>
<dia:attribute name="elem_width">
<dia:real val="20.52"/>
<dia:real val="24.370000000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="11.399999999999999"/>
<dia:real val="8.1999999999999993"/>
</dia:attribute>
<dia:attribute name="name">
<dia:string>#BufferCache#</dia:string>
@ -17558,30 +17719,7 @@
<dia:string>#m_Buffer#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#T**#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
</dia:composite>
<dia:composite type="umlattribute">
<dia:attribute name="name">
<dia:string>#m_BufferCount#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
<dia:string>#std::list&lt;T&gt;#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@ -17601,102 +17739,6 @@
</dia:composite>
</dia:attribute>
<dia:attribute name="operations">
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#setCount#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#void#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="1"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters">
<dia:composite type="umlparameter">
<dia:attribute name="name">
<dia:string>#new_count#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="kind">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#reallocate_buffer#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters">
<dia:composite type="umlparameter">
<dia:attribute name="name">
<dia:string>#new_size#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="kind">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#add#</dia:string>
@ -17731,7 +17773,7 @@
<dia:string>#val#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#T#</dia:string>
<dia:string>#const T&amp;#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@ -17779,7 +17821,7 @@
<dia:string>#val#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#T#</dia:string>
<dia:string>#const T&amp;#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@ -17801,7 +17843,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
<dia:string>#iterator#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@ -17827,7 +17869,7 @@
<dia:string>#idx#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
<dia:string>#iterator#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@ -17873,61 +17915,13 @@
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#get#</dia:string>
<dia:string>#begin#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#T#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="abstract">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="inheritance_type">
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="true"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters">
<dia:composite type="umlparameter">
<dia:attribute name="name">
<dia:string>#idx#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="kind">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#set#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#void#</dia:string>
<dia:string>#iterator#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@ -17947,52 +17941,17 @@
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="parameters">
<dia:composite type="umlparameter">
<dia:attribute name="name">
<dia:string>#idx#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="kind">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
<dia:composite type="umlparameter">
<dia:attribute name="name">
<dia:string>#val#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#T#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="comment">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="kind">
<dia:enum val="1"/>
</dia:attribute>
</dia:composite>
</dia:attribute>
<dia:attribute name="parameters"/>
</dia:composite>
<dia:composite type="umloperation">
<dia:attribute name="name">
<dia:string>#getCount#</dia:string>
<dia:string>#end#</dia:string>
</dia:attribute>
<dia:attribute name="stereotype">
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
<dia:string>#iterator#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@ -18007,7 +17966,7 @@
<dia:enum val="2"/>
</dia:attribute>
<dia:attribute name="query">
<dia:boolean val="true"/>
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="class_scope">
<dia:boolean val="false"/>
@ -18022,7 +17981,7 @@
<dia:string>##</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
<dia:string>#iterator#</dia:string>
</dia:attribute>
<dia:attribute name="visibility">
<dia:enum val="0"/>
@ -18065,7 +18024,7 @@
<dia:string>#idx#</dia:string>
</dia:attribute>
<dia:attribute name="type">
<dia:string>#int#</dia:string>
<dia:string>#iterator#</dia:string>
</dia:attribute>
<dia:attribute name="value">
<dia:string>##</dia:string>
@ -18132,19 +18091,19 @@
<dia:boolean val="false"/>
</dia:attribute>
<dia:attribute name="obj_pos">
<dia:point val="38.52,-14.25"/>
<dia:point val="37.97,-14.25"/>
</dia:attribute>
<dia:attribute name="obj_bb">
<dia:rectangle val="38.47,-14.3;46,-9.95"/>
<dia:rectangle val="37.92,-15.05;46,-13.45"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
</dia:attribute>
<dia:attribute name="orth_points">
<dia:point val="38.52,-14.25"/>
<dia:point val="37.97,-14.25"/>
<dia:point val="41.6707,-14.25"/>
<dia:point val="41.6707,-11.55"/>
<dia:point val="45.95,-11.55"/>
<dia:point val="41.6707,-14.25"/>
<dia:point val="45.95,-14.25"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="0"/>
@ -18161,8 +18120,8 @@
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O86" connection="19"/>
<dia:connection handle="1" to="O5" connection="26"/>
<dia:connection handle="0" to="O86" connection="13"/>
<dia:connection handle="1" to="O5" connection="28"/>
</dia:connections>
</dia:object>
</dia:layer>