cvs commit: src/lib/libmemstat memstat.c memstat_internal.h memstat_malloc.c memstat_uma.c

[Robert Watson]

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