===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vmstat/dkstats.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/vmstat/dkstats.c	2019/06/28 13:35:05	1.41
--- src/usr.bin/vmstat/dkstats.c	2024/05/06 16:54:22	1.42
***************
*** 1,4 ****
! /*	$OpenBSD: dkstats.c,v 1.41 2019/06/28 13:35:05 deraadt Exp $	*/
  /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: dkstats.c,v 1.42 2024/05/06 16:54:22 cheloha Exp $	*/
  /*	$NetBSD: dkstats.c,v 1.1 1996/05/10 23:19:27 thorpej Exp $	*/
  
  /*
***************
*** 101,111 ****
  int		*dk_select;
  char		**dr_name;
  
- /* Missing from <sys/time.h> */
- #define timerset(tvp, uvp) \
- 	((uvp)->tv_sec = (tvp)->tv_sec);		\
- 	((uvp)->tv_usec = (tvp)->tv_usec)
- 
  #define SWAP(fld)	tmp = cur.fld;				\
  			cur.fld -= last.fld;			\
  			last.fld = tmp
--- 101,106 ----
***************
*** 135,145 ****
  		SWAP(dk_wbytes[i]);
  
  		/* Delta Time. */
! 		timerclear(&tmp_timer);
! 		timerset(&(cur.dk_time[i]), &tmp_timer);
! 		timersub(&tmp_timer, &(last.dk_time[i]), &(cur.dk_time[i]));
! 		timerclear(&(last.dk_time[i]));
! 		timerset(&tmp_timer, &(last.dk_time[i]));
  	}
  	for (i = 0; i < CPUSTATES; i++) {
  		long ltmp;
--- 130,138 ----
  		SWAP(dk_wbytes[i]);
  
  		/* Delta Time. */
! 		tmp_timer = cur.dk_time[i];
! 		timersub(&tmp_timer, &last.dk_time[i], &cur.dk_time[i]);
! 		last.dk_time[i] = tmp_timer;
  	}
  	for (i = 0; i < CPUSTATES; i++) {
  		long ltmp;
***************
*** 370,376 ****
  			cur.dk_seek[i] = q[i].ds_seek;
  			cur.dk_rbytes[i] = q[i].ds_rbytes;
  			cur.dk_wbytes[i] = q[i].ds_wbytes;
! 			timerset(&(q[i].ds_time), &(cur.dk_time[i]));
  		}
  		free(q);
  
--- 363,369 ----
  			cur.dk_seek[i] = q[i].ds_seek;
  			cur.dk_rbytes[i] = q[i].ds_rbytes;
  			cur.dk_wbytes[i] = q[i].ds_wbytes;
! 			cur.dk_time[i] = q[i].ds_time;
  		}
  		free(q);
  
***************
*** 408,414 ****
  			cur.dk_seek[i] = cur_disk.dk_seek;
  			cur.dk_rbytes[i] = cur_disk.dk_rbytes;
  			cur.dk_wbytes[i] = cur_disk.dk_wbytes;
! 			timerset(&(cur_disk.dk_time), &(cur.dk_time[i]));
  			p = TAILQ_NEXT(&cur_disk, dk_link);
  		}
  		deref_nl(X_CP_TIME, cur.cp_time, sizeof(cur.cp_time));
--- 401,407 ----
  			cur.dk_seek[i] = cur_disk.dk_seek;
  			cur.dk_rbytes[i] = cur_disk.dk_rbytes;
  			cur.dk_wbytes[i] = cur_disk.dk_wbytes;
! 			cur.dk_time[i] = cur_disk.dk_time;
  			p = TAILQ_NEXT(&cur_disk, dk_link);
  		}
  		deref_nl(X_CP_TIME, cur.cp_time, sizeof(cur.cp_time));