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.25 by root, Wed Dec 15 02:53:49 2004 UTC vs.
Revision 1.31 by root, Wed Jan 11 21:23:39 2006 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
136 135
137 tw0.start (TSTAMP_MAX); 136 tw0.start (TSTAMP_MAX);
138#endif 137#endif
139 } 138 }
140 139
140 ~init ()
141 {
142 iom_valid = false;
143 }
144
141 static void required (); 145 static void required ();
142} init; 146} init;
143 147
144void 148void
145init::required () 149init::required ()
380# if IOM_SIG 384# if IOM_SIG
381 sigprocmask (SIG_BLOCK, &sigs, NULL); 385 sigprocmask (SIG_BLOCK, &sigs, NULL);
382# endif 386# endif
383 387
384# if IOM_TIME 388# if IOM_TIME
389 {
390 // update time, try to compensate for gross non-monotonic time changes
391 tstamp diff = NOW;
385 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 }
386# endif 400# endif
387 401
388 if (fds > 0) 402 if (fds > 0)
389 { 403 {
390# if IOM_SIG 404# if IOM_SIG
414 for (int i = iow.size (); i--; ) 428 for (int i = iow.size (); i--; )
415 if (!iow[i]) 429 if (!iow[i])
416 iow.erase_unordered (i); 430 iow.erase_unordered (i);
417 else 431 else
418 { 432 {
433 io_watcher &w = *iow[i];
419 short revents = iow[i]->events; 434 short revents = w.events;
420 435
421 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ; 436 if (!FD_ISSET (w.fd, &rfd)) revents &= ~EVENT_READ;
422 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE; 437 if (!FD_ISSET (w.fd, &wfd)) revents &= ~EVENT_WRITE;
423 438
424 if (revents) 439 if (revents)
425 iow[i]->call (*iow[i], revents); 440 w.call (w, revents);
426 } 441 }
427#endif 442#endif
428 } 443 }
429 else if (fds < 0 && errno != EINTR) 444 else if (fds < 0 && errno != EINTR)
430 { 445 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines