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.26 by pcg, Wed Dec 15 02:59:54 2004 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 <pcg@goof.com>
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
94 } tw0; 94 } tw0;
95 95
96tstamp NOW; 96tstamp NOW;
97 97
98#if IOM_TIME 98#if IOM_TIME
99inline void set_now (void) 99tstamp io_manager::now ()
100{ 100{
101 struct timeval tv; 101 struct timeval tv;
102 102
103 gettimeofday (&tv, 0); 103 gettimeofday (&tv, 0);
104 NOW = (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.; 104 return (tstamp)tv.tv_sec + (tstamp)tv.tv_usec / 1000000.;
105}
106
107void io_manager::set_now ()
108{
109 NOW = now ();
105} 110}
106#endif 111#endif
107 112
108static bool iom_valid; 113static bool iom_valid;
109 114
118 { 123 {
119 perror ("io_manager: unable to create signal pipe, aborting."); 124 perror ("io_manager: unable to create signal pipe, aborting.");
120 abort (); 125 abort ();
121 } 126 }
122 127
123 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); 128 fcntl (sigpipe[0], F_SETFL, O_NONBLOCK); fcntl (sigpipe[0], F_SETFD, FD_CLOEXEC);
124 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); 129 fcntl (sigpipe[1], F_SETFL, O_NONBLOCK); fcntl (sigpipe[1], F_SETFD, FD_CLOEXEC);
125#endif 130#endif
126 131
127 iom_valid = true; 132 iom_valid = true;
128 133
129#if IOM_TIME 134#if IOM_TIME
130 set_now (); 135 io_manager::set_now ();
131 136
132 tw0.start (TSTAMP_MAX); 137 tw0.start (TSTAMP_MAX);
133#endif 138#endif
134 } 139 }
135 140
283 activity = false; 288 activity = false;
284 289
285 for (int i = tw.size (); i--; ) 290 for (int i = tw.size (); i--; )
286 if (!tw[i]) 291 if (!tw[i])
287 tw.erase_unordered (i); 292 tw.erase_unordered (i);
288 else if (tw[i]->at <= NOW + IOM_ACCURACY) 293 else if (tw[i]->at <= NOW)
289 { 294 {
290 time_watcher &w = *tw[i]; 295 time_watcher &w = *tw[i];
291 296
292 unreg (w); 297 unreg (w);
293 w.call (w); 298 w.call (w);
388 char ch; 393 char ch;
389 394
390 while (read (sigpipe[0], &ch, 1) > 0) 395 while (read (sigpipe[0], &ch, 1) > 0)
391 ; 396 ;
392 397
393 for (sig_vec **svp = sw.end (); svp-- > sw.begin (); ) 398 for (vector<sig_vec *>::iterator svp = sw.end (); svp-- > sw.begin (); )
394 if (*svp && (*svp)->pending) 399 if (*svp && (*svp)->pending)
395 { 400 {
396 sig_vec &sv = **svp; 401 sig_vec &sv = **svp;
397 for (int i = sv.size (); i--; ) 402 for (int i = sv.size (); i--; )
398 if (!sv[i]) 403 if (!sv[i])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines