aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util-affinity: move properties of *-cpu-set node one layer up in YAML

Browse Source
pull/13397/head
Lukas Sismis 12 months ago committed by Victor Julien
parent fbfced12f2
commit 390baad7dc
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File

10
src/util-affinity.c
Unescape Escape View File

@ -173,8 +173,7 @@ static const char *GetAffinitySetName(const char *val)
static void SetupCpuSets(ThreadsAffinityType *taf, SCConfNode *affinity, const char *setname) static void SetupCpuSets(ThreadsAffinityType *taf, SCConfNode *affinity, const char *setname)
{ {
CPU_ZERO(&taf->cpu_set); CPU_ZERO(&taf->cpu_set);
SCConfNode *cpu_node = SCConfNodeLookupChild(affinity, "cpu");
SCConfNode *cpu_node = SCConfNodeLookupChild(affinity->head.tqh_first, "cpu");
if (cpu_node != NULL) { if (cpu_node != NULL) {
BuildCpuset(setname, cpu_node, &taf->cpu_set); BuildCpuset(setname, cpu_node, &taf->cpu_set);
} else { } else {
@ -233,8 +232,7 @@ static int SetupAffinityPriority(
CPU_ZERO(&taf->lowprio_cpu); CPU_ZERO(&taf->lowprio_cpu);
CPU_ZERO(&taf->medprio_cpu); CPU_ZERO(&taf->medprio_cpu);
CPU_ZERO(&taf->hiprio_cpu); CPU_ZERO(&taf->hiprio_cpu);
SCConfNode *prio_node = SCConfNodeLookupChild(affinity, "prio");
SCConfNode *prio_node = SCConfNodeLookupChild(affinity->head.tqh_first, "prio");
if (prio_node == NULL) { if (prio_node == NULL) {
return 0; return 0;
} }
@ -251,7 +249,7 @@ static int SetupAffinityPriority(
*/ */
static int SetupAffinityMode(ThreadsAffinityType *taf, SCConfNode *affinity) static int SetupAffinityMode(ThreadsAffinityType *taf, SCConfNode *affinity)
{ {
SCConfNode *mode_node = SCConfNodeLookupChild(affinity->head.tqh_first, "mode"); SCConfNode *mode_node = SCConfNodeLookupChild(affinity, "mode");
if (mode_node == NULL) { if (mode_node == NULL) {
return 0; return 0;
} }
@ -273,7 +271,7 @@ static int SetupAffinityMode(ThreadsAffinityType *taf, SCConfNode *affinity)
*/ */
static int SetupAffinityThreads(ThreadsAffinityType *taf, SCConfNode *affinity) static int SetupAffinityThreads(ThreadsAffinityType *taf, SCConfNode *affinity)
{ {
SCConfNode *threads_node = SCConfNodeLookupChild(affinity->head.tqh_first, "threads"); SCConfNode *threads_node = SCConfNodeLookupChild(affinity, "threads");
if (threads_node == NULL) { if (threads_node == NULL) {
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save