PTP-P1: portable PTPv2 core and ESP32-P4 hardware-timestamped lab broadcaster

.github/workflows/esp32p4-ptp-lab.yml

@@ -0,0 +1,77 @@
+name: ESP32-P4 PTP Lab Profile
+
+on:
+  push:
+    paths:
+      - 'embedded/esp32p4_smv_injector/**'
+      - 'include/ariec61850/time_sync/**'
+      - 'src/time_sync/**'
+      - 'include/ariec61850/ethernet/**'
+      - 'src/ethernet/**'
+      - '.github/workflows/esp32p4-ptp-lab.yml'
+  pull_request:
+    paths:
+      - 'embedded/esp32p4_smv_injector/**'
+      - 'include/ariec61850/time_sync/**'
+      - 'src/time_sync/**'
+      - 'include/ariec61850/ethernet/**'
+      - 'src/ethernet/**'
+      - '.github/workflows/esp32p4-ptp-lab.yml'
+
+permissions:
+  contents: read
+
+jobs:
+  build-esp32p4-ptp:
+    runs-on: ubuntu-latest
+    container:
+      image: espressif/idf:v5.5.4
+    defaults:
+      run:
+        shell: bash
+        working-directory: embedded/esp32p4_smv_injector
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Select ESP32-P4 target
+        run: source /opt/esp/idf/export.sh && idf.py set-target esp32p4
+
+      - name: Enable guarded non-default PTP lab profile
+        shell: bash
+        run: |
+          if grep -q '^# CONFIG_AR_PTP_LAB_TX is not set$' sdkconfig; then
+            sed -i 's/^# CONFIG_AR_PTP_LAB_TX is not set$/CONFIG_AR_PTP_LAB_TX=y/' sdkconfig
+          elif ! grep -q '^CONFIG_AR_PTP_LAB_TX=y$' sdkconfig; then
+            echo 'CONFIG_AR_PTP_LAB_TX=y' >> sdkconfig
+          fi
+
+          if grep -q '^CONFIG_AR_PTP_TRANSPORT_SPECIFIC=' sdkconfig; then
+            sed -i 's/^CONFIG_AR_PTP_TRANSPORT_SPECIFIC=.*/CONFIG_AR_PTP_TRANSPORT_SPECIFIC=1/' sdkconfig
+          else
+            echo 'CONFIG_AR_PTP_TRANSPORT_SPECIFIC=1' >> sdkconfig
+          fi
+
+          if grep -q '^# CONFIG_AR_PTP_VLAN is not set$' sdkconfig; then
+            sed -i 's/^# CONFIG_AR_PTP_VLAN is not set$/CONFIG_AR_PTP_VLAN=y/' sdkconfig
+          elif ! grep -q '^CONFIG_AR_PTP_VLAN=y$' sdkconfig; then
+            echo 'CONFIG_AR_PTP_VLAN=y' >> sdkconfig
+          fi
+
+          if grep -q '^CONFIG_AR_PTP_VLAN_ID=' sdkconfig; then
+            sed -i 's/^CONFIG_AR_PTP_VLAN_ID=.*/CONFIG_AR_PTP_VLAN_ID=100/' sdkconfig
+          else
+            echo 'CONFIG_AR_PTP_VLAN_ID=100' >> sdkconfig
+          fi
+
+          if grep -q '^CONFIG_AR_PTP_VLAN_PRIORITY=' sdkconfig; then
+            sed -i 's/^CONFIG_AR_PTP_VLAN_PRIORITY=.*/CONFIG_AR_PTP_VLAN_PRIORITY=4/' sdkconfig
+          else
+            echo 'CONFIG_AR_PTP_VLAN_PRIORITY=4' >> sdkconfig
+          fi
+
+          source /opt/esp/idf/export.sh
+          idf.py reconfigure
+          grep -E '^CONFIG_AR_PTP_(LAB_TX|DOMAIN|TRANSPORT_SPECIFIC|VLAN|VLAN_ID|VLAN_PRIORITY|ANNOUNCE_INTERVAL_MS|SYNC_INTERVAL_MS)=' sdkconfig
+
+      - name: Build PTP-enabled firmware
+        run: source /opt/esp/idf/export.sh && idf.py build

.github/workflows/ptp-core-ci.yml

@@ -0,0 +1,134 @@
+name: PTP Core CI
+
+on:
+  push:
+    paths:
+      - 'include/ariec61850/time_sync/**'
+      - 'src/time_sync/**'
+      - 'include/ariec61850/ethernet/**'
+      - 'src/ethernet/**'
+      - 'src/capture/pcap.cpp'
+      - 'tools/ptp_analyze.cpp'
+      - 'tests/test_ptp.cpp'
+      - 'tests/ptp_profile/**'
+      - '.github/workflows/ptp-core-ci.yml'
+  pull_request:
+    paths:
+      - 'include/ariec61850/time_sync/**'
+      - 'src/time_sync/**'
+      - 'include/ariec61850/ethernet/**'
+      - 'src/ethernet/**'
+      - 'src/capture/pcap.cpp'
+      - 'tools/ptp_analyze.cpp'
+      - 'tests/test_ptp.cpp'
+      - 'tests/ptp_profile/**'
+      - '.github/workflows/ptp-core-ci.yml'
+
+permissions:
+  contents: read
+
+jobs:
+  portable-ptp:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [gcc, clang]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build PTP strict profile
+        shell: bash
+        run: |
+          if [ "${{ matrix.compiler }}" = "clang" ]; then
+            CXX=clang++
+          else
+            CXX=g++
+          fi
+
+          set +e
+          "$CXX" \
+            -std=c++20 \
+            -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Werror \
+            -pthread \
+            -Iinclude \
+            src/ethernet/ethernet.cpp \
+            src/time_sync/ptp.cpp \
+            src/time_sync/ptp_monitor.cpp \
+            tests/test_ptp.cpp \
+            -o ptp-core-tests \
+            >ptp-build.log 2>&1
+          status=$?
+          set -e
+
+          cat ptp-build.log
+          if [ "$status" -ne 0 ]; then
+            grep -Ei 'error:|fatal error:|undefined reference|collect2: error|ld: error' ptp-build.log | while IFS= read -r line; do
+              escaped=${line//'%'/'%25'}
+              escaped=${escaped//$'\r'/'%0D'}
+              escaped=${escaped//$'\n'/'%0A'}
+              echo "::error::$escaped"
+            done || true
+            exit "$status"
+          fi
+
+      - name: Run PTP regression tests
+        shell: bash
+        run: |
+          set +e
+          ./ptp-core-tests >ptp-test.log 2>&1
+          status=$?
+          set -e
+          cat ptp-test.log
+          if [ "$status" -ne 0 ]; then
+            grep -E '\[FAIL\]|CHECK failed|error' ptp-test.log | while IFS= read -r line; do
+              escaped=${line//'%'/'%25'}
+              escaped=${escaped//$'\r'/'%0D'}
+              escaped=${escaped//$'\n'/'%0A'}
+              echo "::error::$escaped"
+            done || true
+            exit "$status"
+          fi
+
+  portable-ptp-msvc:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Configure standalone strict MSVC PTP profile
+        shell: pwsh
+        run: cmake -S tests/ptp_profile -B build-ptp-msvc -A x64
+
+      - name: Build PTP core and analyzer with diagnostics
+        shell: pwsh
+        run: |
+          function Build-Target([string]$Target) {
+            $output = & cmake --build build-ptp-msvc --config Release --target $Target --parallel 2>&1
+            $status = $LASTEXITCODE
+            $output | Tee-Object -FilePath "ptp-msvc-$Target.log"
+            if ($status -ne 0) {
+              $matched = $false
+              foreach ($line in $output) {
+                $text = "$line"
+                if ($text -match '(?i)(error C\d+|fatal error|error LNK\d+|error MSB\d+|: error )') {
+                  $matched = $true
+                  $escaped = $text.Replace('%','%25').Replace("`r",'%0D').Replace("`n",'%0A')
+                  Write-Output "::error title=MSVC $Target::$escaped"
+                }
+              }
+              if (-not $matched) {
+                Write-Output "::error title=MSVC $Target::Build failed; inspect ptp-msvc-$Target.log in the job output."
+              }
+              exit $status
+            }
+          }
+
+          Build-Target 'ptp_profile_core'
+          Build-Target 'ptp_profile_tests'
+          Build-Target 'ptp_profile_analyze'
+
+      - name: Run PTP regression and analyzer smoke tests on MSVC
+        shell: pwsh
+        run: ctest --test-dir build-ptp-msvc -C Release --output-on-failure

CMakeLists.txt

@@ -14,6 +14,8 @@ option(ARIEC61850_WARNINGS_AS_ERRORS "Treat compiler warnings as errors" ON)
 add_library(ariec61850_core
     src/asn1/ber.cpp
     src/ethernet/ethernet.cpp
+    src/time_sync/ptp.cpp
+    src/time_sync/ptp_monitor.cpp
     src/capture/pcap.cpp
     src/goose/retransmission_schedule.cpp
     src/goose/pdu_codec.cpp
@@ -113,6 +115,12 @@ if(ARIEC61850_BUILD_TOOLS)
     ariec61850_apply_warnings(ariec61850_pcap_interop_check)
     ariec61850_apply_sanitizers(ariec61850_pcap_interop_check)
 
+    add_executable(ariec61850_ptp_analyze tools/ptp_analyze.cpp)
+    target_link_libraries(ariec61850_ptp_analyze PRIVATE ARIEC61850::core)
+    target_compile_features(ariec61850_ptp_analyze PRIVATE cxx_std_20)
+    ariec61850_apply_warnings(ariec61850_ptp_analyze)
+    ariec61850_apply_sanitizers(ariec61850_ptp_analyze)
+
     add_executable(ariec61850_comtrade_inspect tools/comtrade_inspect.cpp)
     target_link_libraries(ariec61850_comtrade_inspect PRIVATE ARIEC61850::core)
     target_compile_features(ariec61850_comtrade_inspect PRIVATE cxx_std_20)
@@ -161,7 +169,7 @@ if(ARIEC61850_BUILD_TESTS)
     ariec61850_apply_sanitizers(ariec61850_core_tests)
     add_test(NAME ariec61850_core_tests COMMAND ariec61850_core_tests)
 
-    foreach(test_name IN ITEMS mms goose sampled_values)
+    foreach(test_name IN ITEMS mms goose sampled_values ptp)
         add_executable(ariec61850_${test_name}_tests tests/test_${test_name}.cpp)
         target_link_libraries(ariec61850_${test_name}_tests PRIVATE ARIEC61850::core)
         target_compile_features(ariec61850_${test_name}_tests PRIVATE cxx_std_20)
@@ -340,6 +348,9 @@ if(ARIEC61850_BUILD_TESTS)
             COMMAND ariec61850_comtrade_inspect
                 ${CMAKE_CURRENT_SOURCE_DIR}/tests/fixtures/comtrade/simple_fault.cfg
                 --json)
+        add_test(
+            NAME ariec61850_ptp_analyze_help
+            COMMAND ariec61850_ptp_analyze --help)
         add_test(
             NAME ariec61850_pagination_probe_help
             COMMAND ariec61850_pagination_probe --help)