From owner-p4-projects@FreeBSD.ORG Sun Aug 1 10:04:02 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B98081065675; Sun, 1 Aug 2010 10:04:02 +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 65954106566B for ; Sun, 1 Aug 2010 10:04:02 +0000 (UTC) (envelope-from aman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 38CFB8FC12 for ; Sun, 1 Aug 2010 10:04:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o71A42c5063621 for ; Sun, 1 Aug 2010 10:04:02 GMT (envelope-from aman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o71A42i9063619 for perforce@freebsd.org; Sun, 1 Aug 2010 10:04:02 GMT (envelope-from aman@freebsd.org) Date: Sun, 1 Aug 2010 10:04:02 GMT Message-Id: <201008011004.o71A42i9063619@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to aman@freebsd.org using -f From: Aman Jassal To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 181673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Aug 2010 10:04:03 -0000 http://p4web.freebsd.org/@@181673?ac=10 Change 181673 by aman@src on 2010/08/01 10:03:29 Reverting pim_var.h to its previous state. Reviewed by:pgj Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/pim_var.h#6 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/sys/netinet/pim_var.h#6 (text+ko) ==== @@ -51,24 +51,22 @@ #define PIMSTAT_VERSION 0x00000001 struct pimstat { - counter_t pims_rcv_total_msgs; /* total PIM messages received */ - counter_t pims_rcv_total_bytes; /* total PIM bytes received */ - counter_t pims_rcv_tooshort; /* rcvd with too few bytes */ - counter_t pims_rcv_badsum; /* rcvd with bad checksum */ - counter_t pims_rcv_badversion; /* rcvd bad PIM version */ - counter_t pims_rcv_registers_msgs; /* rcvd regs. msgs (data only) */ - counter_t pims_rcv_registers_bytes; /* rcvd regs. bytes (data only) */ - counter_t pims_rcv_registers_wrongiif; /* rcvd regs. on wrong iif */ - counter_t pims_rcv_badregisters; /* rcvd invalid registers */ - counter_t pims_snd_registers_msgs; /* sent regs. msgs (data only) */ - counter_t pims_snd_registers_bytes; /* sent regs. bytes (data only) */ + uint64_t pims_rcv_total_msgs; /* total PIM messages received */ + uint64_t pims_rcv_total_bytes; /* total PIM bytes received */ + uint64_t pims_rcv_tooshort; /* rcvd with too few bytes */ + uint64_t pims_rcv_badsum; /* rcvd with bad checksum */ + uint64_t pims_rcv_badversion; /* rcvd bad PIM version */ + uint64_t pims_rcv_registers_msgs; /* rcvd regs. msgs (data only) */ + uint64_t pims_rcv_registers_bytes; /* rcvd regs. bytes (data only) */ + uint64_t pims_rcv_registers_wrongiif; /* rcvd regs. on wrong iif */ + uint64_t pims_rcv_badregisters; /* rcvd invalid registers */ + uint64_t pims_snd_registers_msgs; /* sent regs. msgs (data only) */ + uint64_t pims_snd_registers_bytes; /* sent regs. bytes (data only) */ }; #ifdef _KERNEL -#define PIMSTAT_INIT(name) ctr_init(&V_pimstat.name, 0) -#define PIMSTAT_DESTROY(name) ctr_destroy(&V_pimstat.name) -#define PIMSTAT_ADD(name, val) ctr_add(&V_pimstat.name, val) -#define PIMSTAT_INC(name) ctr_inc(&V_pimstat.name) +#define PIMSTAT_ADD(name, val) V_pimstat.name += (val) +#define PIMSTAT_INC(name) PIMSTAT_ADD(name, 1) #endif /*