From e4d60f451b8a226e32a3df8e232efe437b11e2e3 Mon Sep 17 00:00:00 2001 From: Jeff Lucovsky Date: Fri, 11 Feb 2022 08:36:28 -0500 Subject: [PATCH] config/thread: Use config'd per-thread stack size Issue: 4550 This commit checks if there's a config setting for threading.stack-size and assigns the value to a global variable for use during thread creation. --- src/runmodes.c | 19 ++++++++++++++++++- src/runmodes.h | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/runmodes.c b/src/runmodes.c index 1a58687f83..7188086b19 100644 --- a/src/runmodes.c +++ b/src/runmodes.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2013 Open Information Security Foundation +/* Copyright (C) 2007-2022 Open Information Security Foundation * * You can copy, redistribute or modify this Program under the terms of * the GNU General Public License version 2 as published by the Free @@ -58,6 +58,7 @@ int debuglog_enabled = 0; int threading_set_cpu_affinity = FALSE; +uint64_t threading_set_stack_size = 0; /* Runmode Global Thread Names */ const char *thread_name_autofp = "RX"; @@ -945,4 +946,20 @@ void RunModeInitialize(void) } SCLogDebug("threading.detect-thread-ratio %f", threading_detect_ratio); + + /* + * Check if there's a configuration setting for the per-thread stack size + * in case the default per-thread stack size is to be adjusted + */ + const char *ss = NULL; + if ((ConfGetValue("threading.stack-size", &ss)) == 1) { + if (ss != NULL) { + if (ParseSizeStringU64(ss, &threading_set_stack_size) < 0) { + FatalError(SC_ERR_INVALID_ARGUMENT, + "Failed to initialize thread_stack_size output, invalid limit: %s", ss); + } + } + } + + SCLogDebug("threading.stack-size %" PRIu64, threading_set_stack_size); } diff --git a/src/runmodes.h b/src/runmodes.h index 0ea8e48ac1..d9eb24e988 100644 --- a/src/runmodes.h +++ b/src/runmodes.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2013 Open Information Security Foundation +/* Copyright (C) 2007-2022 Open Information Security Foundation * * You can copy, redistribute or modify this Program under the terms of * the GNU General Public License version 2 as published by the Free @@ -115,6 +115,7 @@ int RunModeNeedsBypassManager(void); extern int threading_set_cpu_affinity; extern float threading_detect_ratio; +extern uint64_t threading_set_stack_size; extern int debuglog_enabled;