# Conflicts:
#	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
#	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
#	openair2/LAYER2/RLC/rlc.c

 -- in slave job, the lock is now properly done for the whole job
 -- in master job, all slave jobs are really sent in parallel
    they should now now appear as failed (if fails)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

  cherry-picked from 5d4cde09Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

    --- cherry-picked from develop-nr (d354eded)
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Merge remote-tracking branch 'origin/update-asn1c-0a7524184f16e7093990a31d8d4db487a16e5782' into develop_integration_2018_w44

Merge remote-tracking branch 'origin/T-tracer-macpdu2wireshark_w43' into develop_integration_2018_w44

Merge remote-tracking branch 'origin/develop-adding-prefix-to-LTE-RRC' into develop_integration_2018_w44

Merge remote-tracking branch 'origin/359-dlsim-performance-counters' into develop_integration_2018_w44

'raw time' is the tv_sec element in the struct tm
as returned by 'localtime'.

This can be useful to extract events from a dump based on their time.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

Fix the problem that duplicate type names exist in OPEN TYPE.

The following excerpt of ASN.1 of X2AP is one example.

  HandoverRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
    { ID id-Old-eNB-UE-X2AP-ID  CRITICALITY ignore  TYPE UE-X2AP-ID  PRESENCE mandatory}|
    { ID id-New-eNB-UE-X2AP-ID  CRITICALITY ignore  TYPE UE-X2AP-ID  PRESENCE mandatory}|
    ...
  }

Remove a change about MSG2 and MSG4 because this is used not only in L2 FAPI simulator but also in real eNB.

This leads to some logs missing in some situations.
Plus it's not user-friendly.

If you run 'make' in common/utils/T/tracer
just after a clone of the repository then the
compilation will fail because the file ../T_IDs.h
was not generated.

Let's add a simple dependency to fix this.

It is to ease the life of people wanting to record traces to be
consumed later on by wireshark.

You just run: ./record -d ../T_messages.txt -o /tmp/record.raw -on WIRESHARK
and you're good.