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.9 by pcg, Sat Jan 17 01:20: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/select.h> 24#include <sys/select.h>
25#include <sys/time.h> 25#include <sys/time.h>
26 26
27#include "iom.h" 27#include "iom.h"
28 28
29// TSTAMP_MAX must still fit into a positive struct timeval
30#define TSTAMP_MAX (double)(1UL<<31)
31
29tstamp NOW; 32tstamp NOW;
30bool iom_valid; 33static bool iom_valid;
31io_manager iom; 34io_manager iom;
32 35
33template<class watcher> 36template<class watcher>
34void io_manager::reg (watcher *w, simplevec<watcher *> &queue) 37void io_manager::reg (watcher *w, io_manager_vec<watcher> &queue)
35{ 38{
36 if (find (queue.begin (), queue.end (), w) == queue.end ()) 39 if (!iom_valid)
40 abort ();
41
42 if (!w->active)
43 {
37 queue.push_back (w); 44 queue.push_back (w);
45 w->active = queue.size ();
46 }
38} 47}
39 48
40template<class watcher> 49template<class watcher>
41void io_manager::unreg (watcher *w, simplevec<watcher *> &queue) 50void io_manager::unreg (watcher *w, io_manager_vec<watcher> &queue)
42{ 51{
43 queue.erase (find (queue.begin (), queue.end (), w)); 52 if (!iom_valid)
53 return;
54
55 if (w->active)
56 {
57 queue [w->active - 1] = 0;
58 w->active = 0;
59 }
44} 60}
61
62#if IOM_TIME
63void time_watcher::trigger ()
64{
65 call (*this);
66
67 iom.reg (this);
68}
69
70void io_manager::reg (time_watcher *w) { reg (w, tw); }
71void io_manager::unreg (time_watcher *w) { unreg (w, tw); }
72#endif
45 73
46#if IOM_IO 74#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) 75void io_manager::reg (io_watcher *w) { reg (w, iow); }
54{
55 reg (w, iow);
56}
57
58void io_manager::unreg (io_watcher *w) 76void 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 77#endif
91 78
92#if IOM_CHECK 79#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) 80void io_manager::reg (check_watcher *w) { reg (w, cw); }
100{
101 reg (w, cw);
102}
103
104void io_manager::unreg (check_watcher *w) 81void io_manager::unreg (check_watcher *w) { unreg (w, cw); }
105{
106 unreg (w, cw);
107}
108#endif 82#endif
109 83
110#if IOM_IDLE 84#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) 85void io_manager::reg (idle_watcher *w) { reg (w, iw); }
118{
119 reg (w, iw);
120}
121
122void io_manager::unreg (idle_watcher *w) 86void io_manager::unreg (idle_watcher *w) { unreg (w, iw); }
123{
124 unreg (w, iw);
125}
126#endif 87#endif
127 88
128#if IOM_TIME 89#if IOM_TIME
129inline void set_now (void) 90inline void set_now (void)
130{ 91{
… …
156 } 117 }
157 else 118 else
158#endif 119#endif
159 { 120 {
160#if IOM_TIME 121#if IOM_TIME
161 time_watcher *w; 122 time_watcher *next;
162 123
163 for (;tw.size ();) 124 for (;;)
164 { 125 {
126 next = tw[0]; // the first time-watcher must exist at ALL times
127
128 for (int i = tw.size (); i--; )
129 if (!tw[i])
130 tw.erase_unordered (i);
131 else if (tw[i]->at < next->at)
165 w = tw[0]; 132 next = tw[i];
166 133
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) 134 if (next->at > NOW)
172 { 135 {
136 if (next != tw[0])
137 {
173 double diff = w->at - NOW; 138 double diff = next->at - NOW;
174 tval.tv_sec = (int)diff; 139 tval.tv_sec = (int)diff;
175 tval.tv_usec = (int)((diff - tval.tv_sec) * 1000000); 140 tval.tv_usec = (int)((diff - tval.tv_sec) * 1000000);
176 to = &tval; 141 to = &tval;
142 }
177 break; 143 break;
178 } 144 }
179 else if (w->at >= 0)
180 w->call (*w);
181 else 145 else
146 {
182 unreg (w); 147 unreg (next);
148 next->call (*next);
149 }
183 } 150 }
184#endif 151#endif
185 } 152 }
186 153
187#if IOM_CHECK 154#if IOM_CHECK
188 for (int i = 0; i < cw.size (); ++i) 155 for (int i = cw.size (); i--; )
156 if (!cw[i])
157 cw.erase_unordered (i);
158 else
189 cw[i]->call (*cw[i]); 159 cw[i]->call (*cw[i]);
190#endif 160#endif
191 161
192#if IOM_IO 162#if IOM_IO
193 fd_set rfd, wfd; 163 fd_set rfd, wfd, efd;
194 164
195 FD_ZERO (&rfd); 165 FD_ZERO (&rfd);
196 FD_ZERO (&wfd); 166 FD_ZERO (&wfd);
197 167
198 int fds = 0; 168 int fds = 0;
199 169
200 for (io_watcher **w = iow.begin (); w < iow.end (); ++w) 170 for (io_manager_vec<io_watcher>::iterator i = iow.end (); i-- > iow.begin (); )
171 if (*i)
201 { 172 {
202 if ((*w)->events & EVENT_READ ) FD_SET ((*w)->fd, &rfd); 173 if ((*i)->events & EVENT_READ ) FD_SET ((*i)->fd, &rfd);
203 if ((*w)->events & EVENT_WRITE) FD_SET ((*w)->fd, &wfd); 174 if ((*i)->events & EVENT_WRITE) FD_SET ((*i)->fd, &wfd);
204 175
205 if ((*w)->fd >= fds) fds = (*w)->fd + 1; 176 if ((*i)->fd >= fds) fds = (*i)->fd + 1;
206 } 177 }
207 178
208 if (!to && !fds) 179 if (!to && !fds) //TODO: also check idle_watchers and check_watchers
209 break; // no events 180 break; // no events
210 181
211 fds = select (fds, &rfd, &wfd, 0, to); 182 fds = select (fds, &rfd, &wfd, &efd, to);
212# if IOM_TIME 183# if IOM_TIME
213 set_now (); 184 set_now ();
214# endif 185# endif
215 186
216 if (fds > 0) 187 if (fds > 0)
217 for (int i = 0; i < iow.size (); ++i) 188 for (int i = iow.size (); i--; )
189 if (!iow[i])
190 iow.erase_unordered (i);
191 else
218 { 192 {
219 io_watcher *w = iow[i];
220
221 short revents = w->events; 193 short revents = iow[i]->events;
222 194
223 if (!FD_ISSET (w->fd, &rfd)) revents &= ~EVENT_READ; 195 if (!FD_ISSET (iow[i]->fd, &rfd)) revents &= ~EVENT_READ;
224 if (!FD_ISSET (w->fd, &wfd)) revents &= ~EVENT_WRITE; 196 if (!FD_ISSET (iow[i]->fd, &wfd)) revents &= ~EVENT_WRITE;
225 197
226 if (revents) 198 if (revents)
227 w->call (*w, revents); 199 iow[i]->call (*iow[i], revents);
228 } 200 }
201 else if (fds < 0 && errno != EINTR)
202 {
203 perror ("Error while waiting for I/O or time event");
204 abort ();
205 }
229#if IOM_IDLE 206#if IOM_IDLE
230 else if (iw.size ()) 207 else
231 for (int i = 0; i < iw.size (); ++i) 208 for (int i = iw.size (); i--; )
209 if (!iw[i])
210 iw.erase_unordered (i);
211 else
232 iw[i]->call (*iw[i]); 212 iw[i]->call (*iw[i]);
233#endif 213#endif
234 214
235#elif IOM_TIME 215#elif IOM_TIME
236 if (!to) 216 if (!to)
237 break; 217 break;
… …
242 break; 222 break;
243#endif 223#endif
244 } 224 }
245} 225}
246 226
227// this is a dummy time watcher to ensure that the first
228// time watcher is _always_ valid, this gets rid of a lot
229// of null-pointer-checks
230static struct tw0 : time_watcher {
231 void cb (time_watcher &w)
232 {
233 // should never get called
234 // reached end-of-time, or tstamp has a bogus definition :)
235 abort ();
236 }
237
238 tw0()
239 : time_watcher (this, &tw0::cb)
240 { }
241} tw0;
242
247io_manager::io_manager () 243io_manager::io_manager ()
248{ 244{
245 iom_valid = true;
246
249#if IOM_TIME 247#if IOM_TIME
250 set_now (); 248 set_now ();
251#endif
252 249
253 iom_valid = true; 250 tw0.start (TSTAMP_MAX);
251#endif
254} 252}
255 253
256io_manager::~io_manager () 254io_manager::~io_manager ()
257{ 255{
258 iom_valid = false; 256 iom_valid = false;

Diff Legend

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