From owner-p4-projects@FreeBSD.ORG Fri Jul 31 22:07:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A01161065675; Fri, 31 Jul 2009 22:07:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61559106566C for ; Fri, 31 Jul 2009 22:07:50 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 501658FC19 for ; Fri, 31 Jul 2009 22:07:50 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6VM7oOJ090570 for ; Fri, 31 Jul 2009 22:07:50 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6VM7ox6090568 for perforce@freebsd.org; Fri, 31 Jul 2009 22:07:50 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 31 Jul 2009 22:07:50 GMT Message-Id: <200907312207.n6VM7ox6090568@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 166879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 Jul 2009 22:07:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=166879 Change 166879 by pgj@petymeg-current on 2009/07/31 22:07:36 - Standardize forwarding statistics. - Add header. - Merge rttrash into struct rtstat for the ease of use. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/sys/net/route.c#2 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/net/route.h#2 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/sys/net/route.c#2 (text+ko) ==== @@ -90,8 +90,18 @@ TUNABLE_INT("net.add_addr_allfibs", &rt_add_addr_allfibs); #ifdef VIMAGE_GLOBALS +static struct stat_header rtstat_header = { + .sth_version = RTSTAT_VERSION, + .sth_len = sizeof(struct rtstat) +}; static struct rtstat rtstat; +SYSCTL_STRUCT(_net_inet_ip, OID_AUTO, rtstat, CTLFLAG_RW, &rtstat, rtstat, + "IPv4 Forwarding Statistics (struct rtstat, net/route.h)"); + +SYSCTL_STRUCT(_net_inet_ip, OID_AUTO, rtstat_header, CTLFLAG_RD, &rtstat_header, + stat_header, "IPv4 Forwarding Statistics header"); + /* by default only the first 'row' of tables will be accessed. */ /* * XXXMRT When we fix netstat, and do this differnetly, @@ -101,7 +111,7 @@ */ struct radix_node_head *rt_tables[RT_MAXFIBS][AF_MAX+1]; -static int rttrash; /* routes not in table but not freed */ +#define rttrash rtstat.rts_trash #endif static void rt_maskedcopy(struct sockaddr *, @@ -460,7 +470,7 @@ INIT_VNET_NET(curvnet); struct rtentry *rt, *rt0 = NULL; int error = 0; - short *stat = NULL; + u_int64_t *stat = NULL; struct rt_addrinfo info; struct ifaddr *ifa; struct radix_node_head *rnh = ==== //depot/projects/soc2009/pgj_libstat/src/sys/net/route.h#2 (text+ko) ==== @@ -210,12 +210,15 @@ /* * Routing statistics. */ +#define RTSTAT_VERSION 0x00000001 + struct rtstat { - short rts_badredirect; /* bogus redirect calls */ - short rts_dynamic; /* routes created by redirects */ - short rts_newgateway; /* routes modified by redirects */ - short rts_unreach; /* lookups which failed */ - short rts_wildcard; /* lookups satisfied by a wildcard */ + u_int64_t rts_badredirect; /* bogus redirect calls */ + u_int64_t rts_dynamic; /* routes created by redirects */ + u_int64_t rts_newgateway; /* routes modified by redirects */ + u_int64_t rts_unreach; /* lookups which failed */ + u_int64_t rts_wildcard; /* lookups satisfied by a wildcard */ + u_int64_t rts_trash; /* routes not in table but not freed */ }; /* * Structures for routing messages.