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

cleanup: remove unused ringbuffer code

Browse Source
pull/2679/head
Victor Julien 8 years ago
parent cda6e0291f
commit 276125c1ef
9 changed files with 0 additions and 1418 deletions
Show Stats Download Patch File Download Diff File

3
configure.ac
Unescape Escape View File

@ -56,9 +56,6 @@
if test "$gccvernum" -ge "400"; then
dnl gcc 4.0 or later
GCC_CFLAGS="-Wextra -Werror-implicit-function-declaration"
# remove optimization options that break our code
# VJ 2010/06/27: no-tree-pre added. It breaks ringbuffers code.
GCC_CFLAGS="$GCC_CFLAGS -fno-tree-pre"
else
GCC_CFLAGS="-W"
fi

2
src/Makefile.am
Unescape Escape View File

@ -348,7 +348,6 @@ tm-modules.c tm-modules.h \
tmqh-flow.c tmqh-flow.h \
tmqh-nfq.c tmqh-nfq.h \
tmqh-packetpool.c tmqh-packetpool.h \
tmqh-ringbuffer.c tmqh-ringbuffer.h \
tmqh-simple.c tmqh-simple.h \
tm-queuehandlers.c tm-queuehandlers.h \
tm-queues.c tm-queues.h \
@ -436,7 +435,6 @@ util-proto-name.c util-proto-name.h \
util-radix-tree.c util-radix-tree.h \
util-random.c util-random.h \
util-reference-config.c util-reference-config.h \
util-ringbuffer.c util-ringbuffer.h \
util-rohash.c util-rohash.h \
util-rule-vars.c util-rule-vars.h \
util-runmodes.c util-runmodes.h \

2
src/runmode-unittests.c
Unescape Escape View File

@ -93,7 +93,6 @@
#include "util-magic.h"
#include "util-memcmp.h"
#include "util-misc.h"
#include "util-ringbuffer.h"
#include "util-signal.h"
#include "reputation.h"
@ -190,7 +189,6 @@ static void RegisterUnittests(void)
SCProfilingRegisterTests();
#endif
DeStateRegisterTests();
DetectRingBufferRegisterTests();
MemcmpRegisterTests();
DetectEngineHttpClientBodyRegisterTests();
DetectEngineHttpServerBodyRegisterTests();

3
src/tm-queuehandlers.c
Unescape Escape View File

@ -34,7 +34,6 @@
#include "tmqh-nfq.h"
#include "tmqh-packetpool.h"
#include "tmqh-flow.h"
#include "tmqh-ringbuffer.h"
void TmqhSetup (void)
{
@ -44,13 +43,11 @@ void TmqhSetup (void)
TmqhNfqRegister();
TmqhPacketpoolRegister();
TmqhFlowRegister();
TmqhRingBufferRegister();
}
/** \brief Clean up registration time allocs */
void TmqhCleanup(void)
{
TmqhRingBufferDestroy();
}
Tmqh* TmqhGetQueueHandlerByName(char *name)

3
src/tm-queuehandlers.h
Unescape Escape View File

@ -29,9 +29,6 @@ enum {
TMQH_NFQ,
TMQH_PACKETPOOL,
TMQH_FLOW,
TMQH_RINGBUFFER_MRSW,
TMQH_RINGBUFFER_SRSW,
TMQH_RINGBUFFER_SRMW,
TMQH_SIZE,
};

151
src/tmqh-ringbuffer.c
Unescape Escape View File

@ -1,151 +0,0 @@
/* Copyright (C) 2007-2010 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
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author Victor Julien <victor@inliniac.net>
*
* RingBuffer queue handler
*/
#include "suricata.h"
#include "packet-queue.h"
#include "decode.h"
#include "threads.h"
#include "threadvars.h"
#include "tm-queuehandlers.h"
#include "util-ringbuffer.h"
static RingBuffer8 *ringbuffers[256];
Packet *TmqhInputRingBufferMrSw(ThreadVars *t);
void TmqhOutputRingBufferMrSw(ThreadVars *t, Packet *p);
Packet *TmqhInputRingBufferSrSw(ThreadVars *t);
void TmqhOutputRingBufferSrSw(ThreadVars *t, Packet *p);
Packet *TmqhInputRingBufferSrMw(ThreadVars *t);
void TmqhOutputRingBufferSrMw(ThreadVars *t, Packet *p);
void TmqhInputRingBufferShutdownHandler(ThreadVars *);
/**
* \brief TmqhRingBufferRegister
* \initonly
*/
void TmqhRingBufferRegister (void)
{
tmqh_table[TMQH_RINGBUFFER_MRSW].name = "ringbuffer_mrsw";
tmqh_table[TMQH_RINGBUFFER_MRSW].InHandler = TmqhInputRingBufferMrSw;
tmqh_table[TMQH_RINGBUFFER_MRSW].InShutdownHandler = TmqhInputRingBufferShutdownHandler;
tmqh_table[TMQH_RINGBUFFER_MRSW].OutHandler = TmqhOutputRingBufferMrSw;
tmqh_table[TMQH_RINGBUFFER_SRSW].name = "ringbuffer_srsw";
tmqh_table[TMQH_RINGBUFFER_SRSW].InHandler = TmqhInputRingBufferSrSw;
tmqh_table[TMQH_RINGBUFFER_SRSW].InShutdownHandler = TmqhInputRingBufferShutdownHandler;
tmqh_table[TMQH_RINGBUFFER_SRSW].OutHandler = TmqhOutputRingBufferSrSw;
tmqh_table[TMQH_RINGBUFFER_SRMW].name = "ringbuffer_srmw";
tmqh_table[TMQH_RINGBUFFER_SRMW].InHandler = TmqhInputRingBufferSrMw;
tmqh_table[TMQH_RINGBUFFER_SRMW].InShutdownHandler = TmqhInputRingBufferShutdownHandler;
tmqh_table[TMQH_RINGBUFFER_SRMW].OutHandler = TmqhOutputRingBufferSrMw;
memset(ringbuffers, 0, sizeof(ringbuffers));
int i = 0;
for (i = 0; i < 256; i++) {
ringbuffers[i] = RingBuffer8Init();
if (ringbuffers[i] == NULL) {
SCLogError(SC_ERR_FATAL, "Error allocating memory to register Ringbuffers. Exiting...");
exit(EXIT_FAILURE);
}
}
}
void TmqhRingBufferDestroy (void)
{
int i = 0;
for (i = 0; i < 256; i++) {
RingBuffer8Destroy(ringbuffers[i]);
}
}
void TmqhInputRingBufferShutdownHandler(ThreadVars *tv)
{
if (tv == NULL || tv->inq == NULL) {
return;
}
RingBuffer8 *rb = ringbuffers[tv->inq->id];
if (rb == NULL) {
return;
}
RingBuffer8Shutdown(rb);
}
Packet *TmqhInputRingBufferMrSw(ThreadVars *t)
{
RingBuffer8 *rb = ringbuffers[t->inq->id];
Packet *p = (Packet *)RingBufferMrSw8Get(rb);
StatsSyncCountersIfSignalled(t);
return p;
}
void TmqhOutputRingBufferMrSw(ThreadVars *t, Packet *p)
{
RingBuffer8 *rb = ringbuffers[t->outq->id];
RingBufferMrSw8Put(rb, (void *)p);
}
Packet *TmqhInputRingBufferSrSw(ThreadVars *t)
{
RingBuffer8 *rb = ringbuffers[t->inq->id];
Packet *p = (Packet *)RingBufferSrSw8Get(rb);
StatsSyncCountersIfSignalled(t);
return p;
}
void TmqhOutputRingBufferSrSw(ThreadVars *t, Packet *p)
{
RingBuffer8 *rb = ringbuffers[t->outq->id];
RingBufferSrSw8Put(rb, (void *)p);
}
Packet *TmqhInputRingBufferSrMw(ThreadVars *t)
{
RingBuffer8 *rb = ringbuffers[t->inq->id];
Packet *p = (Packet *)RingBufferSrMw8Get(rb);
StatsSyncCountersIfSignalled(t);
return p;
}
void TmqhOutputRingBufferSrMw(ThreadVars *t, Packet *p)
{
RingBuffer8 *rb = ringbuffers[t->outq->id];
RingBufferSrMw8Put(rb, (void *)p);
}

30
src/tmqh-ringbuffer.h
Unescape Escape View File

@ -1,30 +0,0 @@
/* Copyright (C) 2007-2010 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
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author Victor Julien <victor@inliniac.net>
*/
#ifndef __TMQH_RINGBUFFER_H__
#define __TMQH_RINGBUFFER_H__
void TmqhRingBufferRegister (void);
void TmqhRingBufferDestroy (void);
#endif /* __TMQH_RINGBUFFER_H__ */

1088
src/util-ringbuffer.c
View File

File diff suppressed because it is too large Load Diff

136
src/util-ringbuffer.h
Unescape Escape View File

@ -1,136 +0,0 @@
/* Copyright (C) 2007-2010 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
* Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
/**
* \file
*
* \author Victor Julien <victor@inliniac.net>
*
* See the .c file for a full explanation.
*/
#ifndef __UTIL_RINGBUFFER_H__
#include "util-atomic.h"
#include "threads.h"
/** When the ringbuffer is full we have two options, either we spin & sleep
* or we use a pthread condition to wait.
*
* \warning this approach isn't working due to a race condition between the
* time it takes for a thread to enter the condwait and the
* signalling. I've obverved the following case: T1 sees that the
* ringbuffer is empty, so it decides to start the wait condition.
* While it is acquiring the lock and entering the wait, T0 puts a
* number of items in the buffer. For each of these it signals T1.
* However, as that thread isn't in the "wait" mode yet, the signals
* are lost. T0 now is done as well and enters it's own wait
* condition. T1 completes it's "wait" initialization. It waits for
* signals, but T0 won't be able to send them as it's waiting itself.
*/
//#define RINGBUFFER_MUTEX_WAIT
/** \brief ring buffer api
*
* Ring buffer api for a single writer and a single reader. It uses a
* read and write pointer. Only the read ptr needs atomic updating.
*/
#define RING_BUFFER_8_SIZE 256
typedef struct RingBuffer8_ {
SC_ATOMIC_DECLARE(unsigned char, write); /**< idx where we put data */
SC_ATOMIC_DECLARE(unsigned char, read); /**< idx where we read data */
uint8_t shutdown;
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondT wait_cond;
SCMutex wait_mutex;
#endif /* RINGBUFFER_MUTEX_WAIT */
SCSpinlock spin; /**< lock protecting writes for multi writer mode*/
void *array[RING_BUFFER_8_SIZE];
} RingBuffer8;
#define RING_BUFFER_16_SIZE 65536
typedef struct RingBuffer16_ {
SC_ATOMIC_DECLARE(unsigned short, write); /**< idx where we put data */
SC_ATOMIC_DECLARE(unsigned short, read); /**< idx where we read data */
uint8_t shutdown;
#ifdef RINGBUFFER_MUTEX_WAIT
SCCondT wait_cond;
SCMutex wait_mutex;
#endif /* RINGBUFFER_MUTEX_WAIT */
SCSpinlock spin; /**< lock protecting writes for multi writer mode*/
void *array[RING_BUFFER_16_SIZE];
} RingBuffer16;
RingBuffer8 *RingBuffer8Init(void);
void RingBuffer8Destroy(RingBuffer8 *);
RingBuffer16 *RingBufferInit(void);
void RingBufferDestroy(RingBuffer16 *);
int RingBufferIsEmpty(RingBuffer16 *);
int RingBufferIsFull(RingBuffer16 *);
uint16_t RingBufferSize(RingBuffer16 *);
void RingBuffer8Shutdown(RingBuffer8 *);
void RingBufferShutdown(RingBuffer16 *);
void RingBufferWait(RingBuffer16 *rb);
/** Single Reader, Single Writer ring buffer, fixed at
* 256 items so we can use unsigned char's that just
* wrap around */
void *RingBufferSrSw8Get(RingBuffer8 *);
int RingBufferSrSw8Put(RingBuffer8 *, void *);
/** Multiple Reader, Single Writer ring buffer, fixed at
* 256 items so we can use unsigned char's that just
* wrap around */
void *RingBufferMrSw8Get(RingBuffer8 *);
int RingBufferMrSw8Put(RingBuffer8 *, void *);
/** Multiple Reader, Single Writer ring buffer, fixed at
* 65536 items so we can use unsigned shorts that just
* wrap around */
void *RingBufferMrSwGet(RingBuffer16 *);
int RingBufferMrSwPut(RingBuffer16 *, void *);
/** Single Reader, Single Writer ring buffer, fixed at
* 65536 items so we can use unsigned shorts that just
* wrap around */
void *RingBufferSrSwGet(RingBuffer16 *);
int RingBufferSrSwPut(RingBuffer16 *, void *);
/** Multiple Reader, Multi Writer ring buffer, fixed at
* 256 items so we can use unsigned char's that just
* wrap around */
void *RingBufferMrMw8Get(RingBuffer8 *);
int RingBufferMrMw8Put(RingBuffer8 *, void *);
/** Multiple Reader, Multi Writer ring buffer, fixed at
* 65536 items so we can use unsigned char's that just
* wrap around */
void *RingBufferMrMwGet(RingBuffer16 *);
void *RingBufferMrMwGetNoWait(RingBuffer16 *);
int RingBufferMrMwPut(RingBuffer16 *, void *);
void *RingBufferSrMw8Get(RingBuffer8 *);
int RingBufferSrMw8Put(RingBuffer8 *, void *);
void DetectRingBufferRegisterTests(void);
#endif /* __UTIL_RINGBUFFER_H__ */
Write Preview
Loading…
Cancel
Save