Commit 3dca0b01 authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge ttcn/patch_lib_common_titan/ttcn/LibCommon_Sync.ttcn with cygwin branch

parent fa3d8969

ttcn/patch_lib_common_titan/ttcn/LibCommon_Sync.ttcn

+35 −34
Original line number Original line Diff line number Diff line
@@ -625,7 +625,7 @@ module LibCommon_Sync { 
       * @remark User shall stop the component

       * @remark User shall stop the component

       */

       */

      altstep a_shutdown()

      altstep a_shutdown()

      runs on ClientSyncComp {

      runs on BaseSyncComp {

        []  syncPort.receive(m_syncServerStop){

        []  syncPort.receive(m_syncServerStop){

            tc_sync.stop ;

            tc_sync.stop ;

            log("**** a_shutdown: Test component received STOP signal from MTC **** ");

            log("**** a_shutdown: Test component received STOP signal from MTC **** ");
@@ -732,7 +732,7 @@ module LibCommon_Sync { 
        } else if ( p_syncId == c_initDone ) {

        } else if ( p_syncId == c_initDone ) {

          log("**** f_serverSyncClientsTimed: Sync server now starting UPPER TESTER synchronization ... ****") ;

          log("**** f_serverSyncClientsTimed: Sync server now starting UPPER TESTER synchronization ... ****") ;

        } else {

        } 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) ;

        tc_sync.start(p_execTimeLimit) ;

        alt{

        alt{
@@ -747,6 +747,7 @@ module LibCommon_Sync { 
              repeat;

              repeat;

            }

            }

          []  syncPort.receive(m_syncClientReady(p_syncId)) -> sender v_clientRef {

          []  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)) {

              if(not f_isPresentInArray(v_clientRef, v_clientRefs)) {

                  v_clientRefs[v_noOfRecvdSyncMsgs] := v_clientRef;

                  v_clientRefs[v_noOfRecvdSyncMsgs] := v_clientRef;

                  v_noOfRecvdSyncMsgs := v_noOfRecvdSyncMsgs + 1;

                  v_noOfRecvdSyncMsgs := v_noOfRecvdSyncMsgs + 1;