From ryoji@safins.ne.jp  Thu Nov  9 04:16:55 2000
Return-Path: <ryoji@safins.ne.jp>
Received: from safins.ne.jp (charley.safins.ne.jp [202.212.16.10])
	by hub.freebsd.org (Postfix) with ESMTP id DDFFC37B479
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Nov 2000 04:16:54 -0800 (PST)
Received: from cusl2 (pppfltan.safins.ne.jp [203.138.125.14])
	by safins.ne.jp (8.9.3/3.7W) with ESMTP id VAA23302
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 9 Nov 2000 21:16:45 +0900
Message-Id: <20001109211517.8F28.RYOJI@safins.ne.jp>
Date: Thu, 09 Nov 2000 21:16:48 +0900
From: takahashi ryoji <ryoji@safins.ne.jp>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] ports/net/ucd-snmp

>Number:         22716
>Category:       ports
>Synopsis:       [PATCH] ports/net/ucd-snmp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    billf
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 09 04:20:00 PST 2000
>Closed-Date:    Wed Nov 7 22:44:18 PST 2001
>Last-Modified:  Wed Nov 07 22:44:40 PST 2001
>Originator:     
>Release:        Release: FreeBSD 4.2-RC1 i386
>Organization:
>Environment:
>Description:
 The value of
 enterprises.ucdavis.memory.memTotalSwap.0
 and
 enterprises.ucdavis.memory.memAvailSwap.0
 is indicated in 1/4.
 
>How-To-Repeat:
>Fix:
 
 diff -urN patch-an.orig patch-an
 
 --- patch-an.orig       Thu Nov  9 14:15:20 2000
 +++ patch-an    Thu Nov  9 13:14:51 2000
 @@ -1,12 +1,50 @@
 ---- agent/mibgroup/ucd-snmp/memory_freebsd2.c~ Tue Mar 14 06:27:00 2000
 -+++ agent/mibgroup/ucd-snmp/memory_freebsd2.c  Wed May 17 11:19:23 2000
 -@@ -10,6 +10,9 @@
 - #include <sys/time.h>
 - #include <sys/proc.h>
 - #include <sys/dkstat.h>
 -+#ifdef freebsd5
 -+#include <sys/bio.h>
 -+#endif
 - #include <sys/buf.h>
 - #include <sys/uio.h>
 - #include <sys/namei.h>
 +*** agent/mibgroup/ucd-snmp/memory_freebsd2.c.orig     Tue Mar 14 06:27:00 2000
 +--- agent/mibgroup/ucd-snmp/memory_freebsd2.c  Thu Nov  9 13:10:24 2000
 +***************
 +*** 10,15 ****
 +--- 10,18 ----
 +  #include <sys/time.h>
 +  #include <sys/proc.h>
 +  #include <sys/dkstat.h>
 ++ #ifdef freebsd5
 ++ #include <sys/bio.h>
 ++ #endif
 +  #include <sys/buf.h>
 +  #include <sys/uio.h>
 +  #include <sys/namei.h>
 +***************
 +*** 148,153 ****
 +--- 151,157 ----
 +      char *header;
 +      int hlen, nswdev, dmmax;
 +      int i, idiv, n;
 ++     int pagesize = getpagesize();
 +      struct swdevt *sw;
 +      long blocksize;
 +      static kvm_t *kd = NULL;
 +***************
 +*** 185,197 ****
 +
 +      /* Convert to kb */
 +      header = getbsize(&hlen, &blocksize);
 +-     idiv = blocksize / 512;
 +
 +!     if (idiv > 0) {
 +!         swapTotal /= idiv;
 +!         swapUsed /= idiv;
 +!         swapFree /= idiv;
 +!     }
 +
 +      free(sw);
 +  }
 +--- 189,198 ----
 +
 +      /* Convert to kb */
 +      header = getbsize(&hlen, &blocksize);
 +
 +!     swapTotal = swapTotal * pagesize / blocksize;
 +!     swapUsed  = swapUsed * pagesize / blocksize;
 +!     swapFree  = swapFree * pagesize / blocksize;
 +
 +      free(sw);
 +  }
 
 
 
>Release-Note:
>Audit-Trail:
Class-Changed-From-To: sw-bug->change-request 
Class-Changed-By: asmodai 
Class-Changed-When: Tue Nov 21 06:52:33 PST 2000 
Class-Changed-Why:  
Misfiled PR. 


Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: asmodai 
Responsible-Changed-When: Tue Nov 21 06:52:33 PST 2000 
Responsible-Changed-Why:  
belongs to ports.  misfiled pr. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22716 
Responsible-Changed-From-To: freebsd-ports->billf 
Responsible-Changed-By: jeh 
Responsible-Changed-When: Tue Feb 13 04:29:44 PST 2001 
Responsible-Changed-Why:  
Over to MAINTAINER 

http://www.freebsd.org/cgi/query-pr.cgi?pr=22716 

From: Edwin Groothuis <edwin@mavetju.org>
To: freebsd-gnats-submit@FreeBSD.org, ryoji@safins.ne.jp
Cc: billf@freebsd.org
Subject: Re: ports/22716: [PATCH] ports/net/ucd-snmp
Date: Thu, 8 Nov 2001 16:23:30 +1100

 [~] edwin@k7>swapinfo 
 Device          1K-blocks     Used    Avail Capacity  Type
 /dev/ad0s1b        267248    35352   231896    13%    Interleaved
 [~] edwin@k7>snmpget localhost public enterprises.ucdavis.memory.memTotalSwap.0
 enterprises.ucdavis.memory.memTotalSwap.0 = 267248
 [~] edwin@k7>snmpget localhost public enterprises.ucdavis.memory.memAvailSwap.0
 enterprises.ucdavis.memory.memAvailSwap.0 = 231896
 
 This PR is probably fixed in an upgrade to the snmp-port version
 4.2.1, if I read the commit message correct at:
 
 http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/net-snmp/net-snmp/agent/mibgroup/ucd-snmp/memory_freebsd2.c?rev=1.21&content-type=text/vnd.viewcvs-markup
 
 This PR can be closed.
 
 Edwin
 
 -- 
 Edwin Groothuis   |              Personal website: http://www.MavEtJu.org
 edwin@mavetju.org |           Interested in MUDs? Visit Fatal Dimensions:
 ------------------+                       http://www.FatalDimensions.org/
State-Changed-From-To: open->closed 
State-Changed-By: billf 
State-Changed-When: Wed Nov 7 22:44:18 PST 2001 
State-Changed-Why:  
ucd-snmp 4.2.1 fixes this. 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=22716 
>Unformatted:
