===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/mbufs.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/systat/mbufs.c	2008/12/31 05:37:24	1.21
--- src/usr.bin/systat/mbufs.c	2009/01/27 09:18:37	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: mbufs.c,v 1.21 2008/12/31 05:37:24 canacar Exp $ */
  /*
   * Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: mbufs.c,v 1.22 2009/01/27 09:18:37 dlg Exp $ */
  /*
   * Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org>
   *
***************
*** 65,70 ****
--- 65,71 ----
  	{"ALIVE", 3, 5, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0},
  	{"LWM", 3, 5, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0},
  	{"HWM", 3, 5, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0},
+ 	{"CWM", 3, 5, 1, FLD_ALIGN_RIGHT, -1, 0, 0, 0},
  };
  
  
***************
*** 78,83 ****
--- 79,85 ----
  #define FLD_MB_MALIVE	FIELD_ADDR(5)
  #define FLD_MB_MLWM	FIELD_ADDR(6)
  #define FLD_MB_MHWM	FIELD_ADDR(7)
+ #define FLD_MB_MCWM	FIELD_ADDR(8)
  
  
  /* Define views */
***************
*** 87,93 ****
  	FLD_MB_RXDELAY, FLD_MB_TXDELAY,
  #endif
  	FLD_MB_LLOCKS, FLD_MB_MSIZE, FLD_MB_MALIVE, FLD_MB_MLWM, FLD_MB_MHWM,
! 	NULL
  };
  
  /* Define view managers */
--- 89,95 ----
  	FLD_MB_RXDELAY, FLD_MB_TXDELAY,
  #endif
  	FLD_MB_LLOCKS, FLD_MB_MSIZE, FLD_MB_MALIVE, FLD_MB_MLWM, FLD_MB_MHWM,
! 	FLD_MB_MCWM, NULL
  };
  
  /* Define view managers */
***************
*** 268,274 ****
  			continue;
  		}
  
- 		mp->mcl_size = pool.pr_size;
  		mp->mcl_alive = pool.pr_nget - pool.pr_nput;
  		mp->mcl_hwm = pool.pr_hiwat;
  	}
--- 270,275 ----
***************
*** 281,288 ****
  		int pnd = num_disp;
  		for (p = 0; p < mclpool_count; p++) {
  			struct mclpool *mp = &ifi->data.ifi_mclpool[p];
- 			if (mp->mcl_size != (ushort)mclpools[p].size)
- 				break;
  			if (mp->mcl_alive == 0)
  				continue;
  			num_disp++;
--- 282,287 ----
***************
*** 311,318 ****
  
  		for (p = 0; p < mclpool_count; p++) {
  			struct mclpool *mp = &ifi->data.ifi_mclpool[p];
- 			if (mp->mcl_size != (ushort)mclpools[p].size)
- 				break;
  			if (mp->mcl_alive == 0)
  				continue;
  			if (n++ >= dispstart) {
--- 310,315 ----
***************
*** 367,372 ****
--- 364,371 ----
  			print_fld_size(FLD_MB_MLWM, mp->mcl_lwm);
  		if (mp->mcl_hwm)
  			print_fld_size(FLD_MB_MHWM, mp->mcl_hwm);
+ 		if (mp->mcl_cwm)
+ 			print_fld_size(FLD_MB_MCWM, mp->mcl_cwm);
  	}
  
  	end_line();