aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatias Elo <matias.elo@nokia.com>2023-10-31 15:18:11 +0200
committerMatias Elo <matias.elo@nokia.com>2023-11-06 08:55:31 +0200
commit0f948fc013e643e6da49e7936ffdb31dce63fa20 (patch)
tree17a6df71dfd34f32cbd4bebbe10045f2459a94b6
parent118d2821f732e22e20806a2153a7d327aa643fa0 (diff)
linux-dpdk: timer: use alternate dpdk timer API by default
Change alternate DPDK timer API to be the default as this API matches better to the ODP timer API. For example, threads can process timers stared by any other thread. Signed-off-by: Matias Elo <matias.elo@nokia.com> Reviewed-by: Jere Leppänen <jere.leppanen@nokia.com>
-rw-r--r--.github/workflows/ci-pipeline.yml6
-rw-r--r--config/odp-linux-dpdk.conf4
-rw-r--r--platform/linux-dpdk/test/default-timer.conf (renamed from platform/linux-dpdk/test/alternate-timer.conf)4
3 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 81349afcd..13108c1bf 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -312,13 +312,13 @@ jobs:
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log
- Run_alternate_timer:
+ Run_default_timer:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- run: sudo docker run -i -v `pwd`:/odp --privileged --shm-size 8g -e CC="${CC}" -e ARCH="${ARCH}"
- -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/alternate-timer.conf
- -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/check.sh
+ -e ODP_CONFIG_FILE=/odp/platform/linux-dpdk/test/default-timer.conf
+ -e CONF="${CONF}" $CONTAINER_NAMESPACE/odp-ci-${OS}-${ARCH} /odp/scripts/ci/check_validation.sh
- if: ${{ failure() }}
uses: ./.github/actions/run-failure-log
diff --git a/config/odp-linux-dpdk.conf b/config/odp-linux-dpdk.conf
index de6130362..e2c64c5b3 100644
--- a/config/odp-linux-dpdk.conf
+++ b/config/odp-linux-dpdk.conf
@@ -275,8 +275,8 @@ timer: {
# accordingly.
inline_poll_interval_nsec = 500000
- # Use experimental DPDK alternate timer API based implementation
- alternate = 0
+ # Use DPDK alternate timer API based implementation
+ alternate = 1
}
ipsec: {
diff --git a/platform/linux-dpdk/test/alternate-timer.conf b/platform/linux-dpdk/test/default-timer.conf
index 9cc3a0fc2..d7930cf8d 100644
--- a/platform/linux-dpdk/test/alternate-timer.conf
+++ b/platform/linux-dpdk/test/default-timer.conf
@@ -3,6 +3,6 @@ odp_implementation = "linux-dpdk"
config_file_version = "0.1.24"
timer: {
- # Enable alternate DPDK timer implementation
- alternate = 1
+ # Use DPDK default timer API based implementation
+ alternate = 0
}