From 28ae0c97cdaad9a9ecf11daea53e77d978848e23 Mon Sep 17 00:00:00 2001 From: Bas Stottelaar Date: Fri, 23 Oct 2020 00:35:37 +0200 Subject: [PATCH] sys/*: use DEBUG_EXTRA_STACKSIZE for debug stacks --- sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c | 8 ++------ sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c | 7 +------ sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c | 6 +----- sys/net/gnrc/transport_layer/udp/gnrc_udp.c | 6 +----- 4 files changed, 5 insertions(+), 22 deletions(-) diff --git a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c index c8b424230d..c6ba081b0c 100644 --- a/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c +++ b/sys/net/gnrc/network_layer/ipv6/gnrc_ipv6.c @@ -47,14 +47,10 @@ #define ENABLE_DEBUG 0 #include "debug.h" -#if ENABLE_DEBUG -static char _stack[GNRC_IPV6_STACK_SIZE + THREAD_EXTRA_STACKSIZE_PRINTF]; -#else -static char _stack[GNRC_IPV6_STACK_SIZE]; -#endif - #define _MAX_L2_ADDR_LEN (8U) +static char _stack[GNRC_IPV6_STACK_SIZE + DEBUG_EXTRA_STACKSIZE]; + #ifdef MODULE_FIB /** * @brief buffer to store the entries in the IPv6 forwarding table diff --git a/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c b/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c index e4649a5de7..adb0c69b5e 100644 --- a/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c +++ b/sys/net/gnrc/network_layer/sixlowpan/gnrc_sixlowpan.c @@ -32,12 +32,7 @@ static kernel_pid_t _pid = KERNEL_PID_UNDEF; -#if ENABLE_DEBUG -static char _stack[GNRC_SIXLOWPAN_STACK_SIZE + THREAD_EXTRA_STACKSIZE_PRINTF]; -#else -static char _stack[GNRC_SIXLOWPAN_STACK_SIZE]; -#endif - +static char _stack[GNRC_SIXLOWPAN_STACK_SIZE + DEBUG_EXTRA_STACKSIZE]; /* handles GNRC_NETAPI_MSG_TYPE_RCV commands */ static void _receive(gnrc_pktsnip_t *pkt); diff --git a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c index 6f601e18fe..9ea4b58d6d 100644 --- a/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c +++ b/sys/net/gnrc/transport_layer/tcp/gnrc_tcp_eventloop.c @@ -42,11 +42,7 @@ static msg_t _eventloop_msg_queue[TCP_EVENTLOOP_MSG_QUEUE_SIZE]; /** * @brief Allocate memory for GNRC TCP thread stack. */ -#if ENABLE_DEBUG -static char _stack[TCP_EVENTLOOP_STACK_SIZE + THREAD_EXTRA_STACKSIZE_PRINTF]; -#else -static char _stack[TCP_EVENTLOOP_STACK_SIZE]; -#endif +static char _stack[TCP_EVENTLOOP_STACK_SIZE + DEBUG_EXTRA_STACKSIZE]; /** * @brief Central evtimer for gnrc_tcp event loop diff --git a/sys/net/gnrc/transport_layer/udp/gnrc_udp.c b/sys/net/gnrc/transport_layer/udp/gnrc_udp.c index ae24f7993f..ddf3423e32 100644 --- a/sys/net/gnrc/transport_layer/udp/gnrc_udp.c +++ b/sys/net/gnrc/transport_layer/udp/gnrc_udp.c @@ -42,11 +42,7 @@ static kernel_pid_t _pid = KERNEL_PID_UNDEF; /** * @brief Allocate memory for the UDP thread's stack */ -#if ENABLE_DEBUG -static char _stack[GNRC_UDP_STACK_SIZE + THREAD_EXTRA_STACKSIZE_PRINTF]; -#else -static char _stack[GNRC_UDP_STACK_SIZE]; -#endif +static char _stack[GNRC_UDP_STACK_SIZE + DEBUG_EXTRA_STACKSIZE]; /** * @brief Calculate the UDP checksum dependent on the network protocol