[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/doc CERTI-tickHandling.xml RTIA-model-sho...
From: |
certi-cvs |
Subject: |
[certi-cvs] certi/doc CERTI-tickHandling.xml RTIA-model-sho... |
Date: |
Sun, 21 Nov 2010 12:12:03 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 10/11/21 12:12:03
Modified files:
doc : CERTI-tickHandling.xml
Added files:
doc : RTIA-model-shot.png libRTI-model-shot.png
Log message:
Update Uppaal model
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/doc/CERTI-tickHandling.xml?cvsroot=certi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/certi/doc/RTIA-model-shot.png?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/doc/libRTI-model-shot.png?cvsroot=certi&rev=1.1
Patches:
Index: CERTI-tickHandling.xml
===================================================================
RCS file: /sources/certi/certi/doc/CERTI-tickHandling.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CERTI-tickHandling.xml 20 Nov 2010 17:49:45 -0000 1.5
+++ CERTI-tickHandling.xml 21 Nov 2010 12:12:02 -0000 1.6
@@ -46,10 +46,10 @@
clock h;
// The number of callback to be processed
-int nbCallbacks=0;</declaration><location id="id0" x="208" y="-480"><name
x="166" y="-510">TICK_NEXT</name></location><location id="id1" x="-352"
y="-160"><name x="-408" y="-136">TICK_CALLBACK</name></location><location
id="id2" x="-344" y="-480"><name x="-368"
y="-464">TICK_BLOCKING</name></location><location id="id3" x="208"
y="-160"><name x="160" y="-144">TICK_RETURN</name></location><location id="id4"
x="-600" y="-312"><name x="-632" y="-344">NO_TICK</name></location><init
ref="id4"/><transition><source ref="id3"/><target ref="id4"/><label
kind="synchronisation" x="-256" y="-24">Tick_rq[FedRank]!</label><nail x="208"
y="-32"/><nail x="-648" y="-24"/><nail x="-664"
y="-288"/></transition><transition><source ref="id1"/><target ref="id1"/><label
kind="select" x="-424" y="-96">fedCallback: BoolRange</label><label
kind="guard" x="-400" y="-80">fedCallback > 0</label><label
kind="assignment" x="-432" y="-64">moreMsg[FedRank]=true</label><nail x="-288"
y="-136"/><nail x="-296" y="-112"/><nail x="-352" y="-96"/><nail x="-416"
y="-112"/><nail x="-416" y="-136"/></transition><transition><source
ref="id0"/><target ref="id3"/><label kind="guard" x="224" y="-376">(h >=
maxTime[FedRank]) or
+int nbCallbacks=0;</declaration><location id="id0" x="272" y="-440"><name
x="230" y="-470">TICK_NEXT</name></location><location id="id1" x="-288"
y="-120"><name x="-344" y="-96">TICK_CALLBACK</name></location><location
id="id2" x="-280" y="-440"><name x="-304"
y="-424">TICK_BLOCKING</name></location><location id="id3" x="272"
y="-120"><name x="224" y="-104">TICK_RETURN</name></location><location id="id4"
x="-536" y="-272"><name x="-568" y="-304">NO_TICK</name></location><init
ref="id4"/><transition><source ref="id3"/><target ref="id4"/><label
kind="synchronisation" x="-192" y="16">Tick_rq[FedRank]!</label><nail x="272"
y="8"/><nail x="-584" y="16"/><nail x="-600"
y="-248"/></transition><transition><source ref="id1"/><target ref="id1"/><label
kind="select" x="-360" y="-56">fedCallback: BoolRange</label><label
kind="guard" x="-336" y="-40">fedCallback > 0</label><label
kind="assignment" x="-368" y="-24">moreMsg[FedRank]=true</label><nail x="-224"
y="-96"/><nail x="-232" y="-72"/><nail x="-288" y="-56"/><nail x="-352"
y="-72"/><nail x="-352" y="-96"/></transition><transition><source
ref="id0"/><target ref="id3"/><label kind="guard" x="288" y="-336">(h >=
maxTime[FedRank]) or
(multiple[FedRank]) or
-(not moreMsg[FedRank])</label></transition><transition><source
ref="id0"/><target ref="id1"/><label kind="guard" x="-344"
y="-384">multiple[FedRank] and
-h < maxTime[FedRank]</label><nail x="-48" y="-416"/><nail x="-240"
y="-304"/></transition><transition><source ref="id1"/><target ref="id0"/><label
kind="guard" x="-96" y="-288">moreMsg[FedRank]==true</label><nail x="-160"
y="-256"/><nail x="32" y="-360"/></transition><transition><source
ref="id2"/><target ref="id2"/><label kind="guard" x="-424" y="-592">h <=
minTime[FedRank]</label><nail x="-392" y="-544"/><nail x="-336" y="-568"/><nail
x="-288" y="-536"/></transition><transition><source ref="id2"/><target
ref="id0"/><label kind="select" x="-264" y="-544">timeAdvance : BoolRange,
fedCallback: BoolRange</label><label kind="guard" x="-216" y="-528">timeAdvance
> 0 or fedCallback > 0</label><label kind="assignment" x="-240"
y="-512">nbCallbacks++,
moreMsg[FedRank]=true</label></transition><transition><source
ref="id1"/><target ref="id3"/><label kind="guard" x="-152"
y="-152">moreMsg[FedRank]==false</label></transition><transition><source
ref="id4"/><target ref="id1"/><label kind="synchronisation" x="-608"
y="-224">Tick_rq[FedRank]?</label><label kind="assignment" x="-648"
y="-208">moreMsg[FedRank]=false, h=0</label></transition><transition><source
ref="id4"/><target ref="id2"/><label kind="guard" x="-640"
y="-472">minTime[FedRank] >= 0</label><label kind="synchronisation" x="-624"
y="-456">Tick_rq[FedRank]?</label><label kind="assignment" x="-656"
y="-440">moreMsg[FedRank]=false,
h=0</label></transition></template><template><name>libRTI</name><parameter>FederateRange
FedRank</parameter><declaration>// libRTI is the library linked with the
Federate
+(not moreMsg[FedRank])</label></transition><transition><source
ref="id0"/><target ref="id1"/><label kind="guard" x="-280"
y="-344">multiple[FedRank] and
+h < maxTime[FedRank]</label><nail x="16" y="-376"/><nail x="-176"
y="-264"/></transition><transition><source ref="id1"/><target ref="id0"/><label
kind="guard" x="-32" y="-248">moreMsg[FedRank]==true</label><nail x="-96"
y="-216"/><nail x="96" y="-320"/></transition><transition><source
ref="id2"/><target ref="id2"/><label kind="guard" x="-360" y="-552">h <=
minTime[FedRank]</label><nail x="-328" y="-504"/><nail x="-272" y="-528"/><nail
x="-224" y="-496"/></transition><transition><source ref="id2"/><target
ref="id0"/><label kind="select" x="-200" y="-504">timeAdvance : BoolRange,
fedCallback: BoolRange</label><label kind="guard" x="-152" y="-488">timeAdvance
> 0 or fedCallback > 0</label><label kind="assignment" x="-176"
y="-472">nbCallbacks++,
moreMsg[FedRank]=true</label></transition><transition><source
ref="id1"/><target ref="id3"/><label kind="guard" x="-88"
y="-112">moreMsg[FedRank]==false</label></transition><transition><source
ref="id4"/><target ref="id1"/><label kind="synchronisation" x="-544"
y="-184">Tick_rq[FedRank]?</label><label kind="assignment" x="-584"
y="-168">moreMsg[FedRank]=false, h=0</label></transition><transition><source
ref="id4"/><target ref="id2"/><label kind="guard" x="-576"
y="-432">minTime[FedRank] >= 0</label><label kind="synchronisation" x="-560"
y="-416">Tick_rq[FedRank]?</label><label kind="assignment" x="-592"
y="-400">moreMsg[FedRank]=false,
h=0</label></transition></template><template><name>libRTI</name><parameter>FederateRange
FedRank</parameter><declaration>// libRTI is the library linked with the
Federate
void
buildTickMessageContent(BoolRange mult, MinTimeRange min, MaxTimeRange max)
@@ -57,7 +57,7 @@
multiple[FedRank] = mult ? true : false;
minTime[FedRank] = min;
maxTime[FedRank] = min + max;
-}</declaration><location id="id5" x="88" y="-192"><name x="112"
y="-200">TICKING</name></location><location id="id6" x="-320" y="48"><name
x="-400" y="8">NOT_TICKING</name></location><init
ref="id6"/><transition><source ref="id5"/><target ref="id6"/><label
kind="synchronisation" x="-64" y="24">Tick_rqStop[FedRank]!</label><nail x="88"
y="-56"/><nail x="-104" y="40"/></transition><transition><source
ref="id5"/><target ref="id5"/><label kind="synchronisation" x="32"
y="-312">Tick_rqNext[FedRank]!</label><nail x="32" y="-272"/><nail x="96"
y="-288"/><nail x="200" y="-248"/></transition><transition><source
ref="id5"/><target ref="id6"/><label kind="synchronisation" x="-144"
y="-56">Tick_rq[FedRank]?</label><nail x="-16" y="-112"/><nail x="-184"
y="-40"/></transition><transition><source ref="id6"/><target ref="id5"/><label
kind="select" x="-536" y="-184">selmult : BoolRange, min : MinTimeRange, max :
MaxTimeRange</label><label kind="synchronisation" x="-384"
y="-168">Tick_rq[FedRank]!</label><label kind="assignment" x="-456"
y="-152">buildTickMessageContent(selmult,min,max)</label><nail x="-224"
y="-96"/><nail x="-120" y="-136"/></transition></template><system>// Place
template instantiations here.
+}</declaration><location id="id5" x="-72" y="-320"><name x="-48"
y="-328">TICKING</name></location><location id="id6" x="-480" y="-80"><name
x="-560" y="-120">NOT_TICKING</name></location><init
ref="id6"/><transition><source ref="id5"/><target ref="id6"/><label
kind="synchronisation" x="-224" y="-104">Tick_rqStop[FedRank]!</label><nail
x="-72" y="-184"/><nail x="-264" y="-88"/></transition><transition><source
ref="id5"/><target ref="id5"/><label kind="synchronisation" x="-128"
y="-440">Tick_rqNext[FedRank]!</label><nail x="-128" y="-400"/><nail x="-64"
y="-416"/><nail x="40" y="-376"/></transition><transition><source
ref="id5"/><target ref="id6"/><label kind="synchronisation" x="-304"
y="-184">Tick_rq[FedRank]?</label><nail x="-176" y="-240"/><nail x="-344"
y="-168"/></transition><transition><source ref="id6"/><target ref="id5"/><label
kind="select" x="-696" y="-312">selmult : BoolRange, min : MinTimeRange, max :
MaxTimeRange</label><label kind="synchronisation" x="-544"
y="-296">Tick_rq[FedRank]!</label><label kind="assignment" x="-616"
y="-280">buildTickMessageContent(selmult,min,max)</label><nail x="-384"
y="-224"/><nail x="-280" y="-264"/></transition></template><system>// Place
template instantiations here.
// We instantiate 2 federates (libRTIs) with their corresponding RTIAs
libRTI_1 = libRTI(1);
libRTI_2 = libRTI(2);
Index: RTIA-model-shot.png
===================================================================
RCS file: RTIA-model-shot.png
diff -N RTIA-model-shot.png
Binary files /dev/null and /tmp/cvsCcgMsS differ
Index: libRTI-model-shot.png
===================================================================
RCS file: libRTI-model-shot.png
diff -N libRTI-model-shot.png
Binary files /dev/null and /tmp/cvspMEuNS differ
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi/doc CERTI-tickHandling.xml RTIA-model-sho...,
certi-cvs <=