From 477570e587b6b5a8f356a2727794155fa912d59f Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Sun, 9 Oct 2016 17:43:22 -0400 Subject: Add signal handling Please send SIGTERM to stop vpp_api_test, especially during long-running operations such as a high-count asynchronous set of ip_add_del_routes. Otherwise, there's every chance that the data plane to vpp_api_test message queue will fill and cause an easily-avoided deadlock. Change-Id: I09309b445c354e1a692fed708dd5ea44d1ea9882 Signed-off-by: Dave Barach --- vpp-api-test/vat/main.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) (limited to 'vpp-api-test/vat/main.c') diff --git a/vpp-api-test/vat/main.c b/vpp-api-test/vat/main.c index 904540b679e..8ba60e2b36d 100644 --- a/vpp-api-test/vat/main.c +++ b/vpp-api-test/vat/main.c @@ -14,6 +14,7 @@ */ #include "vat.h" #include "plugin.h" +#include vat_main_t vat_main; @@ -72,6 +73,8 @@ do_one_file (vat_main_t * vam) if (setjmp (vam->jump_buf) != 0) return; + vam->jump_buf_set = 1; + while (1) { if (vam->ifp == stdin) @@ -84,7 +87,8 @@ do_one_file (vat_main_t * vam) _vec_len (vam->inbuf) = 4096; - if (fgets ((char *) vam->inbuf, vec_len (vam->inbuf), vam->ifp) == 0) + if (vam->do_exit || + fgets ((char *) vam->inbuf, vec_len (vam->inbuf), vam->ifp) == 0) break; vam->input_line_number++; @@ -195,6 +199,68 @@ eval_current_line (macro_main_t * mm, i32 complain) return ((i8 *) format (0, "%d%c", vam->input_line_number, 0)); } +static void +signal_handler (int signum, siginfo_t * si, ucontext_t * uc) +{ + vat_main_t *vam = &vat_main; + + switch (signum) + { + /* these (caught) signals cause the application to exit */ + case SIGINT: + case SIGTERM: + if (vam->jump_buf_set) + { + vam->do_exit = 1; + return; + } + + /* FALLTHROUGH on purpose */ + + default: + break; + } + + _exit (1); +} + +static void +setup_signal_handlers (void) +{ + uword i; + struct sigaction sa; + + for (i = 1; i < 32; i++) + { + memset (&sa, 0, sizeof (sa)); + sa.sa_sigaction = (void *) signal_handler; + sa.sa_flags = SA_SIGINFO; + + switch (i) + { + /* these signals take the default action */ + case SIGABRT: + case SIGKILL: + case SIGSTOP: + case SIGUSR1: + case SIGUSR2: + continue; + + /* ignore SIGPIPE, SIGCHLD */ + case SIGPIPE: + case SIGCHLD: + sa.sa_sigaction = (void *) SIG_IGN; + break; + + /* catch and handle all other signals */ + default: + break; + } + + if (sigaction (i, &sa, 0) < 0) + clib_unix_warning ("sigaction %U", format_signal, i); + } +} int main (int argc, char **argv) @@ -273,6 +339,8 @@ main (int argc, char **argv) vat_api_hookup (vam); vat_plugin_api_reference (); + setup_signal_handlers (); + if (connect_to_vpe ("vpp_api_test") < 0) { svm_region_exit (); -- cgit 1.2.3-korg lib/vlib_process_doc.h?h=stable/1810'>logtreecommitdiffstats
path: root/src/vlib/vlib_process_doc.h
blob: a47c5e4bbe438d795a68cf3de43cd713a999e9f2 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147