ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/iom.C
(Generate patch)

Comparing rxvt-unicode/src/iom.C (file contents):
Revision 1.17 by root, Tue Aug 10 20:39:19 2004 UTC vs.
Revision 1.19 by root, Thu Sep 2 07:44:40 2004 UTC

… …
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 18*/
19 19
20#include "iom.h"
21
20#include <cstdio> 22#include <cstdio>
21#include <cstdlib> 23#include <cstdlib>
22#include <cerrno> 24#include <cerrno>
23 25
24#include <sys/time.h> 26#include <sys/time.h>
… …
26#include <assert.h> 28#include <assert.h>
27 29
28#if 1 // older unices need these includes for select (2) 30#if 1 // older unices need these includes for select (2)
29# include <unistd.h> 31# include <unistd.h>
30# include <sys/types.h> 32# include <sys/types.h>
33# include <time.h>
34#endif
35
36// for IOM_SIG
37#if IOM_SIG
38# include <signal.h>
39# include <fcntl.h>
31#endif 40#endif
32 41
33// if the BSDs would at least be marginally POSIX-compatible.. *sigh* 42// if the BSDs would at least be marginally POSIX-compatible.. *sigh*
34// until that happens, sys/select.h must come last 43// until that happens, sys/select.h must come last
35#include <sys/select.h> 44#include <sys/select.h>
36 45
37// for IOM_SIG
38#include <signal.h>
39
40#include "iom.h"
41
42// TSTAMP_MAX must still fit into a positive struct timeval 46// TSTAMP_MAX must still fit into a positive struct timeval
43#define TSTAMP_MAX (double)(1UL<<31) 47#define TSTAMP_MAX (double)(1UL<<31)
48
49#define TIMEVAL timeval
50#define TV_FRAC tv_usec
51#define TV_MULT 1000000L
52
53#if IOM_IO
54static io_manager_vec<io_watcher> iow;
55#endif
56#if IOM_CHECK
57static io_manager_vec<check_watcher> cw;
58#endif
59#if IOM_TIME
60static io_manager_vec<time_watcher> tw;
61#endif
62#if IOM_IDLE
63static io_manager_vec<idle_watcher> iw;
64#endif
65#if IOM_SIG
66static int sigpipe[2]; // signal signalling pipe
67static sigset_t sigs;
68struct sig_vec : io_manager_vec<sig_watcher> {
69 int pending;
70 sig_vec ()
71 : pending (false)
72 { }
73};
74static vector<sig_vec *> sw;
75#endif
44 76
45// this is a dummy time watcher to ensure that the first 77// this is a dummy time watcher to ensure that the first
46// time watcher is _always_ valid, this gets rid of a lot 78// time watcher is _always_ valid, this gets rid of a lot
47// of null-pointer-checks 79// of null-pointer-checks
48// (must come _before_ iom is being defined) 80// (must come _before_ iom is being defined)
… …
55 // or compiler initialisation order broken, or something else :) 87 // or compiler initialisation order broken, or something else :)
56 abort (); 88 abort ();
57 } 89 }
58 90
59 tw0 () 91 tw0 ()
60 : time_watcher (this, &tw0::cb) 92 : time_watcher (this, &tw0::cb)
61 { } 93 { }
62 } tw0; 94 } tw0;
63 95
64tstamp NOW; 96tstamp NOW;
97
98#if IOM_TIME
99inline void set_now (void)
100{
101 struct timeval tv;
102
103 gettimeofday (&tv, 0);
104 NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.;
105}
106#endif
107
65static bool iom_valid; 108static bool iom_valid;
66io_manager iom; 109
110// used for initialisation only
111static struct init {
112 init ()
113 {
114#if IOM_SIG
115 sigemptyset (&sigs);
116
117 if (pipe (sigpipe))
118 {
119 perror ("io_manager: unable to create signal pipe, aborting.");
120 abort ();
121 }
122
123 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK);
124 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK);
125#endif
126
127 iom_valid = true;
128
129#if IOM_TIME
130 set_now ();
131
132 tw0.start (TSTAMP_MAX);
133#endif
134 }
135
136 static void required ();
137} init;
138
139void
140init::required ()
141{
142 if (!iom_valid)
143 {
144 write (2, "io_manager: early registration attempt, aborting.\n",
145 sizeof ("io_manager: early registration attempt, aborting.\n") - 1);
146 abort ();
147 }
148}
67 149
68template<class watcher> 150template<class watcher>
69void io_manager::reg (watcher *w, io_manager_vec<watcher> &queue) 151void io_manager::reg (watcher &w, io_manager_vec<watcher> &queue)
70{ 152{
71 if (!iom_valid) 153 init::required ();
72 abort ();
73 154
74 if (!w->active) 155 if (!w.active)
75 { 156 {
76#if IOM_CHECK 157#if IOM_CHECK
77 queue.activity = true; 158 queue.activity = true;
78#endif 159#endif
79 queue.push_back (w); 160 queue.push_back (&w);
80 w->active = queue.size (); 161 w.active = queue.size ();
81 } 162 }
82} 163}
83 164
84template<class watcher> 165template<class watcher>
85void io_manager::unreg (watcher *w, io_manager_vec<watcher> &queue) 166void io_manager::unreg (watcher &w, io_manager_vec<watcher> &queue)
86{ 167{
87 if (!iom_valid) 168 if (!iom_valid)
88 return; 169 return;
89 170
90 if (w->active) 171 if (w.active)
91 { 172 {
92 queue [w->active - 1] = 0; 173 queue [w.active - 1] = 0;
93 w->active = 0; 174 w.active = 0;
94 } 175 }
95} 176}
96 177
97#if IOM_TIME 178#if IOM_TIME
98void time_watcher::trigger () 179void time_watcher::trigger ()
99{ 180{
100 call (*this); 181 call (*this);
101 182 io_manager::reg (*this);
102 iom.reg (this);
103} 183}
104 184
105void io_manager::reg (time_watcher *w) { reg (w, tw); } 185void io_manager::reg (time_watcher &w) { io_manager::reg (w, tw); }
106void io_manager::unreg (time_watcher *w) { unreg (w, tw); } 186void io_manager::unreg (time_watcher &w) { io_manager::unreg (w, tw); }
107#endif 187#endif
108 188
109#if IOM_IO 189#if IOM_IO
110void io_manager::reg (io_watcher *w) { reg (w, iow); } 190void io_manager::reg (io_watcher &w) { io_manager::reg (w, iow); }
111void io_manager::unreg (io_watcher *w) { unreg (w, iow); } 191void io_manager::unreg (io_watcher &w) { io_manager::unreg (w, iow); }
112#endif 192#endif
113 193
114#if IOM_CHECK 194#if IOM_CHECK
115void io_manager::reg (check_watcher *w) { reg (w, cw); } 195void io_manager::reg (check_watcher &w) { io_manager::reg (w, cw); }
116void io_manager::unreg (check_watcher *w) { unreg (w, cw); } 196void io_manager::unreg (check_watcher &w) { io_manager::unreg (w, cw); }
117#endif 197#endif
118 198
119#if IOM_IDLE 199#if IOM_IDLE
120void io_manager::reg (idle_watcher *w) { reg (w, iw); } 200void io_manager::reg (idle_watcher &w) { io_manager::reg (w, iw); }
121void io_manager::unreg (idle_watcher *w) { unreg (w, iw); } 201void io_manager::unreg (idle_watcher &w) { io_manager::unreg (w, iw); }
122#endif
123
124#if IOM_TIME
125inline void set_now (void)
126{
127 struct timeval tv;
128
129 gettimeofday (&tv, 0);
130
131 NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000;
132}
133#endif 202#endif
134 203
135#if IOM_SIG 204#if IOM_SIG
136// race conditions galore 205static void
137 206sighandler (int signum)
138void io_manager::sighandler (int signum)
139{ 207{
140 assert (0 < signum && signum <= iom.sw.size ()); 208 sw [signum - 1]->pending = true;
141 209
142 sig_vec &sv = *iom.sw [signum - 1]; 210 // we use a pipe for signal notifications, as most current
143 211 // OSes (Linux...) do not implement pselect correctly. ugh.
144 for (int i = sv.size (); i--; ) 212 char ch = signum; // actual content not used
145 if (!sv[i]) 213 write (sigpipe[1], &ch, 1);
146 sv.erase_unordered (i);
147 else
148 sv[i]->call (*sv[i]);
149} 214}
150 215
151void io_manager::reg (sig_watcher *w) 216void io_manager::reg (sig_watcher &w)
152{ 217{
153 assert (0 < w->signum); 218 assert (0 < w.signum);
154 219
155 sw.reserve (w->signum); 220 sw.reserve (w.signum);
156 221
222 while (sw.size () < w.signum) // pathetic
223 sw.push_back (0);
224
157 sig_vec *&sv = sw [w->signum - 1]; 225 sig_vec *&sv = sw[w.signum - 1];
158 226
159 if (!sv) 227 if (!sv)
160 { 228 {
161 sv = new sig_vec; 229 sv = new sig_vec;
162 230
231 sigaddset (&sigs, w.signum);
232 sigprocmask (SIG_BLOCK, &sigs, NULL);
233
163 struct sigaction sa; 234 struct sigaction sa;
164 sa.sa_handler = io_manager::sighandler; 235 sa.sa_handler = sighandler;
165 sigfillset (&sa.sa_mask); 236 sigfillset (&sa.sa_mask);
166 sa.sa_flags = 0; 237 sa.sa_flags = SA_RESTART;
167 238
168 if (sigaction (w->signum, &sa, 0)) 239 if (sigaction (w.signum, &sa, 0))
169 { 240 {
170 perror ("Error while installing signal handler"); 241 perror ("io_manager: error while installing signal handler, ignoring.");
171 abort (); 242 abort ();
172 } 243 }
173 }
174 244
175 reg (w, *sv); 245 }
176}
177 246
247 io_manager::reg (w, *sv);
248}
249
178void io_manager::unreg (sig_watcher *w) 250void io_manager::unreg (sig_watcher &w)
179{ 251{
252 if (!w.active)
253 return;
254
180 assert (0 < w->signum && w->signum <= sw.size ()); 255 assert (0 < w.signum && w.signum <= sw.size ());
181 256
182 unreg (w, *sw [w->signum - 1]); 257 io_manager::unreg (w, *sw[w.signum - 1]);
183} 258}
184 259
185void sig_watcher::start (int signum) 260void sig_watcher::start (int signum)
186{ 261{
187 stop (); 262 stop ();
188 this->signum = signum; 263 this->signum = signum;
189 iom.reg (this); 264 io_manager::reg (*this);
190} 265}
191#endif 266#endif
192 267
193void io_manager::loop () 268void io_manager::loop ()
194{ 269{
270 init::required ();
271
195#if IOM_TIME 272#if IOM_TIME
196 set_now (); 273 set_now ();
197#endif 274#endif
198 275
199 for (;;) 276 for (;;)
200 { 277 {
201 struct timeval *to = 0; 278 struct TIMEVAL *to = 0;
202 struct timeval tval; 279 struct TIMEVAL tval;
203 280
204#if IOM_IDLE 281#if IOM_IDLE
205 if (iw.size ()) 282 if (iw.size ())
206 { 283 {
207 tval.tv_sec = 0; 284 tval.tv_sec = 0;
208 tval.tv_usec = 0; 285 tval.TV_FRAC = 0;
209 to = &tval; 286 to = &tval;
210 } 287 }
211 else 288 else
212#endif 289#endif
213
214 { 290 {
215#if IOM_TIME 291#if IOM_TIME
216 time_watcher *next; 292 time_watcher *next;
217 293
218 for (;;) 294 for (;;)
… …
229 { 305 {
230 if (next != tw[0]) 306 if (next != tw[0])
231 { 307 {
232 double diff = next->at - NOW; 308 double diff = next->at - NOW;
233 tval.tv_sec = (int)diff; 309 tval.tv_sec = (int)diff;
234 tval.tv_usec = (int) ((diff - tval.tv_sec) * 1000000); 310 tval.TV_FRAC = (int) ((diff - tval.tv_sec) * TV_MULT);
235 to = &tval; 311 to = &tval;
236 } 312 }
237 break; 313 break;
238 } 314 }
239 else 315 else
240 { 316 {
241 unreg (next); 317 unreg (*next);
242 next->call (*next); 318 next->call (*next);
243 } 319 }
244 } 320 }
245#endif 321#endif
246
247 } 322 }
248 323
249#if IOM_CHECK 324#if IOM_CHECK
250 tw.activity = false; 325 tw.activity = false;
251 326
… …
256 cw[i]->call (*cw[i]); 331 cw[i]->call (*cw[i]);
257 332
258 if (tw.activity) 333 if (tw.activity)
259 { 334 {
260 tval.tv_sec = 0; 335 tval.tv_sec = 0;
261 tval.tv_usec = 0; 336 tval.TV_FRAC = 0;
262 to = &tval; 337 to = &tval;
263 } 338 }
264#endif 339#endif
265 340
266#if IOM_IO 341#if IOM_IO || IOM_SIG
267 fd_set rfd, wfd; 342 fd_set rfd, wfd;
268 343
269 FD_ZERO (&rfd); 344 FD_ZERO (&rfd);
270 FD_ZERO (&wfd); 345 FD_ZERO (&wfd);
271 346
272 int fds = 0; 347 int fds = 0;
273 348
349# if IOM_IO
274 for (io_manager_vec<io_watcher>::iterator i = iow.end (); i-- > iow.begin (); ) 350 for (io_manager_vec<io_watcher>::iterator i = iow.end (); i-- > iow.begin (); )
275 if (*i) 351 if (*i)
276 { 352 {
277 if ((*i)->events & EVENT_READ ) FD_SET ((*i)->fd, &rfd); 353 if ((*i)->events & EVENT_READ ) FD_SET ((*i)->fd, &rfd);
278 if ((*i)->events & EVENT_WRITE) FD_SET ((*i)->fd, &wfd); 354 if ((*i)->events & EVENT_WRITE) FD_SET ((*i)->fd, &wfd);
279 355
280 if ((*i)->fd >= fds) fds = (*i)->fd + 1; 356 if ((*i)->fd >= fds) fds = (*i)->fd + 1;
281 } 357 }
358# endif
282 359
283 if (!to && !fds) //TODO: also check idle_watchers and check_watchers 360 if (!to && !fds) //TODO: also check idle_watchers and check_watchers
284 break; // no events 361 break; // no events
285 362
363# if IOM_SIG
364 FD_SET (sigpipe[0], &rfd);
365 if (sigpipe[0] >= fds) fds = sigpipe[0] + 1;
366# endif
367
368# if IOM_SIG
369 // there is no race, as we use a pipe for signals, so select
370 // will return if a signal is caught.
371 sigprocmask (SIG_UNBLOCK, &sigs, NULL);
372# endif
286 fds = select (fds, &rfd, &wfd, NULL, to); 373 fds = select (fds, &rfd, &wfd, NULL, to);
374# if IOM_SIG
375 sigprocmask (SIG_BLOCK, &sigs, NULL);
376# endif
377
287# if IOM_TIME 378# if IOM_TIME
288 set_now (); 379 set_now ();
289# endif 380# endif
290 381
291 if (fds > 0) 382 if (fds > 0)
292 for (int i = iow.size (); i--; ) 383 {
293 if (!iow[i]) 384# if IOM_SIG
294 iow.erase_unordered (i); 385 if (FD_ISSET (sigpipe[0], &rfd))
295 else
296 { 386 {
297 short revents = iow[i]->events; 387 char ch;
298 388
299 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ; 389 while (read (sigpipe[0], &ch, 1) > 0)
300 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE; 390 ;
301 391
302 if (revents) 392 for (sig_vec **svp = sw.end (); svp-- > sw.begin (); )
303 iow[i]->call (*iow[i], revents); 393 if (*svp && (*svp)->pending)
394 {
395 sig_vec &sv = **svp;
396 for (int i = sv.size (); i--; )
397 if (!sv[i])
398 sv.erase_unordered (i);
399 else
400 sv[i]->call (*sv[i]);
401
402 sv.pending = false;
403 }
304 } 404 }
405# endif
406
407# if IOM_IO
408 for (int i = iow.size (); i--; )
409 if (!iow[i])
410 iow.erase_unordered (i);
411 else
412 {
413 short revents = iow[i]->events;
414
415 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ;
416 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE;
417
418 if (revents)
419 iow[i]->call (*iow[i], revents);
420 }
421#endif
422 }
305 else if (fds < 0 && errno != EINTR) 423 else if (fds < 0 && errno != EINTR)
306 { 424 {
307 perror ("Error while waiting for I/O or time event"); 425 perror ("io_manager: fatal error while waiting for I/O or time event, aborting.");
308 abort (); 426 abort ();
309 } 427 }
310#if IOM_IDLE 428#if IOM_IDLE
311 else 429 else
312 for (int i = iw.size (); i--; ) 430 for (int i = iw.size (); i--; )
… …
323 select (0, 0, 0, 0, &to); 441 select (0, 0, 0, 0, &to);
324 set_now (); 442 set_now ();
325#else 443#else
326 break; 444 break;
327#endif 445#endif
328
329 } 446 }
330} 447}
331 448
332io_manager::io_manager ()
333{
334 iom_valid = true;
335
336#if IOM_TIME
337 set_now ();
338
339 tw0.start (TSTAMP_MAX);
340#endif
341}
342
343io_manager::~io_manager ()
344{
345 iom_valid = false;
346}
347

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines