mirror of https://github.com/OISF/suricata
Undo changes from 88b8f15663. Atomic stack implementation had a-b-a problem.
Victor Julien
14 years ago
parent
88b8f15663
commit
db24258acf
@ -0,0 +1,163 @@
|
|||||||
|
/* Copyright (C) 2007-2012 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>
|
||||||
|
*
|
||||||
|
* Flow queue handler functions
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "suricata-common.h"
|
||||||
|
#include "threads.h"
|
||||||
|
#include "debug.h"
|
||||||
|
#include "flow-private.h"
|
||||||
|
#include "flow-queue.h"
|
||||||
|
#include "flow-util.h"
|
||||||
|
#include "util-error.h"
|
||||||
|
#include "util-debug.h"
|
||||||
|
#include "util-print.h"
|
||||||
|
|
||||||
|
FlowQueue *FlowQueueNew() {
|
||||||
|
FlowQueue *q = (FlowQueue *)SCMalloc(sizeof(FlowQueue));
|
||||||
|
if (q == NULL) {
|
||||||
|
SCLogError(SC_ERR_FATAL, "Fatal error encountered in FlowQueueNew. Exiting...");
|
||||||
|
exit(EXIT_SUCCESS);
|
||||||
|
}
|
||||||
|
q = FlowQueueInit(q);
|
||||||
|
return q;
|
||||||
|
}
|
||||||
|
|
||||||
|
FlowQueue *FlowQueueInit (FlowQueue *q) {
|
||||||
|
if (q != NULL) {
|
||||||
|
memset(q, 0, sizeof(FlowQueue));
|
||||||
|
FQLOCK_INIT(q);
|
||||||
|
}
|
||||||
|
return q;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Destroy a flow queue
|
||||||
|
*
|
||||||
|
* \param q the flow queue to destroy
|
||||||
|
*/
|
||||||
|
void FlowQueueDestroy (FlowQueue *q) {
|
||||||
|
FQLOCK_DESTROY(q);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief add a flow to a queue
|
||||||
|
*
|
||||||
|
* \param q queue
|
||||||
|
* \param f flow
|
||||||
|
*/
|
||||||
|
void FlowEnqueue (FlowQueue *q, Flow *f) {
|
||||||
|
#ifdef DEBUG
|
||||||
|
BUG_ON(q == NULL || f == NULL);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
FQLOCK_LOCK(q);
|
||||||
|
|
||||||
|
/* more flows in queue */
|
||||||
|
if (q->top != NULL) {
|
||||||
|
f->lnext = q->top;
|
||||||
|
q->top->lprev = f;
|
||||||
|
q->top = f;
|
||||||
|
/* only flow */
|
||||||
|
} else {
|
||||||
|
q->top = f;
|
||||||
|
q->bot = f;
|
||||||
|
}
|
||||||
|
q->len++;
|
||||||
|
#ifdef DBG_PERF
|
||||||
|
if (q->len > q->dbg_maxlen)
|
||||||
|
q->dbg_maxlen = q->len;
|
||||||
|
#endif /* DBG_PERF */
|
||||||
|
FQLOCK_UNLOCK(q);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief remove a flow from the queue
|
||||||
|
*
|
||||||
|
* \param q queue
|
||||||
|
*
|
||||||
|
* \retval f flow or NULL if empty list.
|
||||||
|
*/
|
||||||
|
Flow *FlowDequeue (FlowQueue *q) {
|
||||||
|
FQLOCK_LOCK(q);
|
||||||
|
|
||||||
|
Flow *f = q->bot;
|
||||||
|
if (f == NULL) {
|
||||||
|
FQLOCK_UNLOCK(q);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* more packets in queue */
|
||||||
|
if (q->bot->lprev != NULL) {
|
||||||
|
q->bot = q->bot->lprev;
|
||||||
|
q->bot->lnext = NULL;
|
||||||
|
/* just the one we remove, so now empty */
|
||||||
|
} else {
|
||||||
|
q->top = NULL;
|
||||||
|
q->bot = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
BUG_ON(q->len == 0);
|
||||||
|
#endif
|
||||||
|
if (q->len > 0)
|
||||||
|
q->len--;
|
||||||
|
|
||||||
|
f->lnext = NULL;
|
||||||
|
f->lprev = NULL;
|
||||||
|
|
||||||
|
FQLOCK_UNLOCK(q);
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \brief Transfer a flow from a queue to the spare queue
|
||||||
|
*
|
||||||
|
* \param f the flow to be transfered
|
||||||
|
* \param q the source queue, where the flow will be removed. This queue is locked.
|
||||||
|
*
|
||||||
|
* \note spare queue needs locking
|
||||||
|
*/
|
||||||
|
void FlowMoveToSpare(Flow *f)
|
||||||
|
{
|
||||||
|
/* now put it in spare */
|
||||||
|
FQLOCK_LOCK(&flow_spare_q);
|
||||||
|
|
||||||
|
/* add to new queue (append) */
|
||||||
|
f->lprev = flow_spare_q.bot;
|
||||||
|
if (f->lprev != NULL)
|
||||||
|
f->lprev->lnext = f;
|
||||||
|
f->lnext = NULL;
|
||||||
|
flow_spare_q.bot = f;
|
||||||
|
if (flow_spare_q.top == NULL)
|
||||||
|
flow_spare_q.top = f;
|
||||||
|
|
||||||
|
flow_spare_q.len++;
|
||||||
|
#ifdef DBG_PERF
|
||||||
|
if (flow_spare_q.len > flow_spare_q.dbg_maxlen)
|
||||||
|
flow_spare_q.dbg_maxlen = flow_spare_q.len;
|
||||||
|
#endif /* DBG_PERF */
|
||||||
|
|
||||||
|
FQLOCK_UNLOCK(&flow_spare_q);
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,85 @@
|
|||||||
|
/* Copyright (C) 2007-2012 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 __FLOW_QUEUE_H__
|
||||||
|
#define __FLOW_QUEUE_H__
|
||||||
|
|
||||||
|
#include "suricata-common.h"
|
||||||
|
#include "flow.h"
|
||||||
|
|
||||||
|
/** Spinlocks or Mutex for the flow queues. */
|
||||||
|
//#define FQLOCK_SPIN
|
||||||
|
#define FQLOCK_MUTEX
|
||||||
|
|
||||||
|
#ifdef FQLOCK_SPIN
|
||||||
|
#ifdef FQLOCK_MUTEX
|
||||||
|
#error Cannot enable both FQLOCK_SPIN and FQLOCK_MUTEX
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Define a queue for storing flows */
|
||||||
|
typedef struct FlowQueue_
|
||||||
|
{
|
||||||
|
Flow *top;
|
||||||
|
Flow *bot;
|
||||||
|
uint32_t len;
|
||||||
|
#ifdef DBG_PERF
|
||||||
|
uint32_t dbg_maxlen;
|
||||||
|
#endif /* DBG_PERF */
|
||||||
|
#ifdef FQLOCK_MUTEX
|
||||||
|
SCMutex m;
|
||||||
|
#elif defined FQLOCK_SPIN
|
||||||
|
SCSpinlock s;
|
||||||
|
#else
|
||||||
|
#error Enable FQLOCK_SPIN or FQLOCK_MUTEX
|
||||||
|
#endif
|
||||||
|
} FlowQueue;
|
||||||
|
|
||||||
|
#ifdef FQLOCK_SPIN
|
||||||
|
#define FQLOCK_INIT(q) SCSpinInit(&(q)->s, 0)
|
||||||
|
#define FQLOCK_DESTROY(q) SCSpinDestroy(&(q)->s)
|
||||||
|
#define FQLOCK_LOCK(q) SCSpinLock(&(q)->s)
|
||||||
|
#define FQLOCK_TRYLOCK(q) SCSpinTrylock(&(q)->s)
|
||||||
|
#define FQLOCK_UNLOCK(q) SCSpinUnlock(&(q)->s)
|
||||||
|
#elif defined FQLOCK_MUTEX
|
||||||
|
#define FQLOCK_INIT(q) SCMutexInit(&(q)->m, NULL)
|
||||||
|
#define FQLOCK_DESTROY(q) SCMutexDestroy(&(q)->m)
|
||||||
|
#define FQLOCK_LOCK(q) SCMutexLock(&(q)->m)
|
||||||
|
#define FQLOCK_TRYLOCK(q) SCMutexTrylock(&(q)->m)
|
||||||
|
#define FQLOCK_UNLOCK(q) SCMutexUnlock(&(q)->m)
|
||||||
|
#else
|
||||||
|
#error Enable FQLOCK_SPIN or FQLOCK_MUTEX
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* prototypes */
|
||||||
|
FlowQueue *FlowQueueNew();
|
||||||
|
FlowQueue *FlowQueueInit(FlowQueue *);
|
||||||
|
void FlowQueueDestroy (FlowQueue *);
|
||||||
|
|
||||||
|
void FlowEnqueue (FlowQueue *, Flow *);
|
||||||
|
Flow *FlowDequeue (FlowQueue *);
|
||||||
|
|
||||||
|
void FlowMoveToSpare(Flow *);
|
||||||
|
|
||||||
|
#endif /* __FLOW_QUEUE_H__ */
|
||||||
|
|
||||||
@ -1,103 +0,0 @@
|
|||||||
/* Copyright (C) 2007-2012 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>
|
|
||||||
*
|
|
||||||
* Simple low level stack implementation using atomics.
|
|
||||||
*
|
|
||||||
* Data types using this stack should have a ptr of their own type called:
|
|
||||||
* stack_next.
|
|
||||||
*
|
|
||||||
* E.g.
|
|
||||||
* typedef struct MyStruct_ {
|
|
||||||
* int abc;
|
|
||||||
* struct MyStruct_ *stack_next;
|
|
||||||
* } MyStruct;
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __UTIL_STACK_H__
|
|
||||||
#define __UTIL_STACK_H__
|
|
||||||
|
|
||||||
#include "util-atomic.h"
|
|
||||||
|
|
||||||
typedef struct Stack_ {
|
|
||||||
/** stack head ptr */
|
|
||||||
SC_ATOMIC_DECLARE(void *, head);
|
|
||||||
} Stack;
|
|
||||||
|
|
||||||
/** \brief int the stack
|
|
||||||
*
|
|
||||||
* \param stack the stack
|
|
||||||
*/
|
|
||||||
#define STACK_INIT(stack) ({ \
|
|
||||||
SC_ATOMIC_INIT((stack)->head); \
|
|
||||||
})
|
|
||||||
|
|
||||||
/** \brief destroy the stack
|
|
||||||
*
|
|
||||||
* \param stack the stack
|
|
||||||
*/
|
|
||||||
#define STACK_DESTROY(stack) ({ \
|
|
||||||
SC_ATOMIC_DESTROY((stack)->head); \
|
|
||||||
})
|
|
||||||
|
|
||||||
/** \brief check if a stack is empty
|
|
||||||
*
|
|
||||||
* \param stack the stack
|
|
||||||
*
|
|
||||||
* \retval 1 empty
|
|
||||||
* \retval 0 not empty
|
|
||||||
*/
|
|
||||||
#define STACK_EMPTY(stack) \
|
|
||||||
(SC_ATOMIC_GET((stack)->head) == NULL)
|
|
||||||
|
|
||||||
/** \brief pop from the stack
|
|
||||||
*
|
|
||||||
* \param stack the stack
|
|
||||||
* \param type data type
|
|
||||||
*
|
|
||||||
* \retval ptr or NULL
|
|
||||||
*/
|
|
||||||
#define STACK_POP(stack, type) ({ \
|
|
||||||
struct type *ptr; \
|
|
||||||
do { \
|
|
||||||
ptr = (struct type *)SC_ATOMIC_GET((stack)->head); \
|
|
||||||
if (ptr == NULL) { \
|
|
||||||
break; \
|
|
||||||
} \
|
|
||||||
} while (!(SC_ATOMIC_CAS(&(stack)->head, ptr, ptr->stack_next))); \
|
|
||||||
ptr; \
|
|
||||||
})
|
|
||||||
|
|
||||||
/** \brief push to the stack
|
|
||||||
*
|
|
||||||
* \param stack the stack
|
|
||||||
* \param ptr pointer to data to push to the stack
|
|
||||||
* \param type data type
|
|
||||||
*/
|
|
||||||
#define STACK_PUSH(stack, ptr, type) ({ \
|
|
||||||
do { \
|
|
||||||
(ptr)->stack_next = (struct type *)SC_ATOMIC_GET((stack)->head); \
|
|
||||||
} while (!(SC_ATOMIC_CAS(&(stack)->head, (ptr)->stack_next, (ptr)))); \
|
|
||||||
})
|
|
||||||
|
|
||||||
#endif /* __UTIL_STACK_H__ */
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue