From ab476259d875e8352a4ef23c2d25b0e67161c771 Mon Sep 17 00:00:00 2001 From: Dimitri Staessens Date: Sun, 10 May 2026 18:53:02 +0200 Subject: build: Remove deprecated cmake options RXM_BUFFER_ON_HEAP and SSM_POOL_BLOCKS were no longer used. Signed-off-by: Dimitri Staessens Signed-off-by: Sander Vrijders --- .ci/woodpecker/10-build.yaml | 11 ++++------- cmake/config/lib.cmake | 2 -- cmake/config/ssm.cmake | 2 -- src/lib/config.h.in | 1 - src/lib/ssm/ssm.h.in | 1 - 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.ci/woodpecker/10-build.yaml b/.ci/woodpecker/10-build.yaml index 0a82c469..6c26c812 100644 --- a/.ci/woodpecker/10-build.yaml +++ b/.ci/woodpecker/10-build.yaml @@ -88,13 +88,10 @@ steps: done done - for rxm_heap in TRUE FALSE; do - for rxm_block in TRUE FALSE; do - echo "--- HEAP=$rxm_heap BLOCKING=$rxm_block ---" - run_build \ - -DRXM_BUFFER_ON_HEAP=$rxm_heap \ - -DRXM_BLOCKING=$rxm_block - done + for rxm_block in TRUE FALSE; do + echo "--- BLOCKING=$rxm_block ---" + run_build \ + -DRXM_BLOCKING=$rxm_block done diff --git a/cmake/config/lib.cmake b/cmake/config/lib.cmake index 7e685ce0..1e863013 100644 --- a/cmake/config/lib.cmake +++ b/cmake/config/lib.cmake @@ -64,8 +64,6 @@ set(FRCT_TICK_TIME 5000 CACHE STRING "Tick time for FRCT activity (retransmission, acknowledgments) (us)") # Retransmission (RXM) configuration -set(RXM_BUFFER_ON_HEAP FALSE CACHE BOOL - "Store packets for retransmission on the heap instead of in packet buffer") set(RXM_BLOCKING TRUE CACHE BOOL "Use blocking writes for retransmission") set(RXM_MIN_RESOLUTION 20 CACHE STRING diff --git a/cmake/config/ssm.cmake b/cmake/config/ssm.cmake index c1f34655..aa369e53 100644 --- a/cmake/config/ssm.cmake +++ b/cmake/config/ssm.cmake @@ -15,8 +15,6 @@ set(SSM_PUP_NAME_FMT "/${SSM_PREFIX}.pup.%d" CACHE INTERNAL # Packet buffer configuration set(SSM_POOL_NAME "/${SHM_PREFIX}.pool" CACHE INTERNAL "Name for the main POSIX shared memory pool") -set(SSM_POOL_BLOCKS 16384 CACHE STRING - "Number of blocks in SSM packet pool, must be a power of 2") set(SSM_PK_BUFF_HEADSPACE 256 CACHE STRING "Bytes of headspace to reserve for future headers") set(SSM_PK_BUFF_TAILSPACE 32 CACHE STRING diff --git a/src/lib/config.h.in b/src/lib/config.h.in index 9376c902..9142f9df 100644 --- a/src/lib/config.h.in +++ b/src/lib/config.h.in @@ -82,7 +82,6 @@ #define TICTIME (@FRCT_TICK_TIME@ * 1000) /* ns */ /* Retransmission tuning */ -#cmakedefine RXM_BUFFER_ON_HEAP #cmakedefine RXM_BLOCKING #define RXMQ_RES (@RXM_MIN_RESOLUTION@) /* 2^N ns */ diff --git a/src/lib/ssm/ssm.h.in b/src/lib/ssm/ssm.h.in index 4ac9a21b..b86327a1 100644 --- a/src/lib/ssm/ssm.h.in +++ b/src/lib/ssm/ssm.h.in @@ -38,7 +38,6 @@ #define SSM_RBUFF_PREFIX "@SSM_RBUFF_PREFIX@" #define SSM_FLOW_SET_PREFIX "@SSM_FLOW_SET_PREFIX@" #define SSM_POOL_NAME "@SSM_POOL_NAME@" -#define SSM_POOL_BLOCKS @SSM_POOL_BLOCKS@ #define SSM_RBUFF_SIZE @SSM_RBUFF_SIZE@ /* Packet buffer space reservation */ -- cgit v1.2.3