Deleted Added
sdiff udiff text old ( 249668 ) new ( 287486 )
full compact
procstat_sigs.c (249668) procstat_sigs.c (287486)
1/*-
2 * Copyright (c) 2010 Konstantin Belousov
1/*-
2 * Copyright (c) 2010 Konstantin Belousov
3 * Copyright (c) 2015 Allan Jude <allanjude@freebsd.org>
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 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright

--- 7 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 *
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright

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

19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 *
26 * $FreeBSD: head/usr.bin/procstat/procstat_sigs.c 249668 2013-04-20 07:50:59Z trociny $
27 * $FreeBSD: head/usr.bin/procstat/procstat_sigs.c 287486 2015-09-05 17:02:01Z allanjude $
27 */
28
29#include <sys/param.h>
30#include <sys/sysctl.h>
31#include <sys/user.h>
32
33#include <ctype.h>
34#include <err.h>

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

46{
47 char name[12];
48 int i;
49
50 if (!nflag && sig < sys_nsig) {
51 strlcpy(name, sys_signame[sig], sizeof(name));
52 for (i = 0; name[i] != 0; i++)
53 name[i] = toupper(name[i]);
28 */
29
30#include <sys/param.h>
31#include <sys/sysctl.h>
32#include <sys/user.h>
33
34#include <ctype.h>
35#include <err.h>

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

47{
48 char name[12];
49 int i;
50
51 if (!nflag && sig < sys_nsig) {
52 strlcpy(name, sys_signame[sig], sizeof(name));
53 for (i = 0; name[i] != 0; i++)
54 name[i] = toupper(name[i]);
54 printf("%-7s ", name);
55 xo_emit("{d:signal/%-7s/%s} ", name);
56 xo_open_container(name);
57 } else {
58 xo_emit("{d:signal/%-7d/%d} ", sig);
59 snprintf(name, 12, "%d", sig);
60 xo_open_container(name);
61 }
62}
63
64static void
65procstat_close_signame(int sig)
66{
67 char name[12];
68 int i;
69
70 if (!nflag && sig < sys_nsig) {
71 strlcpy(name, sys_signame[sig], sizeof(name));
72 for (i = 0; name[i] != 0; i++)
73 name[i] = toupper(name[i]);
74 xo_close_container(name);
55 } else
75 } else
56 printf("%-7d ", sig);
76 snprintf(name, 12, "%d", sig);
77 xo_close_container(name);
57}
58
59static void
60procstat_print_sig(const sigset_t *set, int sig, char flag)
61{
78}
79
80static void
81procstat_print_sig(const sigset_t *set, int sig, char flag)
82{
62
63 printf("%c", sigismember(set, sig) ? flag : '-');
83 xo_emit("{d:sigmember/%c}", sigismember(set, sig) ? flag : '-');
84 switch (flag) {
85 case 'B':
86 xo_emit("{en:mask/%s}", sigismember(set, sig) ?
87 "true" : "false");
88 break;
89 case 'C':
90 xo_emit("{en:catch/%s}", sigismember(set, sig) ?
91 "true" : "false");
92 break;
93 case 'P':
94 xo_emit("{en:list/%s}", sigismember(set, sig) ?
95 "true" : "false");
96 break;
97 case 'I':
98 xo_emit("{en:ignore/%s}", sigismember(set, sig) ?
99 "true" : "false");
100 break;
101 default:
102 xo_emit("{en:unknown/%s}", sigismember(set, sig) ?
103 "true" : "false");
104 break;
105 }
64}
65
66void
67procstat_sigs(struct procstat *prstat __unused, struct kinfo_proc *kipp)
68{
69 int j;
106}
107
108void
109procstat_sigs(struct procstat *prstat __unused, struct kinfo_proc *kipp)
110{
111 int j;
70 pid_t pid;
71
112
72 pid = kipp->ki_pid;
73 if (!hflag)
113 if (!hflag)
74 printf("%5s %-16s %-7s %4s\n", "PID", "COMM", "SIG", "FLAGS");
114 xo_emit("{T:/%5s %-16s %-7s %4s}\n", "PID", "COMM", "SIG",
115 "FLAGS");
75
116
117 xo_emit("{ek:process_id/%5d/%d}", kipp->ki_pid);
118 xo_emit("{e:command/%-16s/%s}", kipp->ki_comm);
119 xo_open_container("signals");
76 for (j = 1; j <= _SIG_MAXSIG; j++) {
120 for (j = 1; j <= _SIG_MAXSIG; j++) {
77 printf("%5d ", pid);
78 printf("%-16s ", kipp->ki_comm);
121 xo_emit("{dk:process_id/%5d/%d} ", kipp->ki_pid);
122 xo_emit("{d:command/%-16s/%s} ", kipp->ki_comm);
79 procstat_print_signame(j);
123 procstat_print_signame(j);
80 printf(" ");
124 xo_emit(" ");
81 procstat_print_sig(&kipp->ki_siglist, j, 'P');
82 procstat_print_sig(&kipp->ki_sigignore, j, 'I');
83 procstat_print_sig(&kipp->ki_sigcatch, j, 'C');
125 procstat_print_sig(&kipp->ki_siglist, j, 'P');
126 procstat_print_sig(&kipp->ki_sigignore, j, 'I');
127 procstat_print_sig(&kipp->ki_sigcatch, j, 'C');
84 printf("\n");
128 procstat_close_signame(j);
129 xo_emit("\n");
85 }
130 }
131 xo_close_container("signals");
86}
87
88void
89procstat_threads_sigs(struct procstat *procstat, struct kinfo_proc *kipp)
90{
91 struct kinfo_proc *kip;
132}
133
134void
135procstat_threads_sigs(struct procstat *procstat, struct kinfo_proc *kipp)
136{
137 struct kinfo_proc *kip;
92 pid_t pid;
93 int j;
94 unsigned int count, i;
138 int j;
139 unsigned int count, i;
140 char *threadid;
95
141
96 pid = kipp->ki_pid;
97 if (!hflag)
142 if (!hflag)
98 printf("%5s %6s %-16s %-7s %4s\n", "PID", "TID", "COMM",
143 xo_emit("{T:/%5s %6s %-16s %-7s %4s}\n", "PID", "TID", "COMM",
99 "SIG", "FLAGS");
100
101 kip = procstat_getprocs(procstat, KERN_PROC_PID | KERN_PROC_INC_THREAD,
144 "SIG", "FLAGS");
145
146 kip = procstat_getprocs(procstat, KERN_PROC_PID | KERN_PROC_INC_THREAD,
102 pid, &count);
147 kipp->ki_pid, &count);
103 if (kip == NULL)
104 return;
148 if (kip == NULL)
149 return;
150 xo_emit("{ek:process_id/%5d/%d}", kipp->ki_pid);
151 xo_emit("{e:command/%-16s/%s}", kipp->ki_comm);
152 xo_open_container("threads");
105 kinfo_proc_sort(kip, count);
106 for (i = 0; i < count; i++) {
107 kipp = &kip[i];
153 kinfo_proc_sort(kip, count);
154 for (i = 0; i < count; i++) {
155 kipp = &kip[i];
156 asprintf(&threadid, "%d", kipp->ki_tid);
157 if (threadid == NULL)
158 xo_errc(1, ENOMEM, "Failed to allocate memory in "
159 "procstat_threads_sigs()");
160 xo_open_container(threadid);
161 xo_emit("{e:thread_id/%6d/%d}", kipp->ki_tid);
162 xo_open_container("signals");
108 for (j = 1; j <= _SIG_MAXSIG; j++) {
163 for (j = 1; j <= _SIG_MAXSIG; j++) {
109 printf("%5d ", pid);
110 printf("%6d ", kipp->ki_tid);
111 printf("%-16s ", kipp->ki_comm);
164 xo_emit("{dk:process_id/%5d/%d} ", kipp->ki_pid);
165 xo_emit("{d:thread_id/%6d/%d} ", kipp->ki_tid);
166 xo_emit("{d:command/%-16s/%s} ", kipp->ki_comm);
112 procstat_print_signame(j);
167 procstat_print_signame(j);
113 printf(" ");
168 xo_emit(" ");
114 procstat_print_sig(&kipp->ki_siglist, j, 'P');
115 procstat_print_sig(&kipp->ki_sigmask, j, 'B');
169 procstat_print_sig(&kipp->ki_siglist, j, 'P');
170 procstat_print_sig(&kipp->ki_sigmask, j, 'B');
116 printf("\n");
171 procstat_close_signame(j);
172 xo_emit("\n");
117 }
173 }
174 xo_close_container("signals");
175 xo_close_container(threadid);
176 free(threadid);
118 }
177 }
178 xo_close_container("threads");
119 procstat_freeprocs(procstat, kip);
120}
179 procstat_freeprocs(procstat, kip);
180}