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.19 by root, Thu Sep 2 07:44:40 2004 UTC vs.
Revision 1.31 by root, Wed Jan 11 21:23:39 2006 UTC

1/* 1/*
2 iom.C -- generic I/O multiplexor 2 iom.C -- generic I/O multiplexer
3 Copyright (C) 2003, 2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003, 2004 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include "iom.h" 22#include "iom.h"
21 23
22#include <cstdio> 24#include <cstdio>
… …
33# include <time.h> 35# include <time.h>
34#endif 36#endif
35 37
36// for IOM_SIG 38// for IOM_SIG
37#if IOM_SIG 39#if IOM_SIG
38# include <signal.h> 40# include <csignal>
39# include <fcntl.h> 41# include <fcntl.h>
40#endif 42#endif
41 43
42// if the BSDs would at least be marginally POSIX-compatible.. *sigh* 44// if the BSDs would at least be marginally POSIX-compatible.. *sigh*
43// until that happens, sys/select.h must come last 45// until that happens, sys/select.h must come last
44#include <sys/select.h> 46#include <sys/select.h>
45
46// TSTAMP_MAX must still fit into a positive struct timeval
47#define TSTAMP_MAX (double)(1UL<<31)
48 47
49#define TIMEVAL timeval 48#define TIMEVAL timeval
50#define TV_FRAC tv_usec 49#define TV_FRAC tv_usec
51#define TV_MULT 1000000L 50#define TV_MULT 1000000L
52 51
… …
94 } tw0; 93 } tw0;
95 94
96tstamp NOW; 95tstamp NOW;
97 96
98#if IOM_TIME 97#if IOM_TIME
99inline void set_now (void) 98tstamp io_manager::now ()
100{ 99{
101 struct timeval tv; 100 struct timeval tv;
102 101
103 gettimeofday (&tv, 0); 102 gettimeofday (&tv, 0);
104 NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.; 103 return (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.;
104}
105
106void io_manager::set_now ()
107{
108 NOW = now ();
105} 109}
106#endif 110#endif
107 111
108static bool iom_valid; 112static bool iom_valid;
109 113
… …
118 { 122 {
119 perror ("io_manager: unable to create signal pipe, aborting."); 123 perror ("io_manager: unable to create signal pipe, aborting.");
120 abort (); 124 abort ();
121 } 125 }
122 126
123 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); 127 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC);
124 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); 128 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC);
125#endif 129#endif
126 130
127 iom_valid = true; 131 iom_valid = true;
128 132
129#if IOM_TIME 133#if IOM_TIME
130 set_now (); 134 io_manager::set_now ();
131 135
132 tw0.start (TSTAMP_MAX); 136 tw0.start (TSTAMP_MAX);
133#endif 137#endif
138 }
139
140 ~init ()
141 {
142 iom_valid = false;
134 } 143 }
135 144
136 static void required (); 145 static void required ();
137} init; 146} init;
138 147
… …
152{ 161{
153 init::required (); 162 init::required ();
154 163
155 if (!w.active) 164 if (!w.active)
156 { 165 {
157#if IOM_CHECK
158 queue.activity = true;
159#endif
160 queue.push_back (&w); 166 queue.push_back (&w);
161 w.active = queue.size (); 167 w.active = queue.size ();
162 } 168 }
163} 169}
164 170
… …
273 set_now (); 279 set_now ();
274#endif 280#endif
275 281
276 for (;;) 282 for (;;)
277 { 283 {
284
285#if IOM_TIME
286 // call pending time watchers
287 {
288 bool activity;
289
290 do
291 {
292 activity = false;
293
294 for (int i = tw.size (); i--; )
295 if (!tw[i])
296 tw.erase_unordered (i);
297 else if (tw[i]->at <= NOW)
298 {
299 time_watcher &w = *tw[i];
300
301 unreg (w);
302 w.call (w);
303
304 activity = true;
305 }
306 }
307 while (activity);
308 }
309#endif
310
311#if IOM_CHECK
312 // call all check watchers
313 for (int i = cw.size (); i--; )
314 if (!cw[i])
315 cw.erase_unordered (i);
316 else
317 cw[i]->call (*cw[i]);
318#endif
319
278 struct TIMEVAL *to = 0; 320 struct TIMEVAL *to = 0;
279 struct TIMEVAL tval; 321 struct TIMEVAL tval;
280 322
281#if IOM_IDLE 323#if IOM_IDLE
282 if (iw.size ()) 324 if (iw.size ())
… …
287 } 329 }
288 else 330 else
289#endif 331#endif
290 { 332 {
291#if IOM_TIME 333#if IOM_TIME
292 time_watcher *next; 334 // find earliest active watcher
335 time_watcher *next = tw[0]; // the first time-watcher must exist at ALL times
293 336
294 for (;;) 337 for (io_manager_vec<time_watcher>::const_iterator i = tw.end (); i-- > tw.begin (); )
338 if (*i && (*i)->at < next->at)
339 next = *i;
340
341 if (next->at > NOW && next != tw[0])
295 { 342 {
296 next = tw[0]; // the first time-watcher must exist at ALL times
297
298 for (int i = tw.size (); i--; )
299 if (!tw[i])
300 tw.erase_unordered (i);
301 else if (tw[i]->at < next->at)
302 next = tw[i];
303
304 if (next->at > NOW)
305 {
306 if (next != tw[0])
307 {
308 double diff = next->at - NOW; 343 double diff = next->at - NOW;
309 tval.tv_sec = (int)diff; 344 tval.tv_sec = (int)diff;
310 tval.TV_FRAC = (int) ((diff - tval.tv_sec) * TV_MULT); 345 tval.TV_FRAC = (int) ((diff - tval.tv_sec) * TV_MULT);
311 to = &tval; 346 to = &tval;
312 }
313 break;
314 }
315 else
316 {
317 unreg (*next);
318 next->call (*next);
319 }
320 } 347 }
321#endif
322 }
323
324#if IOM_CHECK
325 tw.activity = false;
326
327 for (int i = cw.size (); i--; )
328 if (!cw[i])
329 cw.erase_unordered (i);
330 else
331 cw[i]->call (*cw[i]);
332
333 if (tw.activity)
334 {
335 tval.tv_sec = 0;
336 tval.TV_FRAC = 0;
337 to = &tval;
338 } 348 }
339#endif 349#endif
340 350
341#if IOM_IO || IOM_SIG 351#if IOM_IO || IOM_SIG
342 fd_set rfd, wfd; 352 fd_set rfd, wfd;
… …
345 FD_ZERO (&wfd); 355 FD_ZERO (&wfd);
346 356
347 int fds = 0; 357 int fds = 0;
348 358
349# if IOM_IO 359# if IOM_IO
350 for (io_manager_vec<io_watcher>::iterator i = iow.end (); i-- > iow.begin (); ) 360 for (io_manager_vec<io_watcher>::const_iterator i = iow.end (); i-- > iow.begin (); )
351 if (*i) 361 if (*i)
352 { 362 {
353 if ((*i)->events & EVENT_READ ) FD_SET ((*i)->fd, &rfd); 363 if ((*i)->events & EVENT_READ ) FD_SET ((*i)->fd, &rfd);
354 if ((*i)->events & EVENT_WRITE) FD_SET ((*i)->fd, &wfd); 364 if ((*i)->events & EVENT_WRITE) FD_SET ((*i)->fd, &wfd);
355 365
356 if ((*i)->fd >= fds) fds = (*i)->fd + 1; 366 if ((*i)->fd >= fds) fds = (*i)->fd + 1;
357 } 367 }
358# endif 368# endif
359 369
360 if (!to && !fds) //TODO: also check idle_watchers and check_watchers 370 if (!to && !fds) //TODO: also check idle_watchers and check_watchers?
361 break; // no events 371 break; // no events
362 372
363# if IOM_SIG 373# if IOM_SIG
364 FD_SET (sigpipe[0], &rfd); 374 FD_SET (sigpipe[0], &rfd);
365 if (sigpipe[0] >= fds) fds = sigpipe[0] + 1; 375 if (sigpipe[0] >= fds) fds = sigpipe[0] + 1;
… …
374# if IOM_SIG 384# if IOM_SIG
375 sigprocmask (SIG_BLOCK, &sigs, NULL); 385 sigprocmask (SIG_BLOCK, &sigs, NULL);
376# endif 386# endif
377 387
378# if IOM_TIME 388# if IOM_TIME
389 {
390 // update time, try to compensate for gross non-monotonic time changes
391 tstamp diff = NOW;
379 set_now (); 392 set_now ();
393 diff = NOW - diff;
394
395 if (diff < 0)
396 for (io_manager_vec<time_watcher>::const_iterator i = tw.end (); i-- > tw.begin (); )
397 if (*i)
398 (*i)->at += diff;
399 }
380# endif 400# endif
381 401
382 if (fds > 0) 402 if (fds > 0)
383 { 403 {
384# if IOM_SIG 404# if IOM_SIG
… …
387 char ch; 407 char ch;
388 408
389 while (read (sigpipe[0], &ch, 1) > 0) 409 while (read (sigpipe[0], &ch, 1) > 0)
390 ; 410 ;
391 411
392 for (sig_vec **svp = sw.end (); svp-- > sw.begin (); ) 412 for (vector<sig_vec *>::iterator svp = sw.end (); svp-- > sw.begin (); )
393 if (*svp && (*svp)->pending) 413 if (*svp && (*svp)->pending)
394 { 414 {
395 sig_vec &sv = **svp; 415 sig_vec &sv = **svp;
396 for (int i = sv.size (); i--; ) 416 for (int i = sv.size (); i--; )
397 if (!sv[i]) 417 if (!sv[i])
… …
408 for (int i = iow.size (); i--; ) 428 for (int i = iow.size (); i--; )
409 if (!iow[i]) 429 if (!iow[i])
410 iow.erase_unordered (i); 430 iow.erase_unordered (i);
411 else 431 else
412 { 432 {
433 io_watcher &w = *iow[i];
413 short revents = iow[i]->events; 434 short revents = w.events;
414 435
415 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ; 436 if (!FD_ISSET (w.fd, &rfd)) revents &= ~EVENT_READ;
416 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE; 437 if (!FD_ISSET (w.fd, &wfd)) revents &= ~EVENT_WRITE;
417 438
418 if (revents) 439 if (revents)
419 iow[i]->call (*iow[i], revents); 440 w.call (w, revents);
420 } 441 }
421#endif 442#endif
422 } 443 }
423 else if (fds < 0 && errno != EINTR) 444 else if (fds < 0 && errno != EINTR)
424 { 445 {

Diff Legend

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