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.22 by pcg, Thu Nov 11 17:41:55 2004 UTC vs.
Revision 1.33 by pcg, Wed Jan 11 21:27:05 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
… …
210 write (sigpipe[1], &ch, 1); 219 write (sigpipe[1], &ch, 1);
211} 220}
212 221
213void io_manager::reg (sig_watcher &w) 222void io_manager::reg (sig_watcher &w)
214{ 223{
224 init::required ();
225
215 assert (0 < w.signum); 226 assert (0 < w.signum);
216 227
217 sw.reserve (w.signum); 228 sw.reserve (w.signum);
218 229
219 while (sw.size () < w.signum) // pathetic 230 while (sw.size () < w.signum) // pathetic
… …
244 io_manager::reg (w, *sv); 255 io_manager::reg (w, *sv);
245} 256}
246 257
247void io_manager::unreg (sig_watcher &w) 258void io_manager::unreg (sig_watcher &w)
248{ 259{
249 if (!w.active) 260 if (!w.active || !iom_valid)
250 return; 261 return;
251 262
252 assert (0 < w.signum && w.signum <= sw.size ()); 263 assert (0 < w.signum && w.signum <= sw.size ());
253 264
254 io_manager::unreg (w, *sw[w.signum - 1]); 265 io_manager::unreg (w, *sw[w.signum - 1]);
… …
283 activity = false; 294 activity = false;
284 295
285 for (int i = tw.size (); i--; ) 296 for (int i = tw.size (); i--; )
286 if (!tw[i]) 297 if (!tw[i])
287 tw.erase_unordered (i); 298 tw.erase_unordered (i);
288 else if (tw[i]->at <= NOW + IOM_ACCURACY) 299 else if (tw[i]->at <= NOW)
289 { 300 {
290 time_watcher &w = *tw[i]; 301 time_watcher &w = *tw[i];
291 302
292 unreg (w); 303 unreg (w);
293 w.call (w); 304 w.call (w);
… …
375# if IOM_SIG 386# if IOM_SIG
376 sigprocmask (SIG_BLOCK, &sigs, NULL); 387 sigprocmask (SIG_BLOCK, &sigs, NULL);
377# endif 388# endif
378 389
379# if IOM_TIME 390# if IOM_TIME
391 {
392 // update time, try to compensate for gross non-monotonic time changes
393 tstamp diff = NOW;
380 set_now (); 394 set_now ();
395 diff = NOW - diff;
396
397 if (diff < 0)
398 for (io_manager_vec<time_watcher>::const_iterator i = tw.end (); i-- > tw.begin (); )
399 if (*i)
400 (*i)->at += diff;
401 }
381# endif 402# endif
382 403
383 if (fds > 0) 404 if (fds > 0)
384 { 405 {
385# if IOM_SIG 406# if IOM_SIG
… …
388 char ch; 409 char ch;
389 410
390 while (read (sigpipe[0], &ch, 1) > 0) 411 while (read (sigpipe[0], &ch, 1) > 0)
391 ; 412 ;
392 413
393 for (sig_vec **svp = sw.end (); svp-- > sw.begin (); ) 414 for (vector<sig_vec *>::iterator svp = sw.end (); svp-- > sw.begin (); )
394 if (*svp && (*svp)->pending) 415 if (*svp && (*svp)->pending)
395 { 416 {
396 sig_vec &sv = **svp; 417 sig_vec &sv = **svp;
397 for (int i = sv.size (); i--; ) 418 for (int i = sv.size (); i--; )
398 if (!sv[i]) 419 if (!sv[i])
… …
409 for (int i = iow.size (); i--; ) 430 for (int i = iow.size (); i--; )
410 if (!iow[i]) 431 if (!iow[i])
411 iow.erase_unordered (i); 432 iow.erase_unordered (i);
412 else 433 else
413 { 434 {
435 io_watcher &w = *iow[i];
414 short revents = iow[i]->events; 436 short revents = w.events;
415 437
416 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ; 438 if (!FD_ISSET (w.fd, &rfd)) revents &= ~EVENT_READ;
417 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE; 439 if (!FD_ISSET (w.fd, &wfd)) revents &= ~EVENT_WRITE;
418 440
419 if (revents) 441 if (revents)
420 iow[i]->call (*iow[i], revents); 442 w.call (w, revents);
421 } 443 }
422#endif 444#endif
423 } 445 }
424 else if (fds < 0 && errno != EINTR) 446 else if (fds < 0 && errno != EINTR)
425 { 447 {

Diff Legend

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