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.26 by pcg, Wed Dec 15 02:59:54 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
380# if IOM_SIG 382# if IOM_SIG
381 sigprocmask (SIG_BLOCK, &sigs, NULL); 383 sigprocmask (SIG_BLOCK, &sigs, NULL);
382# endif 384# endif
383 385
384# if IOM_TIME 386# if IOM_TIME
387 {
388 // update time, try to compensate for gross non-monotonic time changes
389 tstamp diff = NOW;
385 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 }
386# endif 398# endif
387 399
388 if (fds > 0) 400 if (fds > 0)
389 { 401 {
390# if IOM_SIG 402# if IOM_SIG
414 for (int i = iow.size (); i--; ) 426 for (int i = iow.size (); i--; )
415 if (!iow[i]) 427 if (!iow[i])
416 iow.erase_unordered (i); 428 iow.erase_unordered (i);
417 else 429 else
418 { 430 {
431 io_watcher &w = *iow[i];
419 short revents = iow[i]->events; 432 short revents = w.events;
420 433
421 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ; 434 if (!FD_ISSET (w.fd, &rfd)) revents &= ~EVENT_READ;
422 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE; 435 if (!FD_ISSET (w.fd, &wfd)) revents &= ~EVENT_WRITE;
423 436
424 if (revents) 437 if (revents)
425 iow[i]->call (*iow[i], revents); 438 w.call (w, revents);
426 } 439 }
427#endif 440#endif
428 } 441 }
429 else if (fds < 0 && errno != EINTR) 442 else if (fds < 0 && errno != EINTR)
430 { 443 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines