Commit 2703c420 authored by garciay's avatar garciay
Browse files

Merge Dirk's changes

parent aea7482d

ttcn/LibCommon_Sync.ttcn

+5 −4
Original line number Original line Diff line number Diff line
@@ -715,6 +715,7 @@ module LibCommon_Sync { 
        var boolean v_stopClients := false;

        var boolean v_stopClients := false;

        var ClientSyncCompList v_clientRefs := {}, v_clientRefsIntermediate := {};

        var ClientSyncCompList v_clientRefs := {}, v_clientRefsIntermediate := {};

        var ClientSyncComp v_clientRef;

        var ClientSyncComp v_clientRef;

        var SyncCmd v_clientSyncCmd;





        if ( p_syncId == c_prDone ) {

        if ( p_syncId == c_prDone ) {

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

          log("**** f_serverSyncClientsTimed: Sync server now starting PREAMBLE synchronization ... ****") ;
@@ -727,12 +728,12 @@ module LibCommon_Sync { 
        }

        }

        tc_sync.start(p_execTimeLimit) ;

        tc_sync.start(p_execTimeLimit) ;

        alt{

        alt{

          [v_noOfRecvdSyncMsgsIntermediate != p_NoOfClientIntermediate]  syncPort.receive(m_syncClientReady(p_syncIdIntermediate)) -> sender v_clientRef {

          [v_noOfRecvdSyncMsgsIntermediate != p_NoOfClientIntermediate]  syncPort.receive(m_syncClientReady(p_syncIdIntermediate)) -> value v_clientSyncCmd sender v_clientRef {

              if(not f_isPresentInArray(v_clientRef, v_clientRefsIntermediate)) {

              if(not f_isPresentInArray(v_clientRef, v_clientRefsIntermediate)) {

                  v_clientRefsIntermediate[v_noOfRecvdSyncMsgsIntermediate] := v_clientRef;

                  v_clientRefsIntermediate[v_noOfRecvdSyncMsgsIntermediate] := v_clientRef;

                  v_noOfRecvdSyncMsgsIntermediate := v_noOfRecvdSyncMsgsIntermediate + 1;

                  v_noOfRecvdSyncMsgsIntermediate := v_noOfRecvdSyncMsgsIntermediate + 1;

                  if (v_noOfRecvdSyncMsgsIntermediate == p_NoOfClientIntermediate) {

                  if (v_noOfRecvdSyncMsgsIntermediate == p_NoOfClientIntermediate) {

                      f_serverSendToAllClients(v_clientRefsIntermediate, m_syncServerReady(p_syncIdIntermediate));

                      f_serverSendToAllClients(v_clientRefsIntermediate, m_syncServerReady(v_clientSyncCmd.clientReady.syncPointId));

                  }

                  }

              }

              }

              repeat;

              repeat;
@@ -831,7 +832,7 @@ module LibCommon_Sync { 
       * @see   LibCommon_Sync.f_clientSendStop

       * @see   LibCommon_Sync.f_clientSendStop

       */

       */

      function f_connect4ClientSync()

      function f_connect4ClientSync()

      runs on ClientSyncComp {

      runs on ClientSyncComp mtc BaseSyncComp {

        connect(self:syncPort, mtc:syncPort);

        connect(self:syncPort, mtc:syncPort);

      }// end function f_connect4ClientSync

      }// end function f_connect4ClientSync
@@ -842,7 +843,7 @@ module LibCommon_Sync { 
       * @see   LibCommon_Sync.f_clientSendStop

       * @see   LibCommon_Sync.f_clientSendStop

       */

       */

      function f_disconnect4ClientSync()

      function f_disconnect4ClientSync()

      runs on ClientSyncComp {

      runs on ClientSyncComp mtc BaseSyncComp {

        disconnect(self:syncPort, mtc:syncPort);

        disconnect(self:syncPort, mtc:syncPort);

      }// end function f_disconnect4ClientSync

      }// end function f_disconnect4ClientSync