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.12 by pcg, Thu Jan 29 23:26:01 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 {
70#if IOM_CHECK
71 queue.activity = true;
72#endif
37 queue.push_back (w); 73 queue.push_back (w);
74 w->active = queue.size ();
75 }
38} 76}
39 77
40template<class watcher> 78template<class watcher>
41void io_manager::unreg (watcher *w, simplevec<watcher *> &queue) 79void io_manager::unreg (watcher *w, io_manager_vec<watcher> &queue)
42{ 80{
43 queue.erase (find (queue.begin (), queue.end (), w)); 81 if (!iom_valid)
82 return;
83
84 if (w->active)
85 {
86 queue [w->active - 1] = 0;
87 w->active = 0;
88 }
44} 89}
90
91#if IOM_TIME
92void time_watcher::trigger ()
93{
94 call (*this);
95
96 iom.reg (this);
97}
98
99void io_manager::reg (time_watcher *w) { reg (w, tw); }
100void io_manager::unreg (time_watcher *w) { unreg (w, tw); }
101#endif
45 102
46#if IOM_IO 103#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) 104void io_manager::reg (io_watcher *w) { reg (w, iow); }
54{
55 reg (w, iow);
56}
57
58void io_manager::unreg (io_watcher *w) 105void 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 106#endif
91 107
92#if IOM_CHECK 108#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) 109void io_manager::reg (check_watcher *w) { reg (w, cw); }
100{
101 reg (w, cw);
102}
103
104void io_manager::unreg (check_watcher *w) 110void io_manager::unreg (check_watcher *w) { unreg (w, cw); }
105{
106 unreg (w, cw);
107}
108#endif 111#endif
109 112
110#if IOM_IDLE 113#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) 114void io_manager::reg (idle_watcher *w) { reg (w, iw); }
118{
119 reg (w, iw);
120}
121
122void io_manager::unreg (idle_watcher *w) 115void io_manager::unreg (idle_watcher *w) { unreg (w, iw); }
123{
124 unreg (w, iw);
125}
126#endif 116#endif
127 117
128#if IOM_TIME 118#if IOM_TIME
129inline void set_now (void) 119inline void set_now (void)
130{ 120{
… …
156 } 146 }
157 else 147 else
158#endif 148#endif
159 { 149 {
160#if IOM_TIME 150#if IOM_TIME
161 time_watcher *w; 151 time_watcher *next;
162 152
163 for (;tw.size ();) 153 for (;;)
164 { 154 {
155 next = tw[0]; // the first time-watcher must exist at ALL times
156
157 for (int i = tw.size (); i--; )
158 if (!tw[i])
159 tw.erase_unordered (i);
160 else if (tw[i]->at < next->at)
165 w = tw[0]; 161 next = tw[i];
166 162
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) 163 if (next->at > NOW)
172 { 164 {
165 if (next != tw[0])
166 {
173 double diff = w->at - NOW; 167 double diff = next->at - NOW;
174 tval.tv_sec = (int)diff; 168 tval.tv_sec = (int)diff;
175 tval.tv_usec = (int)((diff - tval.tv_sec) * 1000000); 169 tval.tv_usec = (int)((diff - tval.tv_sec) * 1000000);
176 to = &tval; 170 to = &tval;
171 }
177 break; 172 break;
178 } 173 }
179 else if (w->at >= 0)
180 w->call (*w);
181 else 174 else
175 {
182 unreg (w); 176 unreg (next);
177 next->call (*next);
178 }
183 } 179 }
184#endif 180#endif
185 } 181 }
186 182
187#if IOM_CHECK 183#if IOM_CHECK
184 tw.activity = false;
185
188 for (int i = 0; i < cw.size (); ++i) 186 for (int i = cw.size (); i--; )
187 if (!cw[i])
188 cw.erase_unordered (i);
189 else
189 cw[i]->call (*cw[i]); 190 cw[i]->call (*cw[i]);
191
192 if (tw.activity)
193 {
194 tval.tv_sec = 0;
195 tval.tv_usec = 0;
196 to = &tval;
197 }
190#endif 198#endif
191 199
192#if IOM_IO 200#if IOM_IO
193 fd_set rfd, wfd; 201 fd_set rfd, wfd, efd;
194 202
195 FD_ZERO (&rfd); 203 FD_ZERO (&rfd);
196 FD_ZERO (&wfd); 204 FD_ZERO (&wfd);
197 205
198 int fds = 0; 206 int fds = 0;
199 207
200 for (io_watcher **w = iow.begin (); w < iow.end (); ++w) 208 for (io_manager_vec<io_watcher>::iterator i = iow.end (); i-- > iow.begin (); )
209 if (*i)
201 { 210 {
202 if ((*w)->events & EVENT_READ ) FD_SET ((*w)->fd, &rfd); 211 if ((*i)->events & EVENT_READ ) FD_SET ((*i)->fd, &rfd);
203 if ((*w)->events & EVENT_WRITE) FD_SET ((*w)->fd, &wfd); 212 if ((*i)->events & EVENT_WRITE) FD_SET ((*i)->fd, &wfd);
204 213
205 if ((*w)->fd >= fds) fds = (*w)->fd + 1; 214 if ((*i)->fd >= fds) fds = (*i)->fd + 1;
206 } 215 }
207 216
208 if (!to && !fds) 217 if (!to && !fds) //TODO: also check idle_watchers and check_watchers
209 break; // no events 218 break; // no events
210 219
211 fds = select (fds, &rfd, &wfd, 0, to); 220 fds = select (fds, &rfd, &wfd, &efd, to);
212# if IOM_TIME 221# if IOM_TIME
213 set_now (); 222 set_now ();
214# endif 223# endif
215 224
216 if (fds > 0) 225 if (fds > 0)
217 for (int i = 0; i < iow.size (); ++i) 226 for (int i = iow.size (); i--; )
227 if (!iow[i])
228 iow.erase_unordered (i);
229 else
218 { 230 {
219 io_watcher *w = iow[i];
220
221 short revents = w->events; 231 short revents = iow[i]->events;
222 232
223 if (!FD_ISSET (w->fd, &rfd)) revents &= ~EVENT_READ; 233 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ;
224 if (!FD_ISSET (w->fd, &wfd)) revents &= ~EVENT_WRITE; 234 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE;
225 235
226 if (revents) 236 if (revents)
227 w->call (*w, revents); 237 iow[i]->call (*iow[i], revents);
228 } 238 }
239 else if (fds < 0 && errno != EINTR)
240 {
241 perror ("Error while waiting for I/O or time event");
242 abort ();
243 }
229#if IOM_IDLE 244#if IOM_IDLE
230 else if (iw.size ()) 245 else
231 for (int i = 0; i < iw.size (); ++i) 246 for (int i = iw.size (); i--; )
247 if (!iw[i])
248 iw.erase_unordered (i);
249 else
232 iw[i]->call (*iw[i]); 250 iw[i]->call (*iw[i]);
233#endif 251#endif
234 252
235#elif IOM_TIME 253#elif IOM_TIME
236 if (!to) 254 if (!to)
237 break; 255 break;
… …
244 } 262 }
245} 263}
246 264
247io_manager::io_manager () 265io_manager::io_manager ()
248{ 266{
267 iom_valid = true;
268
249#if IOM_TIME 269#if IOM_TIME
250 set_now (); 270 set_now ();
251#endif
252 271
253 iom_valid = true; 272 tw0.start (TSTAMP_MAX);
273#endif
254} 274}
255 275
256io_manager::~io_manager () 276io_manager::~io_manager ()
257{ 277{
258 iom_valid = false; 278 iom_valid = false;

Diff Legend

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