Commit a350df71 authored by predusi's avatar predusi
Browse files

updated.

parent a4b55131

javasrc/org/etsi/its/adapter/TracePortPlugin.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class TracePortPlugin extends AbstractPlugin implements ISAPlugin { 
				}

			}

			else {

				return new TriStatusImpl("Unknown file object!");

				return new TriStatusImpl("Unknown file object! Please verify the path of the trace file or of the trace folder!");

			}

		}else if("getTransactionCnt".equals(signatureName)){

			int traceCnt = getTraceCnt();

ttcn/TraceParser/MainModule.ttcn3

+434 −445
Original line number Diff line number Diff line 
module MainModule {

    import from TraceParserSystem all;



//    function f_rsuBehaviour(inout integer p_tranDuration, inout integer p_nrOfEmptyMsg, inout verdicttype p_transVerdict) runs on RsuType {

    function f_rsuBehaviour() runs on RsuType {

        var address v_ts := 0;

        var integer v_startTS := 0;

        var template (present) LinkId v_linkId := ?;

        var boolean v_receivedLinkId := false;

        var boolean v_actionAtOBU := false;

//        var NrOfEmptyMsg v_nrOfEmptyMsg := 0;

        var PayloadStructure v_receivedMsg;

        

        var VerdictStructure v_vs;
@@ -46,7 +44,6 @@ module MainModule { 
                compPort.send(m_stop);

                

                alt{

//                    [] compPort.receive(NrOfEmptyMsg :?) -> value p_nrOfEmptyMsg;

                    [] compPort.receive(NrOfEmptyMsg :?) -> value v_vs.nrOfEmptyMsg;

                    

                    [] compPort.receive {
@@ -105,7 +102,6 @@ module MainModule { 
                transactionRSUTimer.stop;

                setverdict(inconc, "Unexpected message received");

                compPort.send(m_stop);

//                p_transVerdict := getverdict;

                verdictPort.send(m_verdictStructure(getverdict));

                stop;                

            }
@@ -119,7 +115,6 @@ module MainModule { 
                        {setverdict (fail);}

                    }

                compPort.send(m_stop);

//                p_transVerdict := getverdict;

                verdictPort.send(m_verdictStructure(getverdict));

                stop;

            }
@@ -281,7 +276,6 @@ module MainModule { 
        

        connect(mtc:verdictPort, rsuComponent:verdictPort);

        

//        rsuComponent.start(f_rsuBehaviour(p_tranDuration, p_nrOfEmptyMsg, p_transVerdict));

        rsuComponent.start(f_rsuBehaviour());

        obuComponent.start(f_obuBehaviour());
@@ -342,11 +336,6 @@ module MainModule { 
                                 inout integer p_passTran) runs on MtcType system SystemType {        

        map(mtc:controlPort, system:controlPort);



        

//        if(p_failTran != 0 ){

//            p_failTran := (p_failTran * 100)/ p_nrOfTransactions;

//        }

         

        controlPort.call(writeCSVMinMaxErrorRate:{PX_CSV_FILE, p_shortestTransDuration,

                                                p_shortestTransIndex, p_longestTransDuration,

                                                p_longestTransIndex,  p_averageTranDuration,

ttcn/TraceParser/TraceParserSystem.ttcn3

+15 −19
Original line number Diff line number Diff line 
module TraceParserSystem {

    /* @desc Path to file that holds the trace */

    //modulepar charstring PX_TRACE_PATH:= "C:\Demo_Dump2.txt";

    modulepar charstring PX_TRACE_PATH:= "C:\PlugTest\Logs2\1_OBUName_7_2011.txt";

    /* @desc The path to the csv file */

    /* @desc The path to the csv file. Is actually only the base name of the generated csv files.

     *  One will be called ResultTransactions, containing the transaction duration and the empty UL messages

     *  The second is called ResultSummery and contains the summary of a analyzed trace file.*/

    modulepar charstring PX_CSV_FILE:= "C:\PlugTest\Result.csv";

    /* @desc Maximum allowed number of empty uplink frames from the On Board Unit (OBU) */

    modulepar integer PX_MAX_NUM_EMPTY_UPLINK_FRAMES:= 100;
@@ -10,18 +11,13 @@ module TraceParserSystem { 
    //<PowerLevel>_<OBUName>_<DutyCycle>_<RepNo>  

    

    template charstring word := pattern "[^_]+";

//    template charstring filePattern := pattern "({word})_({word})_({word})_({word}).(*)";

    template charstring filePattern := pattern "(*)\\({word})_({word})_({word})_({word}).(*)";

    

    function parseFileName(in charstring p_FileName, out charstring p_Powerlevel, out charstring p_OBUName, out charstring p_DutyCycle, out charstring p_RepNo) runs on MtcType{

        p_Powerlevel := regexp(p_FileName, filePattern, 1);

//        log("p_Powerlevel= " & p_Powerlevel);

        p_OBUName := regexp(p_FileName, filePattern, 2);

//        log("p_OBUName " & p_OBUName);

        p_DutyCycle := regexp(p_FileName, filePattern, 3);

//        log("p_DutyCycle " & p_DutyCycle);

        p_RepNo := regexp(p_FileName, filePattern, 4);

//        log("p_RepNo " & p_RepNo);

    }

javasrc/org/etsi/its/adapter/TraceParser.java

+16 −16

File changed.

Contains only whitespace changes.