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.29 by root, Wed May 31 00:39:48 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 ();
… …
121 131
122 watcher () : active (0) { } 132 watcher () : active (0) { }
123}; 133};
124 134
125#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
126enum { 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 };
127 160
128struct io_watcher : watcher, callback<void (io_watcher &, short)> { 161struct io_watcher : watcher, callback<void (io_watcher &, short)> {
129 int fd; 162 int fd;
130 short events; 163 short events;
131 164
132 void set (int fd_, short events_) { fd = fd_; events = events_; } 165 void set (int fd_, short events_) { fd = fd_; events = events_; }
133 166
134 void set (short events_) { set (fd, events_); } 167 void set (short events_) { set (fd, events_); }
135 void start () { io_manager::reg (*this); } 168 void start () { io_manager::reg (*this); }
136 void start (int fd_, short events_) { set (fd_, events_); io_manager::reg (*this); } 169 void start (int fd_, short events_) { set (fd_, events_); start (); }
137 void stop () { io_manager::unreg (*this); } 170 void stop () { io_manager::unreg (*this); }
138 171
139 template<class O, class M> 172 template<class O, class M>
140 io_watcher (O object, M method) 173 io_watcher (O object, M method)
141 : callback<void (io_watcher &, short)> (object, method) 174 : callback<void (io_watcher &, short)> (object, method)
142 { } 175 { }
143 ~io_watcher () { stop (); } 176 ~io_watcher () { stop (); }
144}; 177};
145#endif 178#endif
179#endif
146 180
147#if IOM_TIME 181#if IOM_TIME
182#ifdef IOM_LIBEVENT
183void iom_time_c_callback (int fd, short events, void *data);
184
185struct time_watcher : watcher, callback<void (time_watcher &)> {
186 struct event ev;
187 tstamp at;
188
189 void trigger ();
190
191 void set (tstamp when) { at = when; }
192 void operator () () { trigger (); }
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 }
201 void start (tstamp when) { set (when); start (); }
202 void stop () { if (active) evtimer_del (&ev); active = 0; }
203
204 template<class O, class M>
205 time_watcher (O object, M method)
206 : callback<void (time_watcher &)> (object, method), at (0)
207 {
208 evtimer_set (&ev, iom_time_c_callback, (void *)this);
209 }
210 ~time_watcher () { stop (); }
211};
212#else
148struct time_watcher : watcher, callback<void (time_watcher &)> { 213struct time_watcher : watcher, callback<void (time_watcher &)> {
149 tstamp at; 214 tstamp at;
150 215
151 void trigger (); 216 void trigger ();
152 217
153 void set (tstamp when) { at = when; } 218 void set (tstamp when) { at = when; }
154 void operator () () { trigger (); } 219 void operator () () { trigger (); }
155 void start () { io_manager::reg (*this); } 220 void start () { io_manager::reg (*this); }
156 void start (tstamp when) { set (when); io_manager::reg (*this); } 221 void start (tstamp when) { set (when); start (); }
157 void stop () { io_manager::unreg (*this); } 222 void stop () { io_manager::unreg (*this); }
158 223
159 template<class O, class M> 224 template<class O, class M>
160 time_watcher (O object, M method) 225 time_watcher (O object, M method)
161 : callback<void (time_watcher &)> (object, method), at (0) 226 : callback<void (time_watcher &)> (object, method), at (0)
162 { } 227 { }
163 ~time_watcher () { stop (); } 228 ~time_watcher () { stop (); }
164}; 229};
230#endif
165#endif 231#endif
166 232
167#if IOM_CHECK 233#if IOM_CHECK
168// run before checking for new events 234// run before checking for new events
169struct check_watcher : watcher, callback<void (check_watcher &)> { 235struct check_watcher : watcher, callback<void (check_watcher &)> {

Diff Legend

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