Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANSIfy.

Browse Source
This commit is contained in:
simonb 2000-11-30 23:59:03 +00:00
parent 75f2f8f242
commit 80bd9216d2
4 changed files with 83 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libexec/rpc.rstatd/rstat_proc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rstat_proc.c,v 1.36 2000/11/29 11:18:34 simonb Exp $ */ /* $NetBSD: rstat_proc.c,v 1.37 2000/11/30 23:59:03 simonb Exp $ */
/* /*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@ -35,7 +35,7 @@
static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro"; static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";
static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC"; static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";
#else #else
__RCSID("$NetBSD: rstat_proc.c,v 1.36 2000/11/29 11:18:34 simonb Exp $"); __RCSID("$NetBSD: rstat_proc.c,v 1.37 2000/11/30 23:59:03 simonb Exp $");
#endif #endif
#endif #endif
@ -380,7 +380,7 @@ rstat_service(struct svc_req *rqstp, SVCXPRT *transp)
} argument; } argument;
char *result; char *result;
xdrproc_t xdr_argument, xdr_result; xdrproc_t xdr_argument, xdr_result;
char *(*local) __P((void *, struct svc_req *)); char *(*local)(void *, struct svc_req *);
switch (rqstp->rq_proc) { switch (rqstp->rq_proc) {
case NULLPROC: case NULLPROC:
@ -392,15 +392,15 @@ rstat_service(struct svc_req *rqstp, SVCXPRT *transp)
xdr_result = (xdrproc_t)xdr_statstime; xdr_result = (xdrproc_t)xdr_statstime;
switch (rqstp->rq_vers) { switch (rqstp->rq_vers) {
case RSTATVERS_ORIG: case RSTATVERS_ORIG:
local = (char *(*) __P((void *, struct svc_req *))) local = (char *(*)(void *, struct svc_req *))
rstatproc_stats_1_svc; rstatproc_stats_1_svc;
break; break;
case RSTATVERS_SWTCH: case RSTATVERS_SWTCH:
local = (char *(*) __P((void *, struct svc_req *))) local = (char *(*)(void *, struct svc_req *))
rstatproc_stats_2_svc; rstatproc_stats_2_svc;
break; break;
case RSTATVERS_TIME: case RSTATVERS_TIME:
local = (char *(*) __P((void *, struct svc_req *))) local = (char *(*)(void *, struct svc_req *))
rstatproc_stats_3_svc; rstatproc_stats_3_svc;
break; break;
default: default:
@ -414,15 +414,15 @@ rstat_service(struct svc_req *rqstp, SVCXPRT *transp)
xdr_result = (xdrproc_t)xdr_u_int; xdr_result = (xdrproc_t)xdr_u_int;
switch (rqstp->rq_vers) { switch (rqstp->rq_vers) {
case RSTATVERS_ORIG: case RSTATVERS_ORIG:
local = (char *(*) __P((void *, struct svc_req *))) local = (char *(*)(void *, struct svc_req *))
rstatproc_havedisk_1_svc; rstatproc_havedisk_1_svc;
break; break;
case RSTATVERS_SWTCH: case RSTATVERS_SWTCH:
local = (char *(*) __P((void *, struct svc_req *))) local = (char *(*)(void *, struct svc_req *))
rstatproc_havedisk_2_svc; rstatproc_havedisk_2_svc;
break; break;
case RSTATVERS_TIME: case RSTATVERS_TIME:
local = (char *(*) __P((void *, struct svc_req *))) local = (char *(*)(void *, struct svc_req *))
rstatproc_havedisk_3_svc; rstatproc_havedisk_3_svc;
break; break;
default: default:

22
usr.bin/vmstat/dkstats.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dkstats.c,v 1.9 2000/07/07 15:13:25 itojun Exp $ */ /* $NetBSD: dkstats.c,v 1.10 2000/11/30 23:59:04 simonb Exp $ */
/* /*
* Copyright (c) 1996 John M. Vinopal * Copyright (c) 1996 John M. Vinopal
@ -97,10 +97,10 @@ char **dr_name;
#define timerset(tvp, uvp) ((uvp)->tv_sec = (tvp)->tv_sec); \ #define timerset(tvp, uvp) ((uvp)->tv_sec = (tvp)->tv_sec); \
((uvp)->tv_usec = (tvp)->tv_usec) ((uvp)->tv_usec = (tvp)->tv_usec)
void dkswap __P((void)); void dkswap(void);
void dkreadstats __P((void)); void dkreadstats(void);
int dkinit __P((int, gid_t)); int dkinit(int, gid_t);
static void deref_kptr __P((void *, void *, size_t)); static void deref_kptr(void *, void *, size_t);
/* /*
* Take the delta between the present values and the last recorded * Take the delta between the present values and the last recorded
@ -108,7 +108,7 @@ static void deref_kptr __P((void *, void *, size_t));
* the delta values in the 'cur' structure. * the delta values in the 'cur' structure.
*/ */
void void
dkswap() dkswap(void)
{ {
u_int64_t tmp; u_int64_t tmp;
int i; int i;
@ -149,7 +149,7 @@ dkswap()
* Also collect statistics for tty i/o and cpu ticks. * Also collect statistics for tty i/o and cpu ticks.
*/ */
void void
dkreadstats() dkreadstats(void)
{ {
struct disk cur_disk, *p; struct disk cur_disk, *p;
size_t ssize; size_t ssize;
@ -190,9 +190,7 @@ dkreadstats()
* track disk statistics. * track disk statistics.
*/ */
int int
dkinit(select, egid) dkinit(int select, gid_t egid)
int select;
gid_t egid;
{ {
gid_t oldgid; gid_t oldgid;
struct disklist_head disk_head; struct disklist_head disk_head;
@ -283,9 +281,7 @@ dkinit(select, egid)
* and the size of the copy passed in `len'. * and the size of the copy passed in `len'.
*/ */
static void static void
deref_kptr(kptr, ptr, len) deref_kptr(void *kptr, void *ptr, size_t len)
void *kptr, *ptr;
size_t len;
{ {
char buf[128]; char buf[128];

97
usr.bin/vmstat/vmstat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vmstat.c,v 1.72 2000/11/30 12:02:19 simonb Exp $ */ /* $NetBSD: vmstat.c,v 1.73 2000/11/30 23:59:04 simonb Exp $ */
/*- /*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@ -80,7 +80,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1991, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95"; static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 3/1/95";
#else #else
__RCSID("$NetBSD: vmstat.c,v 1.72 2000/11/30 12:02:19 simonb Exp $"); __RCSID("$NetBSD: vmstat.c,v 1.73 2000/11/30 23:59:04 simonb Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -160,7 +160,7 @@ extern char **dr_name;
extern int *dk_select, dk_ndrive; extern int *dk_select, dk_ndrive;
struct uvmexp uvmexp, ouvmexp; struct uvmexp uvmexp, ouvmexp;
int ndrives; int ndrives;
int winlines = 20; int winlines = 20;
@ -175,31 +175,31 @@ kvm_t *kd;
#define HISTLIST 0x40 #define HISTLIST 0x40
#define HISTDUMP 0x80 #define HISTDUMP 0x80
void cpustats __P((void)); void cpustats(void);
void dkstats __P((void)); void dkstats(void);
void doevcnt __P((int verbose)); void doevcnt(int verbose);
void dointr __P((int verbose)); void dointr(int verbose);
void domem __P((void)); void domem(void);
void dopool __P((void)); void dopool(void);
void dosum __P((void)); void dosum(void);
void dovmstat __P((u_int, int)); void dovmstat(u_int, int);
void kread __P((int, void *, size_t)); void kread(int, void *, size_t);
void needhdr __P((int)); void needhdr(int);
long getuptime __P((void)); long getuptime(void);
void printhdr __P((void)); void printhdr(void);
long pct __P((long, long)); long pct(long, long);
void usage __P((void)); void usage(void);
void doforkst __P((void)); void doforkst(void);
void hist_traverse __P((int, const char *)); void hist_traverse(int, const char *);
void hist_dodump __P((struct uvm_history *)); void hist_dodump(struct uvm_history *);
int main __P((int, char **)); int main(int, char **);
char **choosedrives __P((char **)); char **choosedrives(char **);
extern int dkinit __P((int, gid_t)); extern int dkinit(int, gid_t);
extern void dkreadstats __P((void)); extern void dkreadstats(void);
extern void dkswap __P((void)); extern void dkswap(void);
/* Namelist and memory file names. */ /* Namelist and memory file names. */
char *nlistf, *memf; char *nlistf, *memf;
@ -208,9 +208,7 @@ char *nlistf, *memf;
#define BACKWARD_COMPATIBILITY #define BACKWARD_COMPATIBILITY
int int
main(argc, argv) main(int argc, char **argv)
int argc;
char **argv;
{ {
int c, todo, verbose; int c, todo, verbose;
u_int interval; u_int interval;
@ -364,8 +362,7 @@ main(argc, argv)
} }
char ** char **
choosedrives(argv) choosedrives(char **argv)
char **argv;
{ {
int i; int i;
@ -399,7 +396,7 @@ choosedrives(argv)
} }
long long
getuptime() getuptime(void)
{ {
static time_t now; static time_t now;
static struct timeval boottime; static struct timeval boottime;
@ -420,9 +417,7 @@ getuptime()
int hz, hdrcnt; int hz, hdrcnt;
void void
dovmstat(interval, reps) dovmstat(u_int interval, int reps)
u_int interval;
int reps;
{ {
struct vmtotal total; struct vmtotal total;
time_t uptime, halfuptime; time_t uptime, halfuptime;
@ -497,7 +492,7 @@ dovmstat(interval, reps)
} }
void void
printhdr() printhdr(void)
{ {
int i; int i;
@ -523,16 +518,14 @@ printhdr()
* Force a header to be prepended to the next output. * Force a header to be prepended to the next output.
*/ */
void void
needhdr(dummy) needhdr(int dummy)
int dummy;
{ {
hdrcnt = 1; hdrcnt = 1;
} }
long long
pct(top, bot) pct(long top, long bot)
long top, bot;
{ {
long ans; long ans;
@ -545,7 +538,7 @@ pct(top, bot)
#define PCT(top, bot) (int)pct((long)(top), (long)(bot)) #define PCT(top, bot) (int)pct((long)(top), (long)(bot))
void void
dosum() dosum(void)
{ {
struct nchstats nchstats; struct nchstats nchstats;
long nchtotal; long nchtotal;
@ -649,7 +642,7 @@ dosum()
} }
void void
doforkst() doforkst(void)
{ {
kread(X_UVMEXP, &uvmexp, sizeof(uvmexp)); kread(X_UVMEXP, &uvmexp, sizeof(uvmexp));
@ -661,7 +654,7 @@ doforkst()
} }
void void
dkstats() dkstats(void)
{ {
int dn, state; int dn, state;
double etime; double etime;
@ -683,7 +676,7 @@ dkstats()
} }
void void
cpustats() cpustats(void)
{ {
int state; int state;
double pct, total; double pct, total;
@ -857,7 +850,7 @@ event_chain_trashed:
char *kmemnames[] = INITKMEMNAMES; char *kmemnames[] = INITKMEMNAMES;
void void
domem() domem(void)
{ {
struct kmembuckets *kp; struct kmembuckets *kp;
struct kmemstats *ks; struct kmemstats *ks;
@ -967,7 +960,7 @@ domem()
} }
void void
dopool() dopool(void)
{ {
int first, ovflw; int first, ovflw;
long addr; long addr;
@ -1057,10 +1050,7 @@ dopool()
* kread reads something from the kernel, given its nlist index. * kread reads something from the kernel, given its nlist index.
*/ */
void void
kread(nlx, addr, size) kread(int nlx, void *addr, size_t size)
int nlx;
void *addr;
size_t size;
{ {
const char *sym; const char *sym;
@ -1093,9 +1083,7 @@ struct nlist histnl[] = {
* Note, we assume that if we're not listing, we're dumping. * Note, we assume that if we're not listing, we're dumping.
*/ */
void void
hist_traverse(todo, histname) hist_traverse(int todo, const char *histname)
int todo;
const char *histname;
{ {
struct uvm_history_head histhead; struct uvm_history_head histhead;
struct uvm_history hist, *histkva; struct uvm_history hist, *histkva;
@ -1173,8 +1161,7 @@ hist_traverse(todo, histname)
* Actually dump the history buffer at the specified KVA. * Actually dump the history buffer at the specified KVA.
*/ */
void void
hist_dodump(histp) hist_dodump(struct uvm_history *histp)
struct uvm_history *histp;
{ {
struct uvm_history_ent *histents, *e; struct uvm_history_ent *histents, *e;
size_t histsize; size_t histsize;
@ -1247,7 +1234,7 @@ hist_dodump(histp)
} }
void void
usage() usage(void)
{ {
(void)fprintf(stderr, (void)fprintf(stderr,

55
usr.sbin/iostat/iostat.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iostat.c,v 1.22 2000/06/03 21:03:25 thorpej Exp $ */ /* $NetBSD: iostat.c,v 1.23 2000/11/30 23:59:04 simonb Exp $ */
/* /*
* Copyright (c) 1996 John M. Vinopal * Copyright (c) 1996 John M. Vinopal
@ -75,7 +75,7 @@ __COPYRIGHT("@(#) Copyright (c) 1986, 1991, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)iostat.c 8.3 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)iostat.c 8.3 (Berkeley) 4/28/95";
#else #else
__RCSID("$NetBSD: iostat.c,v 1.22 2000/06/03 21:03:25 thorpej Exp $"); __RCSID("$NetBSD: iostat.c,v 1.23 2000/11/30 23:59:04 simonb Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -113,24 +113,22 @@ static int todo = 0;
#define SHOW_TOTALS 1<<7 #define SHOW_TOTALS 1<<7
#define SHOW_STATS_ALL (SHOW_STATS_1 | SHOW_STATS_2 | SHOW_STATS_X) #define SHOW_STATS_ALL (SHOW_STATS_1 | SHOW_STATS_2 | SHOW_STATS_X)
static void cpustats __P((void)); static void cpustats(void);
static void disk_stats __P((double)); static void disk_stats(double);
static void disk_stats2 __P((double)); static void disk_stats2(double);
static void disk_statsx __P((double)); static void disk_statsx(double);
static void header __P((int)); static void header(int);
static void usage __P((void)); static void usage(void);
static void display __P((void)); static void display(void);
static void selectdrives __P((int, char **)); static void selectdrives(int, char **);
void dkswap __P((void)); void dkswap(void);
void dkreadstats __P((void)); void dkreadstats(void);
int dkinit __P((int, gid_t)); int dkinit(int, gid_t);
int main __P((int, char **)); int main(int, char **);
int int
main(argc, argv) main(int argc, char *argv[])
int argc;
char *argv[];
{ {
int ch, hdrcnt; int ch, hdrcnt;
struct timeval tv; struct timeval tv;
@ -224,8 +222,7 @@ main(argc, argv)
} }
static void static void
header(signo) header(int signo)
int signo;
{ {
int i; int i;
@ -278,8 +275,7 @@ header(signo)
} }
static void static void
disk_stats(etime) disk_stats(double etime)
double etime;
{ {
int dn; int dn;
double atime, mbps; double atime, mbps;
@ -312,8 +308,7 @@ disk_stats(etime)
} }
static void static void
disk_stats2(etime) disk_stats2(double etime)
double etime;
{ {
int dn; int dn;
double atime; double atime;
@ -336,8 +331,7 @@ disk_stats2(etime)
} }
static void static void
disk_statsx(etime) disk_statsx(double etime)
double etime;
{ {
int dn; int dn;
double atime, kbps; double atime, kbps;
@ -374,7 +368,7 @@ disk_statsx(etime)
} }
static void static void
cpustats() cpustats(void)
{ {
int state; int state;
double time; double time;
@ -390,7 +384,7 @@ cpustats()
} }
static void static void
usage() usage(void)
{ {
(void)fprintf(stderr, "usage: iostat [-CdDITx] [-c count] [-M core] \ (void)fprintf(stderr, "usage: iostat [-CdDITx] [-c count] [-M core] \
@ -399,7 +393,7 @@ usage()
} }
static void static void
display() display(void)
{ {
int i; int i;
double etime; double etime;
@ -440,9 +434,7 @@ display()
} }
static void static void
selectdrives(argc, argv) selectdrives(int argc, char *argv[])
int argc;
char *argv[];
{ {
int i, ndrives; int i, ndrives;
@ -498,4 +490,3 @@ selectdrives(argc, argv)
++ndrives; ++ndrives;
} }
} }