Deleted Added
sdiff udiff text old ( 176107 ) new ( 185548 )
full compact
procstat_vm.c (176107) procstat_vm.c (185548)
1/*-
2 * Copyright (c) 2007 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2007 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/usr.bin/procstat/procstat_vm.c 176107 2008-02-08 11:03:05Z dwmalone $
26 * $FreeBSD: head/usr.bin/procstat/procstat_vm.c 185548 2008-12-02 06:50:26Z peter $
27 */
28
29#include <sys/types.h>
30#include <sys/sysctl.h>
31#include <sys/user.h>
32
33#include <err.h>
34#include <errno.h>
35#include <stdio.h>
36#include <stdlib.h>
27 */
28
29#include <sys/types.h>
30#include <sys/sysctl.h>
31#include <sys/user.h>
32
33#include <err.h>
34#include <errno.h>
35#include <stdio.h>
36#include <stdlib.h>
37#include <libutil.h>
37
38#include "procstat.h"
39
40void
41procstat_vm(pid_t pid, struct kinfo_proc *kipp __unused)
42{
43 struct kinfo_vmentry *freep, *kve;
38
39#include "procstat.h"
40
41void
42procstat_vm(pid_t pid, struct kinfo_proc *kipp __unused)
43{
44 struct kinfo_vmentry *freep, *kve;
44 int error, name[4], ptrwidth;
45 unsigned int i;
45 int ptrwidth;
46 int i, cnt;
46 const char *str;
47 const char *str;
47 size_t len;
48
49 ptrwidth = 2*sizeof(void *) + 2;
50 if (!hflag)
51 printf("%5s %*s %*s %3s %4s %4s %3s %3s %2s %-2s %-s\n",
52 "PID", ptrwidth, "START", ptrwidth, "END", "PRT", "RES",
53 "PRES", "REF", "SHD", "FL", "TP", "PATH");
54
48
49 ptrwidth = 2*sizeof(void *) + 2;
50 if (!hflag)
51 printf("%5s %*s %*s %3s %4s %4s %3s %3s %2s %-2s %-s\n",
52 "PID", ptrwidth, "START", ptrwidth, "END", "PRT", "RES",
53 "PRES", "REF", "SHD", "FL", "TP", "PATH");
54
55 name[0] = CTL_KERN;
56 name[1] = KERN_PROC;
57 name[2] = KERN_PROC_VMMAP;
58 name[3] = pid;
59
60 len = 0;
61 error = sysctl(name, 4, NULL, &len, NULL, 0);
62 if (error < 0 && errno != ESRCH && errno != EPERM) {
63 warn("sysctl: kern.proc.vmmap: %d", pid);
64 return;
65 }
66 if (error < 0)
67 return;
68
69 /*
70 * Especially if running procstat -sv, we may need room for more
71 * mappings when printing than were present when we queried, so pad
72 * out the allocation a bit.
73 */
74 len += sizeof(*kve) * 3;
75 freep = kve = malloc(len);
76 if (kve == NULL)
77 err(-1, "malloc");
78 if (sysctl(name, 4, kve, &len, NULL, 0) < 0) {
79 warn("sysctl: kern.proc.vmmap: %d", pid);
80 free(freep);
81 return;
82 }
83
84 for (i = 0; i < (len / sizeof(*kve)); i++, kve++) {
85 if (kve->kve_structsize != sizeof(*kve))
86 errx(-1, "kinfo_vmentry structure mismatch");
55 freep = kinfo_getvmmap(pid, &cnt);
56 for (i = 0; i < cnt; i++) {
57 kve = &freep[i];
87 printf("%5d ", pid);
88 printf("%*p ", ptrwidth, kve->kve_start);
89 printf("%*p ", ptrwidth, kve->kve_end);
90 printf("%s", kve->kve_protection & KVME_PROT_READ ? "r" : "-");
91 printf("%s", kve->kve_protection & KVME_PROT_WRITE ? "w" : "-");
92 printf("%s ", kve->kve_protection & KVME_PROT_EXEC ? "x" : "-");
93 printf("%4d ", kve->kve_resident);
94 printf("%4d ", kve->kve_private_resident);

--- 37 unchanged lines hidden --- 		58 printf("%5d ", pid);
59 printf("%*p ", ptrwidth, kve->kve_start);
60 printf("%*p ", ptrwidth, kve->kve_end);
61 printf("%s", kve->kve_protection & KVME_PROT_READ ? "r" : "-");
62 printf("%s", kve->kve_protection & KVME_PROT_WRITE ? "w" : "-");
63 printf("%s ", kve->kve_protection & KVME_PROT_EXEC ? "x" : "-");
64 printf("%4d ", kve->kve_resident);
65 printf("%4d ", kve->kve_private_resident);

--- 37 unchanged lines hidden ---