From d2c17ce9a04cf8ce445afbcaf8c801c627abc9cb Mon Sep 17 00:00:00 2001 From: Jason Ish Date: Mon, 6 Jun 2016 14:38:56 -0600 Subject: [PATCH] logging: remove output priorities: not used --- src/runmodes.c | 23 +---------------------- src/tm-modules.h | 2 -- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/runmodes.c b/src/runmodes.c index b4f319d408..2d5bc32aa0 100644 --- a/src/runmodes.c +++ b/src/runmodes.c @@ -537,30 +537,9 @@ static void AddOutputToFreeList(OutputModule *module, OutputCtx *output_ctx) TAILQ_INSERT_TAIL(&output_free_list, fl_output, entries); } - -static int GetRunModeOutputPriority(RunModeOutput *module) -{ - TmModule *tm = TmModuleGetByName(module->name); - if (tm == NULL) - return 0; - - return tm->priority; -} - static void InsertInRunModeOutputs(RunModeOutput *runmode_output) { - RunModeOutput *r_output = NULL; - int output_priority = GetRunModeOutputPriority(runmode_output); - - TAILQ_FOREACH(r_output, &RunModeOutputs, entries) { - if (GetRunModeOutputPriority(r_output) < output_priority) - break; - } - if (r_output) { - TAILQ_INSERT_BEFORE(r_output, runmode_output, entries); - } else { - TAILQ_INSERT_TAIL(&RunModeOutputs, runmode_output, entries); - } + TAILQ_INSERT_TAIL(&RunModeOutputs, runmode_output, entries); } /** \brief Turn output into thread module */ diff --git a/src/tm-modules.h b/src/tm-modules.h index e85aa76908..4e29aa3556 100644 --- a/src/tm-modules.h +++ b/src/tm-modules.h @@ -68,8 +68,6 @@ typedef struct TmModule_ { the given TmModule */ /* Other flags used by the module */ uint8_t flags; - /* priority in the logging order, higher priority is runned first */ - uint8_t priority; } TmModule; TmModule tmm_modules[TMM_SIZE];