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.7 by pcg, Fri Dec 19 06:17:03 2003 UTC vs.
Revision 1.11 by pcg, Mon Jan 19 17:26:43 2004 UTC

1/* 1/*
2 iom.C -- generic I/O multiplexor 2 iom.C -- generic I/O multiplexor
3 Copyright (C) 2003 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
8 (at your option) any later version. 8 (at your option) any later version.
… …
15 You should have received a copy of the GNU General Public License 15 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 16 along with this program; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 18*/
19 19
20#include "../config.h"
21
22#include <cstdio> 20#include <cstdio>
21#include <cstdlib>
22#include <cerrno>
23 23
24#include <sys/time.h>
25
26#if 1 // older unices need these includes for select(2)
27# include <unistd.h>
28# include <sys/types.h>
29#endif
30
31// if the BSDs would at least be marginally POSIX-compatible.. *sigh*
32// until that happens, sys/select.h must come last
24#include <sys/select.h> 33#include <sys/select.h>
25#include <sys/time.h>
26 34
27#include "iom.h" 35#include "iom.h"
28 36
37// TSTAMP_MAX must still fit into a positive struct timeval
38#define TSTAMP_MAX (double)(1UL<<31)
39
40// this is a dummy time watcher to ensure that the first
41// time watcher is _always_ valid, this gets rid of a lot
42// of null-pointer-checks
43// (must come _before_ iom is being defined)
44static struct tw0 : time_watcher {
45 void cb (time_watcher &w)
46 {
47 // should never get called
48 // reached end-of-time, or tstamp has a bogus definition,
49 // or compiler initilization order broken, or somethine else :)
50 abort ();
51 }
52
53 tw0()
54 : time_watcher (this, &tw0::cb)
55 { }
56} tw0;
57
29tstamp NOW; 58tstamp NOW;
30bool iom_valid; 59static bool iom_valid;
31io_manager iom; 60io_manager iom;
32 61
33template<class watcher> 62template<class watcher>
34void io_manager::reg (watcher *w, simplevec<watcher *> &queue) 63void io_manager::reg (watcher *w, io_manager_vec<watcher> &queue)
35{ 64{
36 if (find (queue.begin (), queue.end (), w) == queue.end ()) 65 if (!iom_valid)
66 abort ();
67
68 if (!w->active)
69 {
37 queue.push_back (w); 70 queue.push_back (w);
71 w->active = queue.size ();
72 }
38} 73}
39 74
40template<class watcher> 75template<class watcher>
41void io_manager::unreg (watcher *w, simplevec<watcher *> &queue) 76void io_manager::unreg (watcher *w, io_manager_vec<watcher> &queue)
42{ 77{
43 queue.erase (find (queue.begin (), queue.end (), w)); 78 if (!iom_valid)
79 return;
80
81 if (w->active)
82 {
83 queue [w->active - 1] = 0;
84 w->active = 0;
85 }
44} 86}
87
88#if IOM_TIME
89void time_watcher::trigger ()
90{
91 call (*this);
92
93 iom.reg (this);
94}
95
96void io_manager::reg (time_watcher *w) { reg (w, tw); }
97void io_manager::unreg (time_watcher *w) { unreg (w, tw); }
98#endif
45 99
46#if IOM_IO 100#if IOM_IO
47io_watcher::~io_watcher ()
48{
49 if (iom_valid)
50 iom.unreg (this);
51}
52
53void io_manager::reg (io_watcher *w) 101void io_manager::reg (io_watcher *w) { reg (w, iow); }
54{
55 reg (w, iow);
56}
57
58void io_manager::unreg (io_watcher *w) 102void io_manager::unreg (io_watcher *w) { unreg (w, iow); }
59{
60 unreg (w, iow);
61}
62
63#endif
64
65#if IOM_TIME
66void time_watcher::trigger ()
67{
68 call (*this);
69
70 iom.reg (this);
71}
72
73time_watcher::~time_watcher ()
74{
75 if (iom_valid)
76 iom.unreg (this);
77
78 at = TSTAMP_CANCEL;
79}
80
81void io_manager::reg (time_watcher *w)
82{
83 reg (w, tw);
84}
85
86void io_manager::unreg (time_watcher *w)
87{
88 unreg (w, tw);
89}
90#endif 103#endif
91 104
92#if IOM_CHECK 105#if IOM_CHECK
93check_watcher::~check_watcher ()
94{
95 if (iom_valid)
96 iom.unreg (this);
97}
98
99void io_manager::reg (check_watcher *w) 106void io_manager::reg (check_watcher *w) { reg (w, cw); }
100{
101 reg (w, cw);
102}
103
104void io_manager::unreg (check_watcher *w) 107void io_manager::unreg (check_watcher *w) { unreg (w, cw); }
105{
106 unreg (w, cw);
107}
108#endif 108#endif
109 109
110#if IOM_IDLE 110#if IOM_IDLE
111idle_watcher::~idle_watcher ()
112{
113 if (iom_valid)
114 iom.unreg (this);
115}
116
117void io_manager::reg (idle_watcher *w) 111void io_manager::reg (idle_watcher *w) { reg (w, iw); }
118{
119 reg (w, iw);
120}
121
122void io_manager::unreg (idle_watcher *w) 112void io_manager::unreg (idle_watcher *w) { unreg (w, iw); }
123{
124 unreg (w, iw);
125}
126#endif 113#endif
127 114
128#if IOM_TIME 115#if IOM_TIME
129inline void set_now (void) 116inline void set_now (void)
130{ 117{
… …
156 } 143 }
157 else 144 else
158#endif 145#endif
159 { 146 {
160#if IOM_TIME 147#if IOM_TIME
161 time_watcher *w; 148 time_watcher *next;
162 149
163 for (;tw.size ();) 150 for (;;)
164 { 151 {
152 next = tw[0]; // the first time-watcher must exist at ALL times
153
154 for (int i = tw.size (); i--; )
155 if (!tw[i])
156 tw.erase_unordered (i);
157 else if (tw[i]->at < next->at)
165 w = tw[0]; 158 next = tw[i];
166 159
167 for (time_watcher **i = tw.begin (); i < tw.end (); ++i)
168 if ((*i)->at < w->at)
169 w = *i;
170
171 if (w->at > NOW) 160 if (next->at > NOW)
172 { 161 {
162 if (next != tw[0])
163 {
173 double diff = w->at - NOW; 164 double diff = next->at - NOW;
174 tval.tv_sec = (int)diff; 165 tval.tv_sec = (int)diff;
175 tval.tv_usec = (int)((diff - tval.tv_sec) * 1000000); 166 tval.tv_usec = (int)((diff - tval.tv_sec) * 1000000);
176 to = &tval; 167 to = &tval;
168 }
177 break; 169 break;
178 } 170 }
179 else if (w->at >= 0)
180 w->call (*w);
181 else 171 else
172 {
182 unreg (w); 173 unreg (next);
174 next->call (*next);
175 }
183 } 176 }
184#endif 177#endif
185 } 178 }
186 179
187#if IOM_CHECK 180#if IOM_CHECK
188 for (int i = 0; i < cw.size (); ++i) 181 for (int i = cw.size (); i--; )
182 if (!cw[i])
183 cw.erase_unordered (i);
184 else
189 cw[i]->call (*cw[i]); 185 cw[i]->call (*cw[i]);
190#endif 186#endif
191 187
192#if IOM_IO 188#if IOM_IO
193 fd_set rfd, wfd; 189 fd_set rfd, wfd, efd;
194 190
195 FD_ZERO (&rfd); 191 FD_ZERO (&rfd);
196 FD_ZERO (&wfd); 192 FD_ZERO (&wfd);
197 193
198 int fds = 0; 194 int fds = 0;
199 195
200 for (io_watcher **w = iow.begin (); w < iow.end (); ++w) 196 for (io_manager_vec<io_watcher>::iterator i = iow.end (); i-- > iow.begin (); )
197 if (*i)
201 { 198 {
202 if ((*w)->events & EVENT_READ ) FD_SET ((*w)->fd, &rfd); 199 if ((*i)->events & EVENT_READ ) FD_SET ((*i)->fd, &rfd);
203 if ((*w)->events & EVENT_WRITE) FD_SET ((*w)->fd, &wfd); 200 if ((*i)->events & EVENT_WRITE) FD_SET ((*i)->fd, &wfd);
204 201
205 if ((*w)->fd >= fds) fds = (*w)->fd + 1; 202 if ((*i)->fd >= fds) fds = (*i)->fd + 1;
206 } 203 }
207 204
208 if (!to && !fds) 205 if (!to && !fds) //TODO: also check idle_watchers and check_watchers
209 break; // no events 206 break; // no events
210 207
211 fds = select (fds, &rfd, &wfd, 0, to); 208 fds = select (fds, &rfd, &wfd, &efd, to);
212# if IOM_TIME 209# if IOM_TIME
213 set_now (); 210 set_now ();
214# endif 211# endif
215 212
216 if (fds > 0) 213 if (fds > 0)
217 for (int i = 0; i < iow.size (); ++i) 214 for (int i = iow.size (); i--; )
215 if (!iow[i])
216 iow.erase_unordered (i);
217 else
218 { 218 {
219 io_watcher *w = iow[i];
220
221 short revents = w->events; 219 short revents = iow[i]->events;
222 220
223 if (!FD_ISSET (w->fd, &rfd)) revents &= ~EVENT_READ; 221 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ;
224 if (!FD_ISSET (w->fd, &wfd)) revents &= ~EVENT_WRITE; 222 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE;
225 223
226 if (revents) 224 if (revents)
227 w->call (*w, revents); 225 iow[i]->call (*iow[i], revents);
228 } 226 }
227 else if (fds < 0 && errno != EINTR)
228 {
229 perror ("Error while waiting for I/O or time event");
230 abort ();
231 }
229#if IOM_IDLE 232#if IOM_IDLE
230 else if (iw.size ()) 233 else
231 for (int i = 0; i < iw.size (); ++i) 234 for (int i = iw.size (); i--; )
235 if (!iw[i])
236 iw.erase_unordered (i);
237 else
232 iw[i]->call (*iw[i]); 238 iw[i]->call (*iw[i]);
233#endif 239#endif
234 240
235#elif IOM_TIME 241#elif IOM_TIME
236 if (!to) 242 if (!to)
237 break; 243 break;
… …
244 } 250 }
245} 251}
246 252
247io_manager::io_manager () 253io_manager::io_manager ()
248{ 254{
255 iom_valid = true;
256
249#if IOM_TIME 257#if IOM_TIME
250 set_now (); 258 set_now ();
251#endif
252 259
253 iom_valid = true; 260 tw0.start (TSTAMP_MAX);
261#endif
254} 262}
255 263
256io_manager::~io_manager () 264io_manager::~io_manager ()
257{ 265{
258 iom_valid = false; 266 iom_valid = false;

Diff Legend

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