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

Comparing cvsroot/rxvt-unicode/src/iom.h (file contents):
Revision 1.24 by root, Mon Jan 9 22:41:41 2006 UTC vs.
Revision 1.31 by root, Thu Oct 25 12:42:00 2007 UTC

1/* 1/*
2 iom.h -- generic I/O multiplexer 2 iom.h -- generic I/O multiplexer
3 Copyright (C) 2003, 2004 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2006 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
… …
26// - a vector template like simplevec or stl's vector 26// - a vector template like simplevec or stl's vector
27// - defines for all watcher types required in your app 27// - defines for all watcher types required in your app
28// edit iom_conf.h as appropriate. 28// edit iom_conf.h as appropriate.
29#include "iom_conf.h" 29#include "iom_conf.h"
30 30
31#if IOM_CHILD
32# undef IOM_SIG
33# define IOM_SIG 1
34#endif
35
31#include "callback.h" 36#include "callback.h"
32
33#ifndef IOM_IO
34# define IOM_IO 0
35#endif
36#ifndef IOM_TIME
37# define IOM_TIME 0
38#endif
39#ifndef IOM_CHECK
40# define IOM_CHECK 0
41#endif
42#ifndef IOM_IDLE
43# define IOM_IDLE 0
44#endif
45#ifndef IOM_SIG
46# define IOM_SIG 0
47#endif
48 37
49typedef double tstamp; 38typedef double tstamp;
50extern tstamp NOW; 39extern tstamp NOW;
51 40
52// TSTAMP_MAX must still fit into a positive struct timeval 41// TSTAMP_MAX must still fit into a positive struct timeval
53#define TSTAMP_MAX (double)(1UL<<31) 42#define TSTAMP_MAX (double)(1UL<<31)
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
54 56
55struct watcher; 57struct watcher;
56#if IOM_IO 58#if IOM_IO
57struct io_watcher; 59struct io_watcher;
58#endif 60#endif
… …
65#if IOM_IDLE 67#if IOM_IDLE
66struct idle_watcher; 68struct idle_watcher;
67#endif 69#endif
68#if IOM_SIG 70#if IOM_SIG
69struct sig_watcher; 71struct sig_watcher;
72#endif
73#if IOM_CHILD
74struct child_watcher;
70#endif 75#endif
71 76
72template<class watcher> 77template<class watcher>
73struct io_manager_vec : vector<watcher *> { 78struct io_manager_vec : vector<watcher *> {
74 void erase_unordered (unsigned int pos) 79 void erase_unordered (unsigned int pos)
… …
98 // set NOW 103 // set NOW
99 static void set_now (); 104 static void set_now ();
100#endif 105#endif
101 106
102 // register a watcher 107 // register a watcher
108#ifndef IOM_LIBEVENT
103#if IOM_IO 109#if IOM_IO
104 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);
105#endif 111#endif
106#if IOM_TIME 112#if IOM_TIME
107 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);
108#endif 114#endif
115#if IOM_SIG
116 static void reg (sig_watcher &w); static void unreg (sig_watcher &w);
117#endif
109#if IOM_CHECK 118#if IOM_CHECK
110 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);
111#endif 120#endif
121#endif
112#if IOM_IDLE 122#if IOM_IDLE
113 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);
114#endif 124#endif
115#if IOM_SIG 125#if IOM_CHILD
116 static void reg (sig_watcher &w); static void unreg (sig_watcher &w); 126 static void reg (child_watcher &w); static void unreg (child_watcher &w);
117#endif 127#endif
118 128
119 static void loop (); 129 static void loop ();
120}; 130};
121 131
122struct watcher { 132struct watcher {
123 int active; /* 0 == inactive, else index into respective vector */ 133 int active; /* 0 == inactive, else index into respective vector */
124 134
135 bool is_active () { return active; }
136
125 watcher () : active (0) { } 137 watcher () : active (0) { }
126}; 138};
127 139
128#if IOM_IO 140#if IOM_IO
141#ifdef IOM_LIBEVENT
129enum { 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 };
130 143
144void iom_io_c_callback (int fd, short events, void *data);
145
131struct io_watcher : watcher, callback2<void, io_watcher &, short> { 146struct io_watcher : watcher, callback<void (io_watcher &, short)> {
147 struct event ev;
132 int fd; 148 int fd;
133 short events; 149 short events;
134 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
135 void set (int fd_, short events_) { fd = fd_; events = events_; } 170 void set (int fd_, short events_) { fd = fd_; events = events_; }
136 171
137 void set (short events_) { set (fd, events_); } 172 void set (short events_) { set (fd, events_); }
138 void start () { io_manager::reg (*this); } 173 void start () { io_manager::reg (*this); }
139 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); } 174 void start (int fd_, short events_) { set (fd_, events_); start (); }
140 void stop () { io_manager::unreg (*this); } 175 void stop () { io_manager::unreg (*this); }
141 176
142 template<class O1, class O2> 177 template<class O, class M>
143 io_watcher (O1 *object, void (O2::*method) (io_watcher &, short)) 178 io_watcher (O object, M method)
144 : callback2<void, io_watcher &, short> (object,method) 179 : callback<void (io_watcher &, short)> (object, method)
145 { } 180 { }
146 ~io_watcher () { stop (); } 181 ~io_watcher () { stop (); }
147}; 182};
148#endif 183#endif
184#endif
149 185
150#if IOM_TIME 186#if IOM_TIME
187#ifdef IOM_LIBEVENT
188void iom_time_c_callback (int fd, short events, void *data);
189
151struct 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 &)> {
152 tstamp at; 215 tstamp at;
153 216
154 void trigger (); 217 void trigger ();
155 218
156 void set (tstamp when) { at = when; } 219 void set (tstamp when) { at = when; }
157 void operator () () { trigger (); } 220 void operator () () { trigger (); }
158 void start () { io_manager::reg (*this); } 221 void start () { io_manager::reg (*this); }
159 void start (tstamp when) { set (when); io_manager::reg (*this); } 222 void start (tstamp when) { set (when); start (); }
160 void stop () { io_manager::unreg (*this); } 223 void stop () { io_manager::unreg (*this); }
161 224
162 template<class O1, class O2> 225 template<class O, class M>
163 time_watcher (O1 *object, void (O2::*method) (time_watcher &)) 226 time_watcher (O object, M method)
164 : callback1<void, time_watcher &> (object,method), at (0) 227 : callback<void (time_watcher &)> (object, method), at (0)
165 { } 228 { }
166 ~time_watcher () { stop (); } 229 ~time_watcher () { stop (); }
167}; 230};
231#endif
168#endif 232#endif
169 233
170#if IOM_CHECK 234#if IOM_CHECK
171// run before checking for new events 235// run before checking for new events
172struct check_watcher : watcher, callback1<void, check_watcher &> { 236struct check_watcher : watcher, callback<void (check_watcher &)> {
173 void start () { io_manager::reg (*this); }
174 void stop () { io_manager::unreg (*this); } 237 void start () { io_manager::reg (*this); }
238 void stop () { io_manager::unreg (*this); }
175 239
176 template<class O1, class O2> 240 template<class O, class M>
177 check_watcher (O1 *object, void (O2::*method) (check_watcher &)) 241 check_watcher (O object, M method)
178 : callback1<void, check_watcher &> (object,method) 242 : callback<void (check_watcher &)> (object, method)
179 { } 243 { }
180 ~check_watcher () { stop (); } 244 ~check_watcher () { stop (); }
181}; 245};
182#endif 246#endif
183 247
184#if IOM_IDLE 248#if IOM_IDLE
185// run after checking for any i/o, but before waiting 249// run after checking for any i/o, but before waiting
186struct idle_watcher : watcher, callback1<void, idle_watcher &> { 250struct idle_watcher : watcher, callback<void (idle_watcher &)> {
187 void start () { io_manager::reg (*this); }
188 void stop () { io_manager::unreg (*this); } 251 void start () { io_manager::reg (*this); }
252 void stop () { io_manager::unreg (*this); }
189 253
190 template<class O1, class O2> 254 template<class O, class M>
191 idle_watcher (O1 *object, void (O2::*method) (idle_watcher &)) 255 idle_watcher (O object, M method)
192 : callback1<void, idle_watcher &> (object,method) 256 : callback<void (idle_watcher &)> (object, method)
193 { } 257 { }
194 ~idle_watcher () { stop (); } 258 ~idle_watcher () { stop (); }
195}; 259};
196#endif 260#endif
197 261
198#if IOM_SIG 262#if IOM_SIG
199struct sig_watcher : watcher, callback1<void, sig_watcher &> { 263struct sig_watcher : watcher, callback<void (sig_watcher &)> {
200 int signum; 264 int signum;
201 265
202 void start (int signum); 266 void start (int signum);
203 void stop () { io_manager::unreg (*this); } 267 void stop () { io_manager::unreg (*this); }
204 268
205 template<class O1, class O2> 269 template<class O, class M>
206 sig_watcher (O1 *object, void (O2::*method) (sig_watcher &)) 270 sig_watcher (O object, M method)
207 : callback1<void, sig_watcher &> (object,method), signum (-1) 271 : callback<void(sig_watcher &)> (object, method), signum (0)
208 { } 272 { }
209 ~sig_watcher () { stop (); } 273 ~sig_watcher () { stop (); }
210}; 274};
211#endif 275#endif
212 276
213#endif 277#if IOM_CHILD
278struct child_watcher : watcher, callback<void (child_watcher &, int)> {
279 int /*pid_t*/ pid;
214 280
281 void start (int pid) { this->pid = pid; io_manager::reg (*this); }
282 void stop () { io_manager::unreg (*this); }
283
284 template<class O, class M>
285 child_watcher (O object, M method)
286 : callback<void (child_watcher &, int)> (object, method), pid (0)
287 { }
288 ~child_watcher () { stop (); }
289};
290#endif
291
292#endif
293

Diff Legend

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