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

Diff Legend

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