diff options
| author | ad <ad@NetBSD.org> | 2007-02-09 22:08:48 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2007-02-09 22:08:48 +0000 |
| commit | 401499f30e43e9ebf55c065c70fbb3c8d2ea39cd (patch) | |
| tree | 562788dc7eb8b22c4887be2afd92ceb8ac0ebfc9 /usr.bin | |
| parent | b07ec3fc388a5aeae51e8871aa89eefea3ce1e53 (diff) | |
Sync with kernel changes introduced by merging the newlock2 branch.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/kdump/kdump.c | 48 | ||||
| -rw-r--r-- | usr.bin/ktrace/ktrace.h | 4 | ||||
| -rw-r--r-- | usr.bin/ktrace/subr.c | 7 | ||||
| -rw-r--r-- | usr.bin/pkill/pkill.c | 6 | ||||
| -rw-r--r-- | usr.bin/systat/ps.c | 18 | ||||
| -rw-r--r-- | usr.bin/top/machine/m_netbsd15.c | 8 |
6 files changed, 22 insertions, 69 deletions
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index bc6b565fc0d..6fbba977448 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -1,4 +1,4 @@ -/* $NetBSD: kdump.c,v 1.88 2007/01/28 21:29:59 chs Exp $ */ +/* $NetBSD: kdump.c,v 1.89 2007/02/09 22:08:48 ad Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\ #if 0 static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: kdump.c,v 1.88 2007/01/28 21:29:59 chs Exp $"); +__RCSID("$NetBSD: kdump.c,v 1.89 2007/02/09 22:08:48 ad Exp $"); #endif #endif /* not lint */ @@ -52,7 +52,6 @@ __RCSID("$NetBSD: kdump.c,v 1.88 2007/01/28 21:29:59 chs Exp $"); #include <sys/ktrace.h> #include <sys/ioctl.h> #include <sys/ptrace.h> -#include <sys/sa.h> #include <ctype.h> #include <err.h> @@ -116,7 +115,6 @@ static void ktrcsw(struct ktr_csw *); static void ktruser(struct ktr_user *, int); static void ktrmmsg(struct ktr_mmsg *, int); static void ktrmool(struct ktr_mool *, int); -static void ktrsaupcall(const struct ktr_saupcall *, int); static void ktrmib(int *, int); static void usage(void) __attribute__((__noreturn__)); static void eprint(int); @@ -277,9 +275,6 @@ main(int argc, char **argv) case KTR_EXEC_ENV: visdump_buf(m, ktrlen, col); break; - case KTR_SAUPCALL: - ktrsaupcall(m, ktrlen); - break; case KTR_MIB: ktrmib(m, ktrlen); break; @@ -974,45 +969,6 @@ ktrmmsg(struct ktr_mmsg *mmsg, int len) } static void -ktr_saprint(const struct ktr_saupcall *sau, int off, int len) -{ - const struct sa_t * sa = (const struct sa_t *)(const void *)&sau[1]; - int i; - for (i = off; i < off + len; i++) { - printf("<ctx=%p, id=%d, cpu=%d>%s", - sa[i].sa_context, sa[i].sa_id, sa[i].sa_cpu, - i == off + len - 1 ? "" : ", "); - } -} - -static void -ktrsaupcall(const struct ktr_saupcall *sau, int len) -{ - char tbuf[64]; - const char *type; - static const char *const sastrings[] = { SA_UPCALL_STRINGS }; - - if (sau->ktr_type >= 0 && sau->ktr_type < SA_UPCALL_NUPCALLS) - type = sastrings[sau->ktr_type]; - else { - (void)snprintf(tbuf, sizeof(tbuf), "*%d*", sau->ktr_type); - type = tbuf; - } - printf("%s", type); - if (sau->ktr_nevent) { - printf(", event=["); - ktr_saprint(sau, 1, sau->ktr_nevent); - printf("]"); - } - if (sau->ktr_nint) { - printf(", intr=["); - ktr_saprint(sau, 1 + sau->ktr_nevent, sau->ktr_nint); - printf("]"); - } - printf("\n"); -} - -static void ktrmool(struct ktr_mool *mool, int len) { size_t size = mool->size; diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h index 85f19ec9c92..8c402019dfa 100644 --- a/usr.bin/ktrace/ktrace.h +++ b/usr.bin/ktrace/ktrace.h @@ -1,4 +1,4 @@ -/* $NetBSD: ktrace.h,v 1.17 2006/02/07 06:39:47 skrll Exp $ */ +/* $NetBSD: ktrace.h,v 1.18 2007/02/09 22:08:49 ad Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -33,7 +33,7 @@ #define DEF_POINTS (KTRFAC_SYSCALL | KTRFAC_SYSRET | KTRFAC_NAMEI | \ KTRFAC_GENIO | KTRFAC_PSIG | KTRFAC_EMUL | KTRFAC_USER | \ - KTRFAC_MMSG | KTRFAC_MOOL | KTRFAC_SAUPCALL) + KTRFAC_MMSG | KTRFAC_MOOL) #define ALL_POINTS KTRFAC_MASK diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c index b8a279d2d54..098e5e9a1e0 100644 --- a/usr.bin/ktrace/subr.c +++ b/usr.bin/ktrace/subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: subr.c,v 1.15 2006/09/23 22:01:04 manu Exp $ */ +/* $NetBSD: subr.c,v 1.16 2007/02/09 22:08:49 ad Exp $ */ /*- * Copyright (c) 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)subr.c 8.2 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: subr.c,v 1.15 2006/09/23 22:01:04 manu Exp $"); +__RCSID("$NetBSD: subr.c,v 1.16 2007/02/09 22:08:49 ad Exp $"); #endif #endif /* not lint */ @@ -91,9 +91,6 @@ getpoints(int facs, char *s) case 'u': fac = KTRFAC_USER; break; - case 'U': - fac = KTRFAC_SAUPCALL; - break; case 'S': fac = KTRFAC_MIB; break; diff --git a/usr.bin/pkill/pkill.c b/usr.bin/pkill/pkill.c index 67a72b8a131..0c2de7ed187 100644 --- a/usr.bin/pkill/pkill.c +++ b/usr.bin/pkill/pkill.c @@ -1,4 +1,4 @@ -/* $NetBSD: pkill.c,v 1.17 2006/02/25 01:13:55 wiz Exp $ */ +/* $NetBSD: pkill.c,v 1.18 2007/02/09 22:08:49 ad Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: pkill.c,v 1.17 2006/02/25 01:13:55 wiz Exp $"); +__RCSID("$NetBSD: pkill.c,v 1.18 2007/02/09 22:08:49 ad Exp $"); #endif /* !lint */ #include <sys/types.h> @@ -345,7 +345,7 @@ main(int argc, char **argv) SLIST_FOREACH(li, &tdevlist, li_chain) { if (li->li_number == -1 && - (kp->p_flag & P_CONTROLT) == 0) + (kp->p_flag & KP_CONTROLT) == 0) break; if (kp->p_tdev == (uid_t)li->li_number) break; diff --git a/usr.bin/systat/ps.c b/usr.bin/systat/ps.c index bf9ae3ccc60..b10eace0b29 100644 --- a/usr.bin/systat/ps.c +++ b/usr.bin/systat/ps.c @@ -1,4 +1,4 @@ -/* $NetBSD: ps.c,v 1.28 2006/02/13 16:01:58 kleink Exp $ */ +/* $NetBSD: ps.c,v 1.29 2007/02/09 22:08:49 ad Exp $ */ /*- * Copyright (c) 1999 @@ -45,7 +45,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: ps.c,v 1.28 2006/02/13 16:01:58 kleink Exp $"); +__RCSID("$NetBSD: ps.c,v 1.29 2007/02/09 22:08:49 ad Exp $"); #endif /* not lint */ #include <sys/param.h> @@ -200,19 +200,19 @@ state2str(struct kinfo_proc2 *kp) *cp++ = '<'; else if (kp->p_nice > NZERO) *cp++ = 'N'; - if (flag & P_TRACED) + if (flag & KP_TRACED) *cp++ = 'X'; - if (flag & P_WEXIT && + if (flag & KP_WEXIT && /* XXX - I don't like this */ - (kp->p_stat == LSZOMB || kp->p_stat == LSDEAD) == 0) + (kp->p_stat != LSZOMB)) *cp++ = 'E'; - if (flag & P_PPWAIT) + if (flag & KP_PPWAIT) *cp++ = 'V'; - if ((flag & P_SYSTEM) || kp->p_holdcnt) + if ((flag & KP_SYSTEM) || kp->p_holdcnt) *cp++ = 'L'; if (kp->p_eflag & EPROC_SLEADER) *cp++ = 's'; - if ((flag & P_CONTROLT) && kp->p__pgid == kp->p_tpgid) + if ((flag & KP_CONTROLT) && kp->p__pgid == kp->p_tpgid) *cp++ = '+'; *cp = '\0'; snprintf(statestr, sizeof(statestr), "%-s", buf); @@ -286,7 +286,7 @@ comm2str(struct kinfo_proc2 *kp) * square brackets if they are system commands. Otherwise * they are printed within parentheses. */ - if (kp->p_flag & P_SYSTEM) + if (kp->p_flag & KP_SYSTEM) fmt = "[%s]"; else fmt = "(%s)"; diff --git a/usr.bin/top/machine/m_netbsd15.c b/usr.bin/top/machine/m_netbsd15.c index e389cc5d862..860f763fa82 100644 --- a/usr.bin/top/machine/m_netbsd15.c +++ b/usr.bin/top/machine/m_netbsd15.c @@ -1,4 +1,4 @@ -/* $NetBSD: m_netbsd15.c,v 1.25 2006/02/16 20:50:57 christos Exp $ */ +/* $NetBSD: m_netbsd15.c,v 1.26 2007/02/09 22:08:49 ad Exp $ */ /* * top - a top users display for Unix @@ -36,12 +36,12 @@ * Tomas Svensson <ts@unix1.net> * * - * $Id: m_netbsd15.c,v 1.25 2006/02/16 20:50:57 christos Exp $ + * $Id: m_netbsd15.c,v 1.26 2007/02/09 22:08:49 ad Exp $ */ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: m_netbsd15.c,v 1.25 2006/02/16 20:50:57 christos Exp $"); +__RCSID("$NetBSD: m_netbsd15.c,v 1.26 2007/02/09 22:08:49 ad Exp $"); #endif #include <sys/param.h> @@ -502,7 +502,7 @@ get_process_info(si, sel, compare) if (pp->p_stat != 0 && (show_system || ((pp->p_flag & P_SYSTEM) == 0))) { total_procs++; process_states[(unsigned char) pp->p_stat]++; - if (pp->p_stat != LSZOMB && pp->p_stat != LSDEAD && + if (pp->p_stat != LSZOMB && (show_idle || (pp->p_pctcpu != 0) || (pp->p_stat == LSRUN || pp->p_stat == LSONPROC)) && (!show_uid || pp->p_ruid == (uid_t)sel->uid)) { |
