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

Diff Legend

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