d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let systat's vmstat use utmpx.

Browse Source
This commit is contained in:
Ed Schouten 2009-12-05 20:52:11 +00:00
parent b911cea8ff
commit 3487b13416
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/systat/Makefile
View File

@ -14,7 +14,7 @@ SRCS+= icmp6.c ip6.c
CFLAGS+= -DINET6
.endif
DPADD= ${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
LDADD= -lcursesw -lm -ldevstat -lkvm
DPADD= ${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM} ${LIBULOG}
LDADD= -lcursesw -lm -ldevstat -lkvm -lulog
.include <bsd.prog.mk>

21
usr.bin/systat/vmstat.c
View File

@ -65,8 +65,9 @@ static const char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
#include <stdlib.h>
#include <string.h>
#include <time.h>
#define _ULOG_POSIX_NAMES
#include <ulog.h>
#include <unistd.h>
#include <utmp.h>
#include <devstat.h>
#include "systat.h"
#include "extern.h"
@ -141,7 +142,6 @@ static void putlongdouble(long double, int, int, int, int, int);
static int ucount(void);
static int ncpu;
static int ut;
static char buf[26];
static time_t t;
static double etime;
@ -150,16 +150,10 @@ static long *intrloc;
static char **intrname;
static int nextintsrow;
struct utmp utmp;
WINDOW *
openkre(void)
{
ut = open(_PATH_UTMP, O_RDONLY);
if (ut < 0)
error("No utmp");
return (stdscr);
}
@ -167,7 +161,6 @@ void
closekre(WINDOW *w)
{
(void) close(ut);
if (w == NULL)
return;
wclear(w);
@ -634,14 +627,14 @@ static int
ucount(void)
{
int nusers = 0;
struct utmpx *ut;
if (ut < 0)
return (0);
while (read(ut, &utmp, sizeof(utmp)))
if (utmp.ut_name[0] != '\0')
setutxent();
while ((ut = getutxent()) != NULL)
if (ut->ut_type == USER_PROCESS)
nusers++;
endutxent();
lseek(ut, 0L, L_SET);
return (nusers);
}