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

Diff Legend

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