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.30 by pcg, Thu Mar 3 16:54:34 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. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#include "iom.h" 22#include "iom.h"
21 23
… …
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
… …
94 } tw0; 96 } tw0;
95 97
96tstamp NOW; 98tstamp NOW;
97 99
98#if IOM_TIME 100#if IOM_TIME
99inline void set_now (void) 101tstamp io_manager::now ()
100{ 102{
101 struct timeval tv; 103 struct timeval tv;
102 104
103 gettimeofday (&tv, 0); 105 gettimeofday (&tv, 0);
104 NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.; 106 return (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.;
107}
108
109void io_manager::set_now ()
110{
111 NOW = now ();
105} 112}
106#endif 113#endif
107 114
108static bool iom_valid; 115static bool iom_valid;
109 116
… …
118 { 125 {
119 perror ("io_manager: unable to create signal pipe, aborting."); 126 perror ("io_manager: unable to create signal pipe, aborting.");
120 abort (); 127 abort ();
121 } 128 }
122 129
123 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); 130 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC);
124 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); 131 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC);
125#endif 132#endif
126 133
127 iom_valid = true; 134 iom_valid = true;
128 135
129#if IOM_TIME 136#if IOM_TIME
130 set_now (); 137 io_manager::set_now ();
131 138
132 tw0.start (TSTAMP_MAX); 139 tw0.start (TSTAMP_MAX);
133#endif 140#endif
134 } 141 }
135 142
… …
283 activity = false; 290 activity = false;
284 291
285 for (int i = tw.size (); i--; ) 292 for (int i = tw.size (); i--; )
286 if (!tw[i]) 293 if (!tw[i])
287 tw.erase_unordered (i); 294 tw.erase_unordered (i);
288 else if (tw[i]->at <= NOW + IOM_ACCURACY) 295 else if (tw[i]->at <= NOW)
289 { 296 {
290 time_watcher &w = *tw[i]; 297 time_watcher &w = *tw[i];
291 298
292 unreg (w); 299 unreg (w);
293 w.call (w); 300 w.call (w);
… …
375# if IOM_SIG 382# if IOM_SIG
376 sigprocmask (SIG_BLOCK, &sigs, NULL); 383 sigprocmask (SIG_BLOCK, &sigs, NULL);
377# endif 384# endif
378 385
379# if IOM_TIME 386# if IOM_TIME
387 {
388 // update time, try to compensate for gross non-monotonic time changes
389 tstamp diff = NOW;
380 set_now (); 390 set_now ();
391 diff = NOW - diff;
392
393 if (diff < 0)
394 for (io_manager_vec<time_watcher>::const_iterator i = tw.end (); i-- > tw.begin (); )
395 if (*i)
396 (*i)->at += diff;
397 }
381# endif 398# endif
382 399
383 if (fds > 0) 400 if (fds > 0)
384 { 401 {
385# if IOM_SIG 402# if IOM_SIG
… …
388 char ch; 405 char ch;
389 406
390 while (read (sigpipe[0], &ch, 1) > 0) 407 while (read (sigpipe[0], &ch, 1) > 0)
391 ; 408 ;
392 409
393 for (sig_vec **svp = sw.end (); svp-- > sw.begin (); ) 410 for (vector<sig_vec *>::iterator svp = sw.end (); svp-- > sw.begin (); )
394 if (*svp && (*svp)->pending) 411 if (*svp && (*svp)->pending)
395 { 412 {
396 sig_vec &sv = **svp; 413 sig_vec &sv = **svp;
397 for (int i = sv.size (); i--; ) 414 for (int i = sv.size (); i--; )
398 if (!sv[i]) 415 if (!sv[i])
… …
409 for (int i = iow.size (); i--; ) 426 for (int i = iow.size (); i--; )
410 if (!iow[i]) 427 if (!iow[i])
411 iow.erase_unordered (i); 428 iow.erase_unordered (i);
412 else 429 else
413 { 430 {
431 io_watcher &w = *iow[i];
414 short revents = iow[i]->events; 432 short revents = w.events;
415 433
416 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ; 434 if (!FD_ISSET (w.fd, &rfd)) revents &= ~EVENT_READ;
417 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE; 435 if (!FD_ISSET (w.fd, &wfd)) revents &= ~EVENT_WRITE;
418 436
419 if (revents) 437 if (revents)
420 iow[i]->call (*iow[i], revents); 438 w.call (w, revents);
421 } 439 }
422#endif 440#endif
423 } 441 }
424 else if (fds < 0 && errno != EINTR) 442 else if (fds < 0 && errno != EINTR)
425 { 443 {

Diff Legend

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