Deleted Added
sdiff udiff text old ( 240847 ) new ( 250871 )
full compact
procstat_auxv.c (240847) procstat_auxv.c (250871)
1/*-
2 * Copyright (c) 2011 Mikolaj Golub
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) 2011 Mikolaj Golub
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: stable/9/usr.bin/procstat/procstat_auxv.c 240847 2012-09-23 06:16:08Z kib $
26 * $FreeBSD: stable/9/usr.bin/procstat/procstat_auxv.c 250871 2013-05-21 19:05:27Z trociny $
27 */
28
29#include <sys/param.h>
30#include <sys/elf.h>
31#include <sys/sysctl.h>
32#include <sys/user.h>
33
34#include <vm/vm.h>
35
36#include <err.h>
37#include <errno.h>
38#include <libprocstat.h>
39#include <limits.h>
40#include <stdio.h>
41#include <stdlib.h>
42#include <string.h>
43
44#include "procstat.h"
45
27 */
28
29#include <sys/param.h>
30#include <sys/elf.h>
31#include <sys/sysctl.h>
32#include <sys/user.h>
33
34#include <vm/vm.h>
35
36#include <err.h>
37#include <errno.h>
38#include <libprocstat.h>
39#include <limits.h>
40#include <stdio.h>
41#include <stdlib.h>
42#include <string.h>
43
44#include "procstat.h"
45
46#define PROC_AUXV_MAX 256
47
48static Elf_Auxinfo auxv[PROC_AUXV_MAX];
49static char prefix[256];
50
51#if __ELF_WORD_SIZE == 64
52static Elf32_Auxinfo auxv32[PROC_AUXV_MAX];
53
54static const char *elf32_sv_names[] = {
55 "Linux ELF32",
56 "FreeBSD ELF32",
57};
58
59static int
60is_elf32(pid_t pid)
61{
62 int error, name[4];
63 size_t len, i;
64 static char sv_name[256];
65
66 name[0] = CTL_KERN;
67 name[1] = KERN_PROC;
68 name[2] = KERN_PROC_SV_NAME;
69 name[3] = pid;
70 len = sizeof(sv_name);
71 error = sysctl(name, 4, sv_name, &len, NULL, 0);
72 if (error != 0 || len == 0)
73 return (0);
74 for (i = 0; i < sizeof(elf32_sv_names) / sizeof(*elf32_sv_names); i++) {
75 if (strncmp(sv_name, elf32_sv_names[i], sizeof(sv_name)) == 0)
76 return (1);
77 }
78 return (0);
79}
80
81static size_t
82retrieve_auxv32(pid_t pid)
83{
84 int name[4];
85 size_t len, i;
86 void *ptr;
87
88 name[0] = CTL_KERN;
89 name[1] = KERN_PROC;
90 name[2] = KERN_PROC_AUXV;
91 name[3] = pid;
92 len = sizeof(auxv32);
93 if (sysctl(name, 4, auxv32, &len, NULL, 0) == -1) {
94 if (errno != ESRCH && errno != EPERM)
95 warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
96 return (0);
97 }
98 for (i = 0; i < len; i++) {
99 /*
100 * XXX: We expect that values for a_type on a 32-bit platform
101 * are directly mapped to those on 64-bit one, which is not
102 * necessarily true.
103 */
104 auxv[i].a_type = auxv32[i].a_type;
105 ptr = &auxv32[i].a_un;
106 auxv[i].a_un.a_val = *((uint32_t *)ptr);
107 }
108 return (len);
109}
110#endif /* __ELF_WORD_SIZE == 64 */
111
112#define PRINT(name, spec, val) \
113 printf("%s %-16s " #spec "\n", prefix, #name, (val))
114#define PRINT_UNKNOWN(type, val) \
115 printf("%s %16ld %#lx\n", prefix, (long)type, (u_long)(val))
116
46#define PRINT(name, spec, val) \
47 printf("%s %-16s " #spec "\n", prefix, #name, (val))
48#define PRINT_UNKNOWN(type, val) \
49 printf("%s %16ld %#lx\n", prefix, (long)type, (u_long)(val))
50
117static size_t
118retrieve_auxv(pid_t pid)
119{
120 int name[4];
121 size_t len;
122
123#if __ELF_WORD_SIZE == 64
124 if (is_elf32(pid))
125 return (retrieve_auxv32(pid));
126#endif
127 name[0] = CTL_KERN;
128 name[1] = KERN_PROC;
129 name[2] = KERN_PROC_AUXV;
130 name[3] = pid;
131 len = sizeof(auxv);
132 if (sysctl(name, 4, auxv, &len, NULL, 0) == -1) {
133 if (errno != ESRCH && errno != EPERM)
134 warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
135 return (0);
136 }
137 return (len);
138}
139
140void
51void
141procstat_auxv(struct kinfo_proc *kipp)
52procstat_auxv(struct procstat *procstat, struct kinfo_proc *kipp)
142{
53{
143 size_t len, i;
54 Elf_Auxinfo *auxv;
55 u_int count, i;
56 static char prefix[256];
144
145 if (!hflag)
146 printf("%5s %-16s %-16s %-16s\n", "PID", "COMM", "AUXV", "VALUE");
57
58 if (!hflag)
59 printf("%5s %-16s %-16s %-16s\n", "PID", "COMM", "AUXV", "VALUE");
147 len = retrieve_auxv(kipp->ki_pid);
148 if (len == 0)
60 auxv = procstat_getauxv(procstat, kipp, &count);
61 if (auxv == NULL)
149 return;
150 snprintf(prefix, sizeof(prefix), "%5d %-16s", kipp->ki_pid,
151 kipp->ki_comm);
62 return;
63 snprintf(prefix, sizeof(prefix), "%5d %-16s", kipp->ki_pid,
64 kipp->ki_comm);
152 for (i = 0; i < len; i++) {
65 for (i = 0; i < count; i++) {
153 switch(auxv[i].a_type) {
154 case AT_NULL:
155 return;
156 case AT_IGNORE:
157 break;
158 case AT_EXECFD:
159 PRINT(AT_EXECFD, %ld, (long)auxv[i].a_un.a_val);
160 break;

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

237 break;
238#endif
239 default:
240 PRINT_UNKNOWN(auxv[i].a_type, auxv[i].a_un.a_val);
241 break;
242 }
243 }
244 printf("\n");
66 switch(auxv[i].a_type) {
67 case AT_NULL:
68 return;
69 case AT_IGNORE:
70 break;
71 case AT_EXECFD:
72 PRINT(AT_EXECFD, %ld, (long)auxv[i].a_un.a_val);
73 break;

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

150 break;
151#endif
152 default:
153 PRINT_UNKNOWN(auxv[i].a_type, auxv[i].a_un.a_val);
154 break;
155 }
156 }
157 printf("\n");
158 procstat_freeauxv(procstat, auxv);
245}
246
159}
160