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

runmodes: constify names

Browse Source
pull/2050/head
Victor Julien 10 years ago
parent f211fa48f4
commit 71018cd2ce
7 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File

2
src/runmode-erf-file.c
Unescape Escape View File

@ -207,7 +207,7 @@ int RunModeErfFileAutoFp(void)
SCLogDebug("tname %s, qname %s", tname, qname); SCLogDebug("tname %s, qname %s", tname, qname);
SCLogDebug("Assigning %s affinity to cpu %u", thread_name, cpu); SCLogDebug("Assigning %s affinity to cpu %u", tname, cpu);
ThreadVars *tv_detect_ncpu = ThreadVars *tv_detect_ncpu =
TmThreadCreatePacketHandler(tname, TmThreadCreatePacketHandler(tname,

20
src/runmodes.c
Unescape Escape View File

@ -59,16 +59,16 @@
int debuglog_enabled = 0; int debuglog_enabled = 0;
/* Runmode Global Thread Names */ /* Runmode Global Thread Names */
char *thread_name_autofp = "RX"; const char *thread_name_autofp = "RX";
char *thread_name_single = "W"; const char *thread_name_single = "W";
char *thread_name_workers = "W"; const char *thread_name_workers = "W";
char *thread_name_verdict = "TX"; const char *thread_name_verdict = "TX";
char *thread_name_flow_mgr = "FM"; const char *thread_name_flow_mgr = "FM";
char *thread_name_flow_rec = "FR"; const char *thread_name_flow_rec = "FR";
char *thread_name_unix_socket = "US"; const char *thread_name_unix_socket = "US";
char *thread_name_detect_loader = "DL"; const char *thread_name_detect_loader = "DL";
char *thread_name_counter_stats = "CS"; const char *thread_name_counter_stats = "CS";
char *thread_name_counter_wakeup = "CW"; const char *thread_name_counter_wakeup = "CW";
/** /**
* \brief Holds description for a runmode. * \brief Holds description for a runmode.

20
src/runmodes.h
Unescape Escape View File

@ -61,16 +61,16 @@ enum {
}; };
/* Run Mode Global Thread Names */ /* Run Mode Global Thread Names */
extern char *thread_name_autofp; extern const char *thread_name_autofp;
extern char *thread_name_single; extern const char *thread_name_single;
extern char *thread_name_workers; extern const char *thread_name_workers;
extern char *thread_name_verdict; extern const char *thread_name_verdict;
extern char *thread_name_flow_mgr; extern const char *thread_name_flow_mgr;
extern char *thread_name_flow_rec; extern const char *thread_name_flow_rec;
extern char *thread_name_unix_socket; extern const char *thread_name_unix_socket;
extern char *thread_name_detect_loader; extern const char *thread_name_detect_loader;
extern char *thread_name_counter_stats; extern const char *thread_name_counter_stats;
extern char *thread_name_counter_wakeup; extern const char *thread_name_counter_wakeup;
char *RunmodeGetActive(void); char *RunmodeGetActive(void);
const char *RunModeGetMainMode(void); const char *RunModeGetMainMode(void);

10
src/tm-threads.c
Unescape Escape View File

@ -1143,7 +1143,7 @@ TmEcode TmThreadSetupOptions(ThreadVars *tv)
* *
* \retval the newly created TV instance, or NULL on error * \retval the newly created TV instance, or NULL on error
*/ */
ThreadVars *TmThreadCreate(char *name, char *inq_name, char *inqh_name, ThreadVars *TmThreadCreate(const char *name, char *inq_name, char *inqh_name,
char *outq_name, char *outqh_name, char *slots, char *outq_name, char *outqh_name, char *slots,
void * (*fn_p)(void *), int mucond) void * (*fn_p)(void *), int mucond)
{ {
@ -1266,7 +1266,7 @@ error:
* *
* \retval the newly created TV instance, or NULL on error * \retval the newly created TV instance, or NULL on error
*/ */
ThreadVars *TmThreadCreatePacketHandler(char *name, char *inq_name, ThreadVars *TmThreadCreatePacketHandler(const char *name, char *inq_name,
char *inqh_name, char *outq_name, char *inqh_name, char *outq_name,
char *outqh_name, char *slots) char *outqh_name, char *slots)
{ {
@ -1296,7 +1296,7 @@ ThreadVars *TmThreadCreatePacketHandler(char *name, char *inq_name,
* *
* \retval the newly created TV instance, or NULL on error * \retval the newly created TV instance, or NULL on error
*/ */
ThreadVars *TmThreadCreateMgmtThread(char *name, void *(fn_p)(void *), ThreadVars *TmThreadCreateMgmtThread(const char *name, void *(fn_p)(void *),
int mucond) int mucond)
{ {
ThreadVars *tv = NULL; ThreadVars *tv = NULL;
@ -1324,7 +1324,7 @@ ThreadVars *TmThreadCreateMgmtThread(char *name, void *(fn_p)(void *),
* *
* \retval the newly created TV instance, or NULL on error * \retval the newly created TV instance, or NULL on error
*/ */
ThreadVars *TmThreadCreateMgmtThreadByName(char *name, char *module, ThreadVars *TmThreadCreateMgmtThreadByName(const char *name, char *module,
int mucond) int mucond)
{ {
ThreadVars *tv = NULL; ThreadVars *tv = NULL;
@ -1357,7 +1357,7 @@ ThreadVars *TmThreadCreateMgmtThreadByName(char *name, char *module,
* *
* \retval the newly created TV instance, or NULL on error * \retval the newly created TV instance, or NULL on error
*/ */
ThreadVars *TmThreadCreateCmdThreadByName(char *name, char *module, ThreadVars *TmThreadCreateCmdThreadByName(const char *name, char *module,
int mucond) int mucond)
{ {
ThreadVars *tv = NULL; ThreadVars *tv = NULL;

10
src/tm-threads.h
Unescape Escape View File

@ -84,14 +84,14 @@ void TmSlotSetFuncAppend(ThreadVars *, TmModule *, void *);
void TmSlotSetFuncAppendDelayed(ThreadVars *, TmModule *, void *, int delayed); void TmSlotSetFuncAppendDelayed(ThreadVars *, TmModule *, void *, int delayed);
TmSlot *TmSlotGetSlotForTM(int); TmSlot *TmSlotGetSlotForTM(int);
ThreadVars *TmThreadCreate(char *, char *, char *, char *, char *, char *, ThreadVars *TmThreadCreate(const char *, char *, char *, char *, char *, char *,
void *(fn_p)(void *), int); void *(fn_p)(void *), int);
ThreadVars *TmThreadCreatePacketHandler(char *, char *, char *, char *, char *, ThreadVars *TmThreadCreatePacketHandler(const char *, char *, char *, char *, char *,
char *); char *);
ThreadVars *TmThreadCreateMgmtThread(char *name, void *(fn_p)(void *), int); ThreadVars *TmThreadCreateMgmtThread(const char *name, void *(fn_p)(void *), int);
ThreadVars *TmThreadCreateMgmtThreadByName(char *name, char *module, ThreadVars *TmThreadCreateMgmtThreadByName(const char *name, char *module,
int mucond); int mucond);
ThreadVars *TmThreadCreateCmdThreadByName(char *name, char *module, ThreadVars *TmThreadCreateCmdThreadByName(const char *name, char *module,
int mucond); int mucond);
TmEcode TmThreadSpawn(ThreadVars *); TmEcode TmThreadSpawn(ThreadVars *);
void TmThreadSetFlags(ThreadVars *, uint8_t); void TmThreadSetFlags(ThreadVars *, uint8_t);

29
src/util-runmodes.c
Unescape Escape View File

@ -102,8 +102,9 @@ char *RunmodeAutoFpCreatePickupQueuesString(int n)
*/ */
int RunModeSetLiveCaptureAutoFp(ConfigIfaceParserFunc ConfigParser, int RunModeSetLiveCaptureAutoFp(ConfigIfaceParserFunc ConfigParser,
ConfigIfaceThreadsCountFunc ModThreadsCount, ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name, const char *recv_mod_name,
char *decode_mod_name, char *thread_name, const char *decode_mod_name,
const char *thread_name,
const char *live_dev) const char *live_dev)
{ {
char tname[TM_THREAD_NAME_MAX]; char tname[TM_THREAD_NAME_MAX];
@ -305,8 +306,8 @@ int RunModeSetLiveCaptureAutoFp(ConfigIfaceParserFunc ConfigParser,
/** /**
*/ */
static int RunModeSetLiveCaptureWorkersForDevice(ConfigIfaceThreadsCountFunc ModThreadsCount, static int RunModeSetLiveCaptureWorkersForDevice(ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name, const char *recv_mod_name,
char *decode_mod_name, char *thread_name, const char *decode_mod_name, const char *thread_name,
const char *live_dev, void *aconf, const char *live_dev, void *aconf,
unsigned char single_mode) unsigned char single_mode)
{ {
@ -401,8 +402,8 @@ static int RunModeSetLiveCaptureWorkersForDevice(ConfigIfaceThreadsCountFunc Mod
int RunModeSetLiveCaptureWorkers(ConfigIfaceParserFunc ConfigParser, int RunModeSetLiveCaptureWorkers(ConfigIfaceParserFunc ConfigParser,
ConfigIfaceThreadsCountFunc ModThreadsCount, ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name, const char *recv_mod_name,
char *decode_mod_name, char *thread_name, const char *decode_mod_name, const char *thread_name,
const char *live_dev) const char *live_dev)
{ {
int nlive = LiveGetDeviceCount(); int nlive = LiveGetDeviceCount();
@ -436,8 +437,8 @@ int RunModeSetLiveCaptureWorkers(ConfigIfaceParserFunc ConfigParser,
int RunModeSetLiveCaptureSingle(ConfigIfaceParserFunc ConfigParser, int RunModeSetLiveCaptureSingle(ConfigIfaceParserFunc ConfigParser,
ConfigIfaceThreadsCountFunc ModThreadsCount, ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name, const char *recv_mod_name,
char *decode_mod_name, char *thread_name, const char *decode_mod_name, const char *thread_name,
const char *live_dev) const char *live_dev)
{ {
int nlive = LiveGetDeviceCount(); int nlive = LiveGetDeviceCount();
@ -471,9 +472,9 @@ int RunModeSetLiveCaptureSingle(ConfigIfaceParserFunc ConfigParser,
/** /**
*/ */
int RunModeSetIPSAutoFp(ConfigIPSParserFunc ConfigParser, int RunModeSetIPSAutoFp(ConfigIPSParserFunc ConfigParser,
char *recv_mod_name, const char *recv_mod_name,
char *verdict_mod_name, const char *verdict_mod_name,
char *decode_mod_name) const char *decode_mod_name)
{ {
SCEnter(); SCEnter();
char tname[TM_THREAD_NAME_MAX]; char tname[TM_THREAD_NAME_MAX];
@ -628,9 +629,9 @@ int RunModeSetIPSAutoFp(ConfigIPSParserFunc ConfigParser,
/** /**
*/ */
int RunModeSetIPSWorker(ConfigIPSParserFunc ConfigParser, int RunModeSetIPSWorker(ConfigIPSParserFunc ConfigParser,
char *recv_mod_name, const char *recv_mod_name,
char *verdict_mod_name, const char *verdict_mod_name,
char *decode_mod_name) const char *decode_mod_name)
{ {
char tname[TM_THREAD_NAME_MAX]; char tname[TM_THREAD_NAME_MAX];
ThreadVars *tv = NULL; ThreadVars *tv = NULL;

28
src/util-runmodes.h
Unescape Escape View File

@ -32,37 +32,37 @@ typedef int (*ConfigIfaceThreadsCountFunc) (void *);
int RunModeSetLiveCaptureAuto(ConfigIfaceParserFunc configparser, int RunModeSetLiveCaptureAuto(ConfigIfaceParserFunc configparser,
ConfigIfaceThreadsCountFunc ModThreadsCount, ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name, const char *recv_mod_name,
char *decode_mod_name, char *thread_name, const char *decode_mod_name, const char *thread_name,
const char *live_dev); const char *live_dev);
int RunModeSetLiveCaptureAutoFp(ConfigIfaceParserFunc configparser, int RunModeSetLiveCaptureAutoFp(ConfigIfaceParserFunc configparser,
ConfigIfaceThreadsCountFunc ModThreadsCount, ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name, const char *recv_mod_name,
char *decode_mod_name, char *thread_name, const char *decode_mod_name, const char *thread_name,
const char *live_dev); const char *live_dev);
int RunModeSetLiveCaptureSingle(ConfigIfaceParserFunc configparser, int RunModeSetLiveCaptureSingle(ConfigIfaceParserFunc configparser,
ConfigIfaceThreadsCountFunc ModThreadsCount, ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name, const char *recv_mod_name,
char *decode_mod_name, char *thread_name, const char *decode_mod_name, const char *thread_name,
const char *live_dev); const char *live_dev);
int RunModeSetLiveCaptureWorkers(ConfigIfaceParserFunc configparser, int RunModeSetLiveCaptureWorkers(ConfigIfaceParserFunc configparser,
ConfigIfaceThreadsCountFunc ModThreadsCount, ConfigIfaceThreadsCountFunc ModThreadsCount,
char *recv_mod_name, const char *recv_mod_name,
char *decode_mod_name, char *thread_name, const char *decode_mod_name, const char *thread_name,
const char *live_dev); const char *live_dev);
int RunModeSetIPSAutoFp(ConfigIPSParserFunc ConfigParser, int RunModeSetIPSAutoFp(ConfigIPSParserFunc ConfigParser,
char *recv_mod_name, const char *recv_mod_name,
char *verdict_mod_name, const char *verdict_mod_name,
char *decode_mod_name); const char *decode_mod_name);
int RunModeSetIPSWorker(ConfigIPSParserFunc ConfigParser, int RunModeSetIPSWorker(ConfigIPSParserFunc ConfigParser,
char *recv_mod_name, const char *recv_mod_name,
char *verdict_mod_name, const char *verdict_mod_name,
char *decode_mod_name); const char *decode_mod_name);
char *RunmodeAutoFpCreatePickupQueuesString(int n); char *RunmodeAutoFpCreatePickupQueuesString(int n);

Write Preview
Loading…
Cancel
Save