Commits (17)
sources := \
ttcn/LibCommon_AbstractData.ttcn \
ttcn/LibCommon_BasicTypesAndValues.ttcn \
ttcn/LibCommon_DataStrings.ttcn \
ttcn/LibCommon_Sync.ttcn \
ttcn/LibCommon_TextStrings.ttcn \
ttcn/LibCommon_Time.ttcn \
ttcn/LibCommon_VerdictControl.ttcn
......@@ -9,6 +9,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_AbstractData {
......
......@@ -9,6 +9,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_BasicTypesAndValues {
......@@ -53,6 +58,7 @@
const integer c_uInt36Max := 68719476735;
const integer c_uInt48Max := 281474976710655;
const integer c_uInt52Max := 4503599627370495;
const integer c_uInt64Max := 18446744073709551615;
type integer UInt (0 .. infinity);
type integer UInt1 (0 .. c_uInt1Max) with {variant "unsigned 1 bit"};
......@@ -90,6 +96,7 @@
type integer UInt36 (0 .. c_uInt36Max) with {variant "unsigned 36 bit"};
type integer UInt48 (0 .. c_uInt48Max) with {variant "unsigned 48 bit"};
type integer UInt52 (0 .. c_uInt52Max) with {variant "unsigned 52 bit"};
type integer UInt64 (0 .. c_uInt64Max) with {variant "unsigned 64 bit"};
} // end group unsignedIntegerDefintions
......
......@@ -12,6 +12,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_DataStrings {
......@@ -60,6 +65,7 @@
type bitstring Bit72 length(72) with {encode "length(72)"};
type bitstring Bit128 length(128) with {encode "length(128)"};
type bitstring Bit144 length(144) with {encode "length(144)"};
type bitstring Bit256 length(256) with {encode "length(256)"};
} // end group bitStringSubTypes
......@@ -100,8 +106,11 @@
type octetstring Oct16 length(16) with {encode "length(16)"};
type octetstring Oct20 length(20) with {encode "length(20)"};
type octetstring Oct32 length(32) with {encode "length(32)"};
type octetstring Oct48 length(48) with {encode "length(48)"};
type octetstring Oct64 length(64) with {encode "length(64)"};
type octetstring Oct80 length(80) with {encode "length(80)"};
type octetstring Oct96 length(96) with {encode "length(96)"};
type octetstring Oct128 length(128) with {encode "length(128)"};
type octetstring Oct160 length(160) with {encode "length(160)"};
type octetstring Oct320 length(320) with {encode "length(320)"};
......@@ -109,11 +118,18 @@
type octetstring Oct1280 length(1280) with {encode "length(1280)"};
type octetstring Oct1380 length(1380) with {encode "length(1380)"};
type octetstring Oct0to3 length(0..3) with {encode "length(0..3)"};
type octetstring Oct0to8 length(0..16) with {encode "length(0..8)"};
type octetstring Oct0to12 length(0..12) with {encode "length(0..12)"};
type octetstring Oct0to16 length(0..16) with {encode "length(0..16)"};
type octetstring Oct0to31 length(0..31) with {encode "length(0..31)"};
type octetstring Oct0to20 length(0..20) with {encode "length(0..20)"};
type octetstring Oct0to30 length(0..20) with {encode "length(0..30)"};
type octetstring Oct0to127 length(0..127) with {encode "length(0..127)"};
type octetstring Oct0to255 length(0..255) with {encode "length(0..255)"};
type octetstring Oct1to15 length(1..15) with {encode "length(1..15)"};
type octetstring Oct1to31 length(1..31) with {encode "length(1..31)"};
type octetstring Oct1to128 length(1..128) with {encode "length(1..128)"};
type octetstring Oct1to254 length(1..254) with {encode "length(1..254)"};
type octetstring Oct1to255 length(1..255) with {encode "length(1..255)"};
......
......@@ -53,6 +53,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_Sync {
......@@ -143,7 +148,11 @@ module LibCommon_Sync {
* @see LibCommon_Sync.ServerSyncComp
* @see LibCommon_Sync.ClientSyncComp
*/
type port SyncPort message { inout SyncCmd }
type port SyncPort message {
inout SyncCmd
} with {
extension "internal"
}
/**
......@@ -616,13 +625,13 @@ module LibCommon_Sync {
* @remark User shall stop the component
*/
altstep a_shutdown()
runs on ClientSyncComp {
runs on BaseSyncComp {
[] syncPort.receive(m_syncServerStop){
tc_sync.stop ;
log("**** a_shutdown: Test component received STOP signal from MTC **** ");
}
}
}
} // end group shutDownAltsteps
} // end group basicUserRelevantDefinitions
......@@ -723,7 +732,7 @@ module LibCommon_Sync {
} else if ( p_syncId == c_initDone ) {
log("**** f_serverSyncClientsTimed: Sync server now starting UPPER TESTER synchronization ... ****") ;
} else {
log("**** f_serverSyncClientsTimed: Sync server now starting handling of next synchronization point ... ****") ;
log("**** f_serverSyncClientsTimed: Sync server now starting handling of " & p_syncId & " synchronization point ... ****") ;
}
tc_sync.start(p_execTimeLimit) ;
alt{
......@@ -738,6 +747,7 @@ module LibCommon_Sync {
repeat;
}
[] syncPort.receive(m_syncClientReady(p_syncId)) -> sender v_clientRef {
log("**** f_serverSyncClientsTimed: Sync server received READY signal from a client - server will wait for all clients to reach this synchronization point ****") ;
if(not f_isPresentInArray(v_clientRef, v_clientRefs)) {
v_clientRefs[v_noOfRecvdSyncMsgs] := v_clientRef;
v_noOfRecvdSyncMsgs := v_noOfRecvdSyncMsgs + 1;
......@@ -1303,7 +1313,7 @@ module LibCommon_Sync {
function f_serverWaitForAllClientsToShutDown()
runs on ServerSyncComp {
tc_shutDown.start(PX_TSHUT_DOWN_TIME_LIMIT);
tc_shutDown.start(PX_TSHUT_DOWN_TIME_LIMIT);
alt {
[] syncPort.receive {
// clients may still try to send some sync message
......@@ -1311,25 +1321,25 @@ module LibCommon_Sync {
[] all component.done {
tc_shutDown.stop;
log("**** f_serverWaitForAllClientsToShutDown: All components have properly shut down. Sync server will now terminate the test case. ****") ;
}
}
[] tc_shutDown.timeout {
log("**** f_serverWaitForAllClientsToShutDown: Not all clients have properly shutdown within the shut down time limit. Sync server will now terminate test case! ****") ;
}
}
} // end alt
// cover case that shut down default is NOT activated
setverdict(inconc);
//mtc.stop;
syncPort.send(m_syncServerStop) to self; // this MUST be _server_ for the default to catch!
tc_sync.start(PX_TSYNC_TIME_LIMIT);
alt{
[] tc_sync.timeout{
log("**** f_selfSyncStop: Stopping MTC without shutdown - either no shutdown default active or missing syncPort connection ****") ;
setverdict(inconc);
stop ;
}
}//end alt
tc_sync.stop;
stop; // if shutdown default is not activated or if it does not stop
syncPort.send(m_syncServerStop) to self; // this MUST be _server_ for the default to catch!
tc_sync.start(PX_TSYNC_TIME_LIMIT);
alt{
[] tc_sync.timeout{
log("**** f_selfSyncStop: Stopping MTC without shutdown - either no shutdown default active or missing syncPort connection ****") ;
setverdict(inconc);
stop ;
}
}//end alt
tc_sync.stop;
stop; // if shutdown default is not activated or if it does not stop
} // end function f_serverWaitForAllClientsToShutDown
function f_isPresentInArray(in ClientSyncComp p_clientRef, in ClientSyncCompList p_clientRefs)
......
......@@ -11,6 +11,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_TextStrings {
......
......@@ -9,6 +9,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_Time {
......
......@@ -11,6 +11,11 @@
* End users are encouraged to contact the distributers of this
* module regarding their modifications or additions so that future
* updates will include your changes.
* @copyright ETSI Copyright Notification
* No part may be reproduced except as authorized by written permission.
* The copyright and the foregoing restriction extend to reproduction in all media.
* All rights reserved.
*
*/
module LibCommon_VerdictControl {
......