[conntrack-tools] conntrackd: add statistics for enospc errors in queues
Pablo Neira
netfilter-cvslog-bounces at lists.netfilter.org
Sat Jun 20 23:32:42 CEST 2009
Gitweb: http://git.netfilter.org/cgi-bin/gitweb.cgi?p=conntrack-tools.git;a=commit;h=90bb19b9eb7d97887883ce480bb4eb12c60d3505
commit 90bb19b9eb7d97887883ce480bb4eb12c60d3505
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Jun 20 21:24:04 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Jun 20 21:24:04 2009 +0200
conntrackd: add statistics for enospc errors in queues
This patch adds a new statistic field to count the number of
enospc errors while adding new nodes to some queue.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit e30be653e677f618e1d6a43edd45392a29c3e92e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Jun 20 21:23:19 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Jun 20 21:23:19 2009 +0200
conntrackd: add statistics about queue node objects
This patch adds the statistics for queue node objects.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit b524c764aba149018fa83dec742c21dc8116838e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Jun 20 21:17:43 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Jun 20 21:17:43 2009 +0200
conntrackd: add `-s queue' to display queue statistics
This patch re-introduces `-s queue' but now it displays generic
queue statistics.
# conntrackd -s queue
active queue objects: 0
queue txqueue:
current elements: 0
maximum elements: 2147483647
not enough space errors: 0
queue rsqueue:
current elements: 72
maximum elements: 128
not enough space errors: 0
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 4cfc8533743a766db0b2c8ae27b7bba312eb3ec0
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Jun 20 21:11:06 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Jun 20 21:11:06 2009 +0200
conntrackd: add the name field to queues
This patch adds the name field to identify the queue by means of
a string. This patch is used by the next one that introduces
per-queue statistics.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit faea76e8bc626549f4d338a3bf22e466336264ca
Author: Pablo Neira Ayuso <pablo at netfilter.org>
AuthorDate: Sat Jun 20 20:07:33 2009 +0200
Commit: Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Sat Jun 20 20:07:33 2009 +0200
conntrackd: rename `-s queue' option by `-s rsqueue'
This patch renames the statistics option that displays the content
of the resend queue which is used by the ftfw mode.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
via 90bb19b9eb7d97887883ce480bb4eb12c60d3505 (commit)
via e30be653e677f618e1d6a43edd45392a29c3e92e (commit)
via b524c764aba149018fa83dec742c21dc8116838e (commit)
via 4cfc8533743a766db0b2c8ae27b7bba312eb3ec0 (commit)
via faea76e8bc626549f4d338a3bf22e466336264ca (commit)
from d9c0564db6b3f3ecb196508458a91b03d45fadb2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 90bb19b9eb7d97887883ce480bb4eb12c60d3505
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Jun 20 21:24:04 2009 +0200
conntrackd: add statistics for enospc errors in queues
This patch adds a new statistic field to count the number of
enospc errors while adding new nodes to some queue.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit e30be653e677f618e1d6a43edd45392a29c3e92e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Jun 20 21:23:19 2009 +0200
conntrackd: add statistics about queue node objects
This patch adds the statistics for queue node objects.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit b524c764aba149018fa83dec742c21dc8116838e
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Jun 20 21:17:43 2009 +0200
conntrackd: add `-s queue' to display queue statistics
This patch re-introduces `-s queue' but now it displays generic
queue statistics.
# conntrackd -s queue
active queue objects: 0
queue txqueue:
current elements: 0
maximum elements: 2147483647
not enough space errors: 0
queue rsqueue:
current elements: 72
maximum elements: 128
not enough space errors: 0
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit 4cfc8533743a766db0b2c8ae27b7bba312eb3ec0
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Jun 20 21:11:06 2009 +0200
conntrackd: add the name field to queues
This patch adds the name field to identify the queue by means of
a string. This patch is used by the next one that introduces
per-queue statistics.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
commit faea76e8bc626549f4d338a3bf22e466336264ca
Author: Pablo Neira Ayuso <pablo at netfilter.org>
Date: Sat Jun 20 20:07:33 2009 +0200
conntrackd: rename `-s queue' option by `-s rsqueue'
This patch renames the statistics option that displays the content
of the resend queue which is used by the ftfw mode.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
-----------------------------------------------------------------------
conntrackd.8 | 3 ++-
include/conntrackd.h | 3 ++-
include/queue.h | 9 ++++++++-
src/main.c | 10 +++++++---
src/queue.c | 39 ++++++++++++++++++++++++++++++++++++++-
src/sync-ftfw.c | 4 ++--
src/sync-mode.c | 5 ++++-
7 files changed, 63 insertions(+), 10 deletions(-)
This patch renames the statistics option that displays the content
of the resend queue which is used by the ftfw mode.
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
diff --git a/conntrackd.8 b/conntrackd.8
index 1342c22..61a3e0e 100644
--- a/conntrackd.8
+++ b/conntrackd.8
@@ -44,7 +44,7 @@ option will not flush your internal and external cache).
.BI "-k "
Kill the daemon
.TP
-.BI "-s " "[|network|cache|runtime|link|queue|process]"
+.BI "-s " "[|network|cache|runtime|link|rsqueue|process]"
Dump statistics. If no parameter is passed, it displays the general statistics.
If "network" is passed as parameter it displays the networking statistics.
If "cache" is passed as parameter, it shows the extended cache statistics.
diff --git a/include/conntrackd.h b/include/conntrackd.h
index 04dc611..40566bd 100644
--- a/include/conntrackd.h
+++ b/include/conntrackd.h
@@ -31,7 +31,7 @@
#define STATS_CACHE 29 /* extended cache stats */
#define STATS_RUNTIME 30 /* extended runtime stats */
#define STATS_LINK 31 /* dedicated link stats */
-#define STATS_QUEUE 32 /* queue stats */
+#define STATS_RSQUEUE 32 /* resend queue stats */
#define FLUSH_INT_CACHE 33 /* flush internal cache */
#define FLUSH_EXT_CACHE 34 /* flush external cache */
#define STATS_PROCESS 35 /* child process stats */
diff --git a/src/main.c b/src/main.c
index 6b320d1..ca491f2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,7 +44,7 @@ static const char usage_client_commands[] =
" -i, display content of the internal cache\n"
" -e, display the content of the external cache\n"
" -k, kill conntrack daemon\n"
- " -s [|network|cache|runtime|link|queue], dump statistics\n"
+ " -s [|network|cache|runtime|link|rsqueue], dump statistics\n"
" -R, resync with kernel conntrack table\n"
" -n, request resync with other node (only FT-FW and NOTRACK modes)\n"
" -x, dump cache in XML format (requires -i or -e)\n"
@@ -210,9 +210,9 @@ int main(int argc, char *argv[])
strlen(argv[i+1])) == 0) {
action = STATS_LINK;
i++;
- } else if (strncmp(argv[i+1], "queue",
+ } else if (strncmp(argv[i+1], "rsqueue",
strlen(argv[i+1])) == 0) {
- action = STATS_QUEUE;
+ action = STATS_RSQUEUE;
i++;
} else if (strncmp(argv[i+1], "process",
strlen(argv[i+1])) == 0) {
diff --git a/src/sync-ftfw.c b/src/sync-ftfw.c
index e026b1c..e7c9af2 100644
--- a/src/sync-ftfw.c
+++ b/src/sync-ftfw.c
@@ -226,7 +226,7 @@ static int ftfw_local(int fd, int type, void *data)
dlog(LOG_NOTICE, "sending bulk update");
cache_iterate(STATE_SYNC(internal), NULL, do_cache_to_tx);
break;
- case STATS_QUEUE:
+ case STATS_RSQUEUE:
ftfw_local_queue(fd);
break;
default:
More information about the netfilter-cvslog
mailing list