From owner-cvs-all@FreeBSD.ORG  Mon Aug  1 17:14:52 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2328D16A41F;
	Mon,  1 Aug 2005 17:14:52 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E6D4143D48;
	Mon,  1 Aug 2005 17:14:51 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j71HEpaM008707;
	Mon, 1 Aug 2005 17:14:51 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j71HEp2W008706;
	Mon, 1 Aug 2005 17:14:51 GMT (envelope-from rwatson)
Message-Id: <200508011714.j71HEp2W008706@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 1 Aug 2005 17:14:51 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/lib/libmemstat memstat.c memstat_internal.h
 memstat_malloc.c memstat_uma.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Aug 2005 17:14:52 -0000

rwatson     2005-08-01 17:14:51 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    lib/libmemstat       memstat.c memstat_internal.h 
                         memstat_malloc.c memstat_uma.c 
  Log:
  Merge memstat.c:1.6, memstat_internal.h:1.6, memstat_malloc.c:1.5,
  memstat_uma.c:1.9 from HEAD to RELENG_6:
  
   Correct two libmemstat(3) bugs:
  
    - Move memory_type_list flushing logic from memstat_mtl_free() to
      _memstat_mtl_empty(), a libmemstat-internal function that can
      be called from other parts of the library.  Invoke
      _memstat_mtl_empty() from memstat_mtl_free(), which also frees
      the containing list structure.
  
      Invoke _memstat_mtl_empty() instead of memstat_mtl_free() in
      various error cases in memstat_malloc.c and memstat_uma.c, which
      previously resulted in the list being freed prematurely.
  
    - Reverse the order of updating the mt_kegfree and mt_free fields
      of the memory_type in memstat_uma.c, otherwise keg free items
      won't be counted properly for non-secondary zones.
  
  Merged to RELENG_6 earlier than the proposed MFC after date so that it
  can make BETA2.
  
  Approved by:    re (kensmith)
  
  Revision  Changes    Path
  1.5.2.2   +8 -1      src/lib/libmemstat/memstat.c
  1.5.2.2   +1 -0      src/lib/libmemstat/memstat_internal.h
  1.4.2.2   +1 -1      src/lib/libmemstat/memstat_malloc.c
  1.7.2.3   +2 -2      src/lib/libmemstat/memstat_uma.c