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

Comparing gvpe/src/iom.C (file contents):
Revision 1.23 by pcg, Fri Nov 12 10:23:33 2004 UTC vs.
Revision 1.32 by pcg, Tue Apr 26 00:55:56 2005 UTC

1/* 1/*
2 iom.C -- generic I/O multiplexer 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
134 } 138 }
135 139
… …
283 activity = false; 287 activity = false;
284 288
285 for (int i = tw.size (); i--; ) 289 for (int i = tw.size (); i--; )
286 if (!tw[i]) 290 if (!tw[i])
287 tw.erase_unordered (i); 291 tw.erase_unordered (i);
288 else if (tw[i]->at <= NOW + IOM_ACCURACY) 292 else if (tw[i]->at <= NOW)
289 { 293 {
290 time_watcher &w = *tw[i]; 294 time_watcher &w = *tw[i];
291 295
292 unreg (w); 296 unreg (w);
293 w.call (w); 297 w.call (w);
… …
375# if IOM_SIG 379# if IOM_SIG
376 sigprocmask (SIG_BLOCK, &sigs, NULL); 380 sigprocmask (SIG_BLOCK, &sigs, NULL);
377# endif 381# endif
378 382
379# if IOM_TIME 383# if IOM_TIME
384 {
385 // update time, try to compensate for gross non-monotonic time changes
386 tstamp diff = NOW;
380 set_now (); 387 set_now ();
388 diff = NOW - diff;
389
390 if (diff < 0)
391 for (io_manager_vec<time_watcher>::const_iterator i = tw.end (); i-- > tw.begin (); )
392 if (*i)
393 (*i)->at += diff;
394 }
381# endif 395# endif
382 396
383 if (fds > 0) 397 if (fds > 0)
384 { 398 {
385# if IOM_SIG 399# if IOM_SIG
… …
388 char ch; 402 char ch;
389 403
390 while (read (sigpipe[0], &ch, 1) > 0) 404 while (read (sigpipe[0], &ch, 1) > 0)
391 ; 405 ;
392 406
393 for (sig_vec **svp = sw.end (); svp-- > sw.begin (); ) 407 for (vector<sig_vec *>::iterator svp = sw.end (); svp-- > sw.begin (); )
394 if (*svp && (*svp)->pending) 408 if (*svp && (*svp)->pending)
395 { 409 {
396 sig_vec &sv = **svp; 410 sig_vec &sv = **svp;
397 for (int i = sv.size (); i--; ) 411 for (int i = sv.size (); i--; )
398 if (!sv[i]) 412 if (!sv[i])
… …
409 for (int i = iow.size (); i--; ) 423 for (int i = iow.size (); i--; )
410 if (!iow[i]) 424 if (!iow[i])
411 iow.erase_unordered (i); 425 iow.erase_unordered (i);
412 else 426 else
413 { 427 {
428 io_watcher &w = *iow[i];
414 short revents = iow[i]->events; 429 short revents = w.events;
415 430
416 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ; 431 if (!FD_ISSET (w.fd, &rfd)) revents &= ~EVENT_READ;
417 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE; 432 if (!FD_ISSET (w.fd, &wfd)) revents &= ~EVENT_WRITE;
418 433
419 if (revents) 434 if (revents)
420 iow[i]->call (*iow[i], revents); 435 w.call (w, revents);
421 } 436 }
422#endif 437#endif
423 } 438 }
424 else if (fds < 0 && errno != EINTR) 439 else if (fds < 0 && errno != EINTR)
425 { 440 {

Diff Legend

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