kern_clock.c:

Remove old disk statistics variables.

vfs_bio.c:
	Enable bowrite now that B_ORDERED works for all buffer devices.
This commit is contained in:
Justin T. Gibbs 1998-09-15 10:05:18 +00:00
parent 26dc5ba614
commit 7ea97031d1
3 changed files with 9 additions and 48 deletions

View File

@ -39,7 +39,7 @@ static volatile int print_tci = 1;
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
* $Id: kern_clock.c,v 1.77 1998/07/11 07:45:39 bde Exp $
* $Id: kern_clock.c,v 1.78 1998/08/05 18:06:40 bde Exp $
*/
#include <sys/param.h>
@ -81,15 +81,6 @@ long cp_time[CPUSTATES];
#else
static long cp_time[CPUSTATES];
#endif
long dk_seek[DK_NDRIVE];
static long dk_time[DK_NDRIVE]; /* time busy (in statclock ticks) */
long dk_wds[DK_NDRIVE];
long dk_wpms[DK_NDRIVE];
long dk_xfer[DK_NDRIVE];
int dk_busy;
int dk_ndrive = 0;
char dk_names[DK_NDRIVE][DK_NAMELEN];
long tk_cancc;
long tk_nin;
@ -408,15 +399,8 @@ statclock(frame)
/*
* We maintain statistics shown by user-level statistics
* programs: the amount of time in each cpu state, and
* the amount of time each of DK_NDRIVE ``drives'' is busy.
*
* XXX should either run linked list of drives, or (better)
* grab timestamps in the start & done code.
* programs: the amount of time in each cpu state.
*/
for (i = 0; i < DK_NDRIVE; i++)
if (dk_busy & (1 << i))
dk_time[i]++;
/*
* We adjust the priority of the current process. The priority of

View File

@ -39,7 +39,7 @@ static volatile int print_tci = 1;
* SUCH DAMAGE.
*
* @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
* $Id: kern_clock.c,v 1.77 1998/07/11 07:45:39 bde Exp $
* $Id: kern_clock.c,v 1.78 1998/08/05 18:06:40 bde Exp $
*/
#include <sys/param.h>
@ -81,15 +81,6 @@ long cp_time[CPUSTATES];
#else
static long cp_time[CPUSTATES];
#endif
long dk_seek[DK_NDRIVE];
static long dk_time[DK_NDRIVE]; /* time busy (in statclock ticks) */
long dk_wds[DK_NDRIVE];
long dk_wpms[DK_NDRIVE];
long dk_xfer[DK_NDRIVE];
int dk_busy;
int dk_ndrive = 0;
char dk_names[DK_NDRIVE][DK_NAMELEN];
long tk_cancc;
long tk_nin;
@ -408,15 +399,8 @@ statclock(frame)
/*
* We maintain statistics shown by user-level statistics
* programs: the amount of time in each cpu state, and
* the amount of time each of DK_NDRIVE ``drives'' is busy.
*
* XXX should either run linked list of drives, or (better)
* grab timestamps in the start & done code.
* programs: the amount of time in each cpu state.
*/
for (i = 0; i < DK_NDRIVE; i++)
if (dk_busy & (1 << i))
dk_time[i]++;
/*
* We adjust the priority of the current process. The priority of

View File

@ -11,7 +11,7 @@
* 2. Absolutely no warranty of function or purpose is made by the author
* John S. Dyson.
*
* $Id: vfs_bio.c,v 1.174 1998/09/04 08:06:55 dfr Exp $
* $Id: vfs_bio.c,v 1.175 1998/09/05 14:13:06 phk Exp $
*/
/*
@ -545,21 +545,14 @@ bawrite(struct buf * bp)
/*
* Ordered write.
* Start output on a buffer, but only wait for it to complete if the
* output device cannot guarantee ordering in some other way. Devices
* that can perform asynchronous ordered writes will set the B_ASYNC
* flag in their strategy routine.
* The buffer is released when the output completes.
* Start output on a buffer, and flag it so that the device will write
* it in the order it was queued. The buffer is released when the output
* completes.
*/
int
bowrite(struct buf * bp)
{
/*
* XXX Add in B_ASYNC once the SCSI
* layer can deal with ordered
* writes properly.
*/
bp->b_flags |= B_ORDERED;
bp->b_flags |= B_ORDERED|B_ASYNC;
return (VOP_BWRITE(bp));
}