From 068fb700dfacc2fae39b1ca0f58feb00a84dabcc Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Mon, 17 Jan 2022 22:22:49 +0100 Subject: [PATCH] util: fix int warnings in tm threads Ticket: 4516 --- src/tm-threads.c | 4 ++-- src/util-affinity.c | 2 +- src/util-affinity.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tm-threads.c b/src/tm-threads.c index c5561b7cbf..48ce77bd6b 100644 --- a/src/tm-threads.c +++ b/src/tm-threads.c @@ -902,7 +902,7 @@ TmEcode TmThreadSetupOptions(ThreadVars *tv) if (tv->thread_setup_flags & THREAD_SET_AFFTYPE) { ThreadsAffinityType *taf = &thread_affinity[tv->cpu_affinity]; if (taf->mode_flag == EXCLUSIVE_AFFINITY) { - int cpu = AffinityGetNextCPU(taf); + uint16_t cpu = AffinityGetNextCPU(taf); SetCPUAffinity(cpu); /* If CPU is in a set overwrite the default thread prio */ if (CPU_ISSET(cpu, &taf->lowprio_cpu)) { @@ -2343,7 +2343,7 @@ uint16_t TmThreadsGetWorkerThreadMax() SCLogWarning(SC_ERR_RUNMODE, "limited number of 'worker' threads to 1024. Wanted %d", thread_max); thread_max = 1024; } - return thread_max; + return (uint16_t)thread_max; } static inline void ThreadBreakLoop(ThreadVars *tv) diff --git a/src/util-affinity.c b/src/util-affinity.c index 04b96321ce..2ad03e6a73 100644 --- a/src/util-affinity.c +++ b/src/util-affinity.c @@ -294,7 +294,7 @@ void AffinitySetupLoadFromConfig() * \brief Return next cpu to use for a given thread family * \retval the cpu to used given by its id */ -int AffinityGetNextCPU(ThreadsAffinityType *taf) +uint16_t AffinityGetNextCPU(ThreadsAffinityType *taf) { uint16_t ncpu = 0; #if !defined __CYGWIN__ && !defined OS_WIN32 && !defined __OpenBSD__ && !defined sun diff --git a/src/util-affinity.h b/src/util-affinity.h index 92b39b9115..de0ccb1586 100644 --- a/src/util-affinity.h +++ b/src/util-affinity.h @@ -85,7 +85,7 @@ extern ThreadsAffinityType thread_affinity[MAX_CPU_SET]; void AffinitySetupLoadFromConfig(void); ThreadsAffinityType * GetAffinityTypeFromName(const char *name); -int AffinityGetNextCPU(ThreadsAffinityType *taf); +uint16_t AffinityGetNextCPU(ThreadsAffinityType *taf); void BuildCpusetWithCallback(const char *name, ConfNode *node, void (*Callback)(int i, void * data), -- 2.47.2