===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/systat/vmstat.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/systat/vmstat.c	2002/04/29 17:28:12	1.34
--- src/usr.bin/systat/vmstat.c	2002/06/18 00:46:48	1.35
***************
*** 1,4 ****
! /*	$OpenBSD: vmstat.c,v 1.34 2002/04/29 17:28:12 millert Exp $	*/
  /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: vmstat.c,v 1.35 2002/06/18 00:46:48 deraadt Exp $	*/
  /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
  
  /*-
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
  #endif
! static char rcsid[] = "$OpenBSD: vmstat.c,v 1.34 2002/04/29 17:28:12 millert Exp $";
  #endif /* not lint */
  
  /*
--- 38,44 ----
  #if 0
  static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
  #endif
! static char rcsid[] = "$OpenBSD: vmstat.c,v 1.35 2002/06/18 00:46:48 deraadt Exp $";
  #endif /* not lint */
  
  /*
***************
*** 118,124 ****
  struct	utmp utmp;
  
  WINDOW *
! openkre()
  {
  
  	ut = open(_PATH_UTMP, O_RDONLY);
--- 118,124 ----
  struct	utmp utmp;
  
  WINDOW *
! openkre(void)
  {
  
  	ut = open(_PATH_UTMP, O_RDONLY);
***************
*** 128,135 ****
  }
  
  void
! closekre(w)
! 	WINDOW *w;
  {
  
  	(void) close(ut);
--- 128,134 ----
  }
  
  void
! closekre(WINDOW *w)
  {
  
  	(void) close(ut);
***************
*** 141,158 ****
  
  
  static struct nlist namelist[] = {
! #define	X_HZ		0
! 	{ "_hz" },
! #define	X_INTRNAMES	1
  	{ "_intrnames" },
! #define	X_EINTRNAMES	2
  	{ "_eintrnames" },
! #define	X_INTRCNT	3
  	{ "_intrcnt" },
! #define	X_EINTRCNT	4
  	{ "_eintrcnt" },
  #if defined(__i386__)
! #define	X_INTRHAND	5
  	{ "_intrhand" },
  #endif
  	{ "" },
--- 140,155 ----
  
  
  static struct nlist namelist[] = {
! #define	X_INTRNAMES	0
  	{ "_intrnames" },
! #define	X_EINTRNAMES	1
  	{ "_eintrnames" },
! #define	X_INTRCNT	2
  	{ "_intrcnt" },
! #define	X_EINTRCNT	3
  	{ "_eintrcnt" },
  #if defined(__i386__)
! #define	X_INTRHAND	4
  	{ "_intrhand" },
  #endif
  	{ "" },
***************
*** 185,191 ****
  #define	DRIVESPACE	45	/* max space for drives */
  
  int
! initkre()
  {
  	char *intrnamebuf, *cp;
  	int i, ret;
--- 182,188 ----
  #define	DRIVESPACE	45	/* max space for drives */
  
  int
! initkre(void)
  {
  	char *intrnamebuf, *cp;
  	int i, ret;
***************
*** 271,277 ****
  }
  
  void
! fetchkre()
  {
  	time_t now;
  
--- 268,274 ----
  }
  
  void
! fetchkre(void)
  {
  	time_t now;
  
***************
*** 281,287 ****
  }
  
  void
! labelkre()
  {
  	int i, j, l;
  
--- 278,284 ----
  }
  
  void
! labelkre(void)
  {
  	int i, j, l;
  
***************
*** 350,359 ****
  	}
  }
  
! #define X(fld)	{t=s.fld[i]; s.fld[i]-=s1.fld[i]; if(state==TIME) s1.fld[i]=t;}
! #define Y(fld)	{t = s.fld; s.fld -= s1.fld; if(state == TIME) s1.fld = t;}
  #define Z(fld)	{t = s.nchstats.fld; s.nchstats.fld -= s1.nchstats.fld; \
! 	if(state == TIME) s1.nchstats.fld = t;}
  #define PUTRATE(fld, l, c, w) \
  	Y(fld); \
  	putint((int)((float)s.fld/etime + 0.5), l, c, w)
--- 347,356 ----
  	}
  }
  
! #define X(fld)	{t=s.fld[i]; s.fld[i]-=s1.fld[i]; if (state==TIME) s1.fld[i]=t;}
! #define Y(fld)	{t = s.fld; s.fld -= s1.fld; if (state == TIME) s1.fld = t;}
  #define Z(fld)	{t = s.nchstats.fld; s.nchstats.fld -= s1.nchstats.fld; \
! 	if (state == TIME) s1.nchstats.fld = t;}
  #define PUTRATE(fld, l, c, w) \
  	Y(fld); \
  	putint((int)((float)s.fld/etime + 0.5), l, c, w)
***************
*** 363,369 ****
  static	char cpuorder[CPUSTATES] = { CP_SYS, CP_USER, CP_NICE, CP_IDLE };
  
  void
! showkre()
  {
  	float f1, f2;
  	int psiz, inttotal;
--- 360,366 ----
  static	char cpuorder[CPUSTATES] = { CP_SYS, CP_USER, CP_NICE, CP_IDLE };
  
  void
! showkre(void)
  {
  	float f1, f2;
  	int psiz, inttotal;
***************
*** 373,379 ****
  	if (state == TIME)
  		dkswap();
  	etime = 0;
! 	for(i = 0; i < CPUSTATES; i++) {
  		X(time);
  		etime += s.time[i];
  	}
--- 370,376 ----
  	if (state == TIME)
  		dkswap();
  	etime = 0;
! 	for (i = 0; i < CPUSTATES; i++) {
  		X(time);
  		etime += s.time[i];
  	}
***************
*** 510,516 ****
  			c += 1 + l;
  			dinfo(i, c);
  		}
! 	/* and pad the DRIVESPACE */ 
  	l = DRIVESPACE - c;
  	for (i = 0; i < 5; i++)
  		mvprintw(DISKROW + i, DISKCOL + 5 + c, "%*s", l, "");
--- 507,513 ----
  			c += 1 + l;
  			dinfo(i, c);
  		}
! 	/* and pad the DRIVESPACE */
  	l = DRIVESPACE - c;
  	for (i = 0; i < 5; i++)
  		mvprintw(DISKROW + i, DISKCOL + 5 + c, "%*s", l, "");
***************
*** 531,538 ****
  }
  
  int
! cmdkre(cmd, args)
! 	char *cmd, *args;
  {
  
  	if (prefix(cmd, "run")) {
--- 528,534 ----
  }
  
  int
! cmdkre(char *cmd, char *args)
  {
  
  	if (prefix(cmd, "run")) {
***************
*** 559,565 ****
  
  /* calculate number of users on the system */
  static int
! ucount()
  {
  	int nusers = 0;
  
--- 555,561 ----
  
  /* calculate number of users on the system */
  static int
! ucount(void)
  {
  	int nusers = 0;
  
***************
*** 574,581 ****
  }
  
  static float
! cputime(indx)
! 	int indx;
  {
  	double t;
  	int i;
--- 570,576 ----
  }
  
  static float
! cputime(int indx)
  {
  	double t;
  	int i;
***************
*** 589,596 ****
  }
  
  static void
! putint(n, l, c, w)
! 	int n, l, c, w;
  {
  	char b[128];
  
--- 584,590 ----
  }
  
  static void
! putint(int n, int l, int c, int w)
  {
  	char b[128];
  
***************
*** 610,618 ****
  }
  
  static void
! putfloat(f, l, c, w, d, nz)
! 	double f;
! 	int l, c, w, d, nz;
  {
  	char b[128];
  
--- 604,610 ----
  }
  
  static void
! putfloat(double f, int l, int c, int w, int d, int nz)
  {
  	char b[128];
  
***************
*** 632,640 ****
  }
  
  static void
! getinfo(s, st)
! 	struct Info *s;
! 	enum state st;
  {
  	static int cp_time_mib[] = { CTL_KERN, KERN_CPTIME };
  	static int nchstats_mib[2] = { CTL_KERN, KERN_NCHSTATS };
--- 624,630 ----
  }
  
  static void
! getinfo(struct Info *s, enum state st)
  {
  	static int cp_time_mib[] = { CTL_KERN, KERN_CPTIME };
  	static int nchstats_mib[2] = { CTL_KERN, KERN_NCHSTATS };
***************
*** 686,693 ****
  }
  
  static void
! allocinfo(s)
! 	struct Info *s;
  {
  
  	s->intrcnt = (long *) malloc(nintr * sizeof(long));
--- 676,682 ----
  }
  
  static void
! allocinfo(struct Info *s)
  {
  
  	s->intrcnt = (long *) malloc(nintr * sizeof(long));
***************
*** 696,703 ****
  }
  
  static void
! copyinfo(from, to)
! 	struct Info *from, *to;
  {
  	long *intrcnt;
  
--- 685,691 ----
  }
  
  static void
! copyinfo(struct Info *from, struct Info *to)
  {
  	long *intrcnt;
  
***************
*** 707,714 ****
  }
  
  static void
! dinfo(dn, c)
! 	int dn, c;
  {
  	double words, atime;
  
--- 695,701 ----
  }
  
  static void
! dinfo(int dn, int c)
  {
  	double words, atime;