Page MenuHomeFreeBSD
Files F151121384

D42949.id131132.diff
No OneTemporary
Actions

D42949.id131132.diff
View Options

diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c
--- a/sys/netinet/siftr.c
+++ b/sys/netinet/siftr.c
@@ -134,6 +134,7 @@
* data fields such that the line length could exceed the below value.
*/
#define MAX_LOG_MSG_LEN 300
+#define MAX_LOG_BATCH_SIZE 3
/* XXX: Make this a sysctl tunable. */
#define SIFTR_ALQ_BUFLEN (1000*MAX_LOG_MSG_LEN)
@@ -445,10 +446,10 @@
{
STAILQ_HEAD(pkthead, pkt_node) tmp_pkt_queue =
STAILQ_HEAD_INITIALIZER(tmp_pkt_queue);
- struct pkt_node *pkt_node, *pkt_node_temp;
+ struct pkt_node *pkt_node;
uint8_t draining;
struct ale *log_buf;
- int ret_sz, cnt;
+ int ret_sz, cnt = 0;
char *bufp;
draining = 2;
@@ -485,17 +486,12 @@
*/
mtx_unlock(&siftr_pkt_mgr_mtx);
-try_again:
- pkt_node = STAILQ_FIRST(&tmp_pkt_queue);
- if (pkt_node != NULL) {
- if (STAILQ_NEXT(pkt_node, nodes) != NULL) {
- cnt = 3;
- } else {
- cnt = 1;
- }
+ while ((pkt_node = STAILQ_FIRST(&tmp_pkt_queue)) != NULL) {
- log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN * cnt,
- ALQ_WAITOK);
+ log_buf = alq_getn(siftr_alq, MAX_LOG_MSG_LEN *
+ ((STAILQ_NEXT(pkt_node, nodes) != NULL) ?
+ MAX_LOG_BATCH_SIZE : 1),
+ ALQ_WAITOK);
if (log_buf != NULL) {
log_buf->ae_bytesused = 0;
@@ -509,27 +505,24 @@
}
/* Flush all pkt_nodes to the log file. */
- STAILQ_FOREACH_SAFE(pkt_node, &tmp_pkt_queue, nodes,
- pkt_node_temp) {
+ STAILQ_FOREACH(pkt_node, &tmp_pkt_queue, nodes) {
if (log_buf != NULL) {
ret_sz = siftr_process_pkt(pkt_node,
bufp);
bufp += ret_sz;
log_buf->ae_bytesused += ret_sz;
- cnt--;
- }
-
- STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes);
- free(pkt_node, M_SIFTR_PKTNODE);
-
- if (cnt <= 0 && !STAILQ_EMPTY(&tmp_pkt_queue)) {
- alq_post_flags(siftr_alq, log_buf, 0);
- goto try_again;
}
+ if (++cnt >= MAX_LOG_BATCH_SIZE)
+ break;
}
if (log_buf != NULL) {
alq_post_flags(siftr_alq, log_buf, 0);
}
+ for (;cnt > 0; cnt--) {
+ pkt_node = STAILQ_FIRST(&tmp_pkt_queue);
+ STAILQ_REMOVE_HEAD(&tmp_pkt_queue, nodes);
+ free(pkt_node, M_SIFTR_PKTNODE);
+ }
}
KASSERT(STAILQ_EMPTY(&tmp_pkt_queue),

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 5:41 AM (7 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31011195
Default Alt Text
D42949.id131132.diff (2 KB)

Event Timeline