* [PATCH conntrack-tools] conntrack: Show multiple CPUs stats from proc
@ 2017-08-21 14:38 Chieh-Min Wang
2017-08-24 14:56 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Chieh-Min Wang @ 2017-08-21 14:38 UTC (permalink / raw)
To: netfilter-devel; +Cc: Chieh-Min Wang
When read cpu conntrack stats from /proc/net/stat/nf_conntrack,
it only shows stats from cpu0.
This patch list all cpus' conntrack stats like what `nfexp_stats_cb` did.
---
src/conntrack.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/conntrack.c b/src/conntrack.c
index 8d19cca..3ec10d6 100644
--- a/src/conntrack.c
+++ b/src/conntrack.c
@@ -1794,6 +1794,7 @@ static int display_proc_conntrack_stats(void)
char buf[4096], *token, *nl;
char output[CT_STATS_ENTRIES_MAX][CT_STATS_STRING_MAX];
unsigned int value[CT_STATS_ENTRIES_MAX], i, max;
+ int cpu;
fd = fopen(CT_STATS_PROC, "r");
if (fd == NULL)
@@ -1817,25 +1818,27 @@ static int display_proc_conntrack_stats(void)
}
max = i;
- if (fgets(buf, sizeof(buf), fd) == NULL) {
- ret = -1;
- goto out_err;
- }
-
- nl = strchr(buf, '\n');
- while (nl != NULL) {
- *nl = '\0';
+ for (cpu=0; fgets(buf, sizeof(buf), fd) != NULL; cpu++) {
nl = strchr(buf, '\n');
+ while (nl != NULL) {
+ *nl = '\0';
+ nl = strchr(buf, '\n');
+ }
+ token = strtok(buf, " ");
+ for (i=0; token != NULL && i<CT_STATS_ENTRIES_MAX; i++) {
+ value[i] = (unsigned int) strtol(token, (char**) NULL, 16);
+ token = strtok(NULL, " ");
+ }
+
+ printf("cpu=%-4u\t", cpu);
+ for (i=0; i<max; i++)
+ printf("%s=%u ", output[i], value[i]);
+ printf("\n");
}
- token = strtok(buf, " ");
- for (i=0; token != NULL && i<CT_STATS_ENTRIES_MAX; i++) {
- value[i] = (unsigned int) strtol(token, (char**) NULL, 16);
- token = strtok(NULL, " ");
+ if (cpu == 0) {
+ ret = -1;
}
- for (i=0; i<max; i++)
- printf("%-10s\t\t%-8u\n", output[i], value[i]);
-
out_err:
fclose(fd);
return ret;
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH conntrack-tools] conntrack: Show multiple CPUs stats from proc
2017-08-21 14:38 [PATCH conntrack-tools] conntrack: Show multiple CPUs stats from proc Chieh-Min Wang
@ 2017-08-24 14:56 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2017-08-24 14:56 UTC (permalink / raw)
To: Chieh-Min Wang; +Cc: netfilter-devel
On Mon, Aug 21, 2017 at 10:38:26PM +0800, Chieh-Min Wang wrote:
> When read cpu conntrack stats from /proc/net/stat/nf_conntrack,
> it only shows stats from cpu0.
>
> This patch list all cpus' conntrack stats like what `nfexp_stats_cb` did.
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-24 14:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-21 14:38 [PATCH conntrack-tools] conntrack: Show multiple CPUs stats from proc Chieh-Min Wang
2017-08-24 14:56 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).