ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/iom.h
(Generate patch)

Comparing rxvt-unicode/src/iom.h (file contents):
Revision 1.26 by root, Thu Jan 19 11:56:00 2006 UTC vs.
Revision 1.30 by root, Thu Oct 25 10:44:14 2007 UTC

… …
39extern tstamp NOW; 39extern tstamp NOW;
40 40
41// TSTAMP_MAX must still fit into a positive struct timeval 41// TSTAMP_MAX must still fit into a positive struct timeval
42#define TSTAMP_MAX (double)(1UL<<31) 42#define TSTAMP_MAX (double)(1UL<<31)
43 43
44//#define IOM_LIBEVENT "event.h" *NOT* a supported feature
45#ifdef IOM_LIBEVENT
46# include <sys/time.h>
47# include IOM_LIBEVENT
48# undef IOM_IO
49# define IOM_IO 1
50#endif
51
44struct watcher; 52struct watcher;
45#if IOM_IO 53#if IOM_IO
46struct io_watcher; 54struct io_watcher;
47#endif 55#endif
48#if IOM_TIME 56#if IOM_TIME
… …
90 // set NOW 98 // set NOW
91 static void set_now (); 99 static void set_now ();
92#endif 100#endif
93 101
94 // register a watcher 102 // register a watcher
103#ifndef IOM_LIBEVENT
95#if IOM_IO 104#if IOM_IO
96 static void reg (io_watcher &w); static void unreg (io_watcher &w); 105 static void reg (io_watcher &w); static void unreg (io_watcher &w);
97#endif 106#endif
98#if IOM_TIME 107#if IOM_TIME
99 static void reg (time_watcher &w); static void unreg (time_watcher &w); 108 static void reg (time_watcher &w); static void unreg (time_watcher &w);
100#endif 109#endif
110#if IOM_SIG
111 static void reg (sig_watcher &w); static void unreg (sig_watcher &w);
112#endif
101#if IOM_CHECK 113#if IOM_CHECK
102 static void reg (check_watcher &w); static void unreg (check_watcher &w); 114 static void reg (check_watcher &w); static void unreg (check_watcher &w);
103#endif 115#endif
116#endif
104#if IOM_IDLE 117#if IOM_IDLE
105 static void reg (idle_watcher &w); static void unreg (idle_watcher &w); 118 static void reg (idle_watcher &w); static void unreg (idle_watcher &w);
106#endif 119#endif
107#if IOM_SIG
108 static void reg (sig_watcher &w); static void unreg (sig_watcher &w);
109#endif
110#if IOM_CHILD 120#if IOM_CHILD
111 static void reg (child_watcher &w); static void unreg (child_watcher &w); 121 static void reg (child_watcher &w); static void unreg (child_watcher &w);
112#endif 122#endif
113 123
114 static void loop (); 124 static void loop ();
115}; 125};
116 126
117struct watcher { 127struct watcher {
118 int active; /* 0 == inactive, else index into respective vector */ 128 int active; /* 0 == inactive, else index into respective vector */
119 129
130 bool is_active () { return active; }
131
120 watcher () : active (0) { } 132 watcher () : active (0) { }
121}; 133};
122 134
123#if IOM_IO 135#if IOM_IO
136#ifdef IOM_LIBEVENT
137enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = EV_READ, EVENT_WRITE = EV_WRITE };
138
139void iom_io_c_callback (int fd, short events, void *data);
140
141struct io_watcher : watcher, callback<void (io_watcher &, short)> {
142 struct event ev;
143 int fd;
144
145 void set (int fd_, short events_) { fd = fd_; event_set (&ev, fd_, events_, iom_io_c_callback, (void *)this); }
146
147 void set (short events_) { set (fd, events_); }
148 void start () { event_add (&ev, 0); active = 1; }
149 void start (int fd_, short events_) { set (fd_, events_); start (); }
150 void stop () { if (active) event_del (&ev); active = 0; }
151
152 template<class O, class M>
153 io_watcher (O object, M method)
154 : callback<void (io_watcher &, short)> (object, method)
155 { }
156 ~io_watcher () { stop (); }
157};
158#else
124enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 }; 159enum { EVENT_UNDEF = -1, EVENT_NONE = 0, EVENT_READ = 1, EVENT_WRITE = 2 };
125 160
126struct io_watcher : watcher, callback2<void, io_watcher &, short> { 161struct io_watcher : watcher, callback<void (io_watcher &, short)> {
127 int fd; 162 int fd;
128 short events; 163 short events;
129 164
130 void set (int fd_, short events_) { fd = fd_; events = events_; } 165 void set (int fd_, short events_) { fd = fd_; events = events_; }
131 166
132 void set (short events_) { set (fd, events_); } 167 void set (short events_) { set (fd, events_); }
133 void start () { io_manager::reg (*this); } 168 void start () { io_manager::reg (*this); }
134 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); } 169 void start (int fd_, short events_) { set (fd_, events_); start (); }
135 void stop () { io_manager::unreg (*this); } 170 void stop () { io_manager::unreg (*this); }
136 171
137 template<class O1, class O2> 172 template<class O, class M>
138 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short)) 173 io_watcher (O object, M method)
139 : callback2<void, io_watcher &, short> (object, method) 174 : callback<void (io_watcher &, short)> (object, method)
140 { } 175 { }
141 ~io_watcher () { stop (); } 176 ~io_watcher () { stop (); }
142}; 177};
143#endif 178#endif
179#endif
144 180
145#if IOM_TIME 181#if IOM_TIME
182#ifdef IOM_LIBEVENT
183void iom_time_c_callback (int fd, short events, void *data);
184
146struct time_watcher : watcher, callback1<void, time_watcher &> { 185struct time_watcher : watcher, callback<void (time_watcher &)> {
186 struct event ev;
147 tstamp at; 187 tstamp at;
148 188
149 void trigger (); 189 void trigger ();
150 190
151 void set (tstamp when) { at = when; } 191 void set (tstamp when) { at = when; }
152 void operator () () { trigger (); } 192 void operator () () { trigger (); }
153 void start () { io_manager::reg (*this); } 193 void start ()
194 {
195 struct timeval tv;
196 tv.tv_sec = (long)at;
197 tv.tv_usec = (long)((at - (tstamp)tv.tv_sec) * 1000000.);
198 evtimer_add (&ev, &tv);
199 active = 1;
200 }
154 void start (tstamp when) { set (when); io_manager::reg (*this); } 201 void start (tstamp when) { set (when); start (); }
155 void stop () { io_manager::unreg (*this); } 202 void stop () { if (active) evtimer_del (&ev); active = 0; }
156 203
157 template<class O1, class O2> 204 template<class O, class M>
158 time_watcher (O1 *object, void (O2::*method) (time_watcher &)) 205 time_watcher (O object, M method)
159 : callback1<void, time_watcher &> (object, method), at (0) 206 : callback<void (time_watcher &)> (object, method), at (0)
160 { } 207 {
208 evtimer_set (&ev, iom_time_c_callback, (void *)this);
209 }
161 ~time_watcher () { stop (); } 210 ~time_watcher () { stop (); }
162}; 211};
212#else
213struct time_watcher : watcher, callback<void (time_watcher &)> {
214 tstamp at;
215
216 void trigger ();
217
218 void set (tstamp when) { at = when; }
219 void operator () () { trigger (); }
220 void start () { io_manager::reg (*this); }
221 void start (tstamp when) { set (when); start (); }
222 void stop () { io_manager::unreg (*this); }
223
224 template<class O, class M>
225 time_watcher (O object, M method)
226 : callback<void (time_watcher &)> (object, method), at (0)
227 { }
228 ~time_watcher () { stop (); }
229};
230#endif
163#endif 231#endif
164 232
165#if IOM_CHECK 233#if IOM_CHECK
166// run before checking for new events 234// run before checking for new events
167struct check_watcher : watcher, callback1<void, check_watcher &> { 235struct check_watcher : watcher, callback<void (check_watcher &)> {
168 void start () { io_manager::reg (*this); }
169 void stop () { io_manager::unreg (*this); } 236 void start () { io_manager::reg (*this); }
237 void stop () { io_manager::unreg (*this); }
170 238
171 template<class O1, class O2> 239 template<class O, class M>
172 check_watcher (O1 *object, void (O2::*method) (check_watcher &)) 240 check_watcher (O object, M method)
173 : callback1<void, check_watcher &> (object, method) 241 : callback<void (check_watcher &)> (object, method)
174 { } 242 { }
175 ~check_watcher () { stop (); } 243 ~check_watcher () { stop (); }
176}; 244};
177#endif 245#endif
178 246
179#if IOM_IDLE 247#if IOM_IDLE
180// run after checking for any i/o, but before waiting 248// run after checking for any i/o, but before waiting
181struct idle_watcher : watcher, callback1<void, idle_watcher &> { 249struct idle_watcher : watcher, callback<void (idle_watcher &)> {
182 void start () { io_manager::reg (*this); }
183 void stop () { io_manager::unreg (*this); } 250 void start () { io_manager::reg (*this); }
251 void stop () { io_manager::unreg (*this); }
184 252
185 template<class O1, class O2> 253 template<class O, class M>
186 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &)) 254 idle_watcher (O object, M method)
187 : callback1<void, idle_watcher &> (object, method) 255 : callback<void (idle_watcher &)> (object, method)
188 { } 256 { }
189 ~idle_watcher () { stop (); } 257 ~idle_watcher () { stop (); }
190}; 258};
191#endif 259#endif
192 260
193#if IOM_SIG 261#if IOM_SIG
194struct sig_watcher : watcher, callback1<void, sig_watcher &> { 262struct sig_watcher : watcher, callback<void (sig_watcher &)> {
195 int signum; 263 int signum;
196 264
197 void start (int signum); 265 void start (int signum);
198 void stop () { io_manager::unreg (*this); } 266 void stop () { io_manager::unreg (*this); }
199 267
200 template<class O1, class O2> 268 template<class O, class M>
201 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &)) 269 sig_watcher (O object, M method)
202 : callback1<void, sig_watcher &> (object, method), signum (0) 270 : callback<void(sig_watcher &)> (object, method), signum (0)
203 { } 271 { }
204 ~sig_watcher () { stop (); } 272 ~sig_watcher () { stop (); }
205}; 273};
206#endif 274#endif
207 275
208#if IOM_CHILD 276#if IOM_CHILD
209struct child_watcher : watcher, callback2<void, child_watcher &, int> { 277struct child_watcher : watcher, callback<void (child_watcher &, int)> {
210 int /*pid_t*/ pid; 278 int /*pid_t*/ pid;
211 279
212 void start (int pid) { this->pid = pid; io_manager::reg (*this); } 280 void start (int pid) { this->pid = pid; io_manager::reg (*this); }
213 void stop () { io_manager::unreg (*this); } 281 void stop () { io_manager::unreg (*this); }
214 282
215 template<class O1, class O2> 283 template<class O, class M>
216 child_watcher (O1 *object, void (O2::*method) (child_watcher &, int status)) 284 child_watcher (O object, M method)
217 : callback2<void, child_watcher &, int> (object, method), pid (0) 285 : callback<void (child_watcher &, int)> (object, method), pid (0)
218 { } 286 { }
219 ~child_watcher () { stop (); } 287 ~child_watcher () { stop (); }
220}; 288};
221#endif 289#endif
222 290

Diff Legend

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