From owner-p4-projects@FreeBSD.ORG Tue Jul 28 23:57:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 525481065672; Tue, 28 Jul 2009 23:57:12 +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 12604106566C for ; Tue, 28 Jul 2009 23:57:12 +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 DA59D8FC0C for ; Tue, 28 Jul 2009 23:57:11 +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 n6SNvBOU056871 for ; Tue, 28 Jul 2009 23:57:11 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6SNvBOA056869 for perforce@freebsd.org; Tue, 28 Jul 2009 23:57:11 GMT (envelope-from pgj@FreeBSD.org) Date: Tue, 28 Jul 2009 23:57:11 GMT Message-Id: <200907282357.n6SNvBOA056869@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 166706 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: Tue, 28 Jul 2009 23:57:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=166706 Change 166706 by pgj@petymeg-current on 2009/07/28 23:57:02 - Standardize DDP statistics. - Export statistics via sysctl(3) [net.ddp.stats] - Add header. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/sys/netatalk/ddp_input.c#2 edit .. //depot/projects/soc2009/pgj_libstat/src/sys/netatalk/ddp_var.h#2 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/sys/netatalk/ddp_input.c#2 (text+ko) ==== @@ -60,8 +60,10 @@ #include #include #include +#include #include #include +#include #include #include @@ -74,8 +76,19 @@ static volatile int ddp_forward = 1; static volatile int ddp_firewall = 0; + +static struct stat_header ddpstat_header = { + .sth_version = DDPSTAT_VERSION, + .sth_len = sizeof(struct ddpstat) +}; static struct ddpstat ddpstat; +SYSCTL_NODE(_net, OID_AUTO, ddp, CTLFLAG_RW, 0, "DDP"); +SYSCTL_STRUCT(_net_ddp, OID_AUTO, stats, CTLFLAG_RW, &ddpstat, ddpstat, + "DDP Statistics (struct ddpstat, netatalk/ddp_var.h)"); +SYSCTL_STRUCT(_net_ddp, OID_AUTO, stats_header, CTLFLAG_RD, &ddpstat_header, + stat_header, "DDP Statistics header"); + static struct route forwro; static void ddp_input(struct mbuf *, struct ifnet *, struct elaphdr *, int); ==== //depot/projects/soc2009/pgj_libstat/src/sys/netatalk/ddp_var.h#2 (text+ko) ==== @@ -40,17 +40,19 @@ #define sotoddpcb(so) ((struct ddpcb *)(so)->so_pcb) +#define DDPSTAT_VERSION 0x00000001 + struct ddpstat { - long ddps_short; /* short header packets received */ - long ddps_long; /* long header packets received */ - long ddps_nosum; /* no checksum */ - long ddps_badsum; /* bad checksum */ - long ddps_tooshort; /* packet too short */ - long ddps_toosmall; /* not enough data */ - long ddps_forward; /* packets forwarded */ - long ddps_encap; /* packets encapsulated */ - long ddps_cantforward; /* packets rcvd for unreachable dest */ - long ddps_nosockspace; /* no space in sockbuf for packet */ + u_int64_t ddps_short; /* short header packets received */ + u_int64_t ddps_long; /* long header packets received */ + u_int64_t ddps_nosum; /* no checksum */ + u_int64_t ddps_badsum; /* bad checksum */ + u_int64_t ddps_tooshort; /* packet too short */ + u_int64_t ddps_toosmall; /* not enough data */ + u_int64_t ddps_forward; /* packets forwarded */ + u_int64_t ddps_encap; /* packets encapsulated */ + u_int64_t ddps_cantforward; /* packets rcvd for unreachable dest */ + u_int64_t ddps_nosockspace; /* no space in sockbuf for packet */ }; #ifdef _KERNEL