ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/event.c
(Generate patch)

Comparing libev/event.c (file contents):
Revision 1.1 by root, Thu Nov 1 15:39:16 2007 UTC vs.
Revision 1.5 by root, Sat Nov 3 19:41:56 2007 UTC

… …
88int event_dispatch (void) 88int event_dispatch (void)
89{ 89{
90 return event_base_dispatch (x_cur); 90 return event_base_dispatch (x_cur);
91} 91}
92 92
93#ifdef EV_STANDALONE
93void event_set_log_callback (event_log_cb cb) 94void event_set_log_callback (event_log_cb cb)
94{ 95{
95 /* nop */ 96 /* nop */
96} 97}
98#endif
97 99
98int event_loop (int flags) 100int event_loop (int flags)
99{ 101{
100 return event_base_loop (x_cur, flags); 102 return event_base_loop (x_cur, flags);
101} 103}
102 104
103int event_loopexit (struct timeval *tv) 105int event_loopexit (struct timeval *tv)
104{ 106{
105 event_base_loopexit (x_cur, tv); 107 return event_base_loopexit (x_cur, tv);
106} 108}
107 109
108static void 110static void
109x_cb (struct event *ev, int revents) 111x_cb (struct event *ev, int revents)
110{ 112{
113 if (ev->ev_events & EV_SIGNAL)
114 {
115 /* sig */
111 if (ev_is_active (&ev->sig)) 116 if (ev_is_active (&ev->iosig.sig))
112 { 117 {
113 ev_signal_stop (&ev->sig); 118 ev_signal_stop (&ev->iosig.sig);
114 --x_actives; 119 --x_actives;
120 }
121 }
122 else
115 } 123 {
116 124 /* io */
117 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->io)) 125 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->iosig.io))
118 { 126 {
119 ev_io_stop (&ev->io); 127 ev_io_stop (&ev->iosig.io);
120 --x_actives; 128 --x_actives;
129 }
121 } 130 }
122 131
123 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 132 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
124 133
125 if (revents & EV_TIMEOUT) 134 if (revents & EV_TIMEOUT)
… …
130} 139}
131 140
132static void 141static void
133x_cb_io (struct ev_io *w, int revents) 142x_cb_io (struct ev_io *w, int revents)
134{ 143{
135 x_cb ((struct event *)(((char *)w) - offsetof (struct event, io)), revents); 144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents);
136} 145}
137 146
138static void 147static void
139x_cb_to (struct ev_timer *w, int revents) 148x_cb_to (struct ev_timer *w, int revents)
140{ 149{
… …
142} 151}
143 152
144static void 153static void
145x_cb_sig (struct ev_signal *w, int revents) 154x_cb_sig (struct ev_signal *w, int revents)
146{ 155{
147 x_cb ((struct event *)(((char *)w) - offsetof (struct event, sig)), revents); 156 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
148} 157}
149 158
150void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 159void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
151{ 160{
161 if (events & EV_SIGNAL)
162 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
163 else
152 ev_watcher_init (&ev->io, x_cb_io); 164 ev_watcher_init (&ev->iosig.io, x_cb_io);
165
153 ev_watcher_init (&ev->to, x_cb_to); 166 ev_watcher_init (&ev->to, x_cb_to);
154 ev_watcher_init (&ev->sig, x_cb_sig);
155 167
156 ev->ev_base = x_cur; 168 ev->ev_base = x_cur;
157 ev->ev_fd = fd; 169 ev->ev_fd = fd;
158 ev->ev_events = events; 170 ev->ev_events = events;
159 ev->ev_pri = 0; 171 ev->ev_pri = 0;
… …
162 ev->ev_res = 0; 174 ev->ev_res = 0;
163} 175}
164 176
165int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 177int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
166{ 178{
167 event_base_once (x_cur, fd, events, cb, arg, tv); 179 return event_base_once (x_cur, fd, events, cb, arg, tv);
168} 180}
169 181
170int event_add (struct event *ev, struct timeval *tv) 182int event_add (struct event *ev, struct timeval *tv)
171{ 183{
184 /* disable all watchers */
185 event_del (ev);
186
187 if (ev->ev_events & EV_SIGNAL)
188 {
189 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
190 ev_signal_start (&ev->iosig.sig);
191 ++x_actives;
192 }
193 else if (ev->ev_events & (EV_READ | EV_WRITE))
194 {
195 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
196 ev_io_start (&ev->iosig.io);
197 ++x_actives;
198 }
199
172 if (tv) 200 if (tv)
173 { 201 {
174 if (ev_is_active (&ev->to))
175 {
176 ev_timer_stop (&ev->to);
177 --x_actives;
178 }
179
180 ev_timer_set (&ev->to, tv_get (tv), 0.); 202 ev_timer_set (&ev->to, tv_get (tv), 0.);
181 ev_timer_start (&ev->to); 203 ev_timer_start (&ev->to);
182 ++x_actives; 204 ++x_actives;
183 } 205 }
184 206
185 if (ev->ev_events & (EV_READ|EV_WRITE)) 207 return 0;
208}
209
210int event_del (struct event *ev)
211{
212 if (ev->ev_events & EV_SIGNAL)
186 { 213 {
214 /* sig */
187 if (ev_is_active (&ev->io)) 215 if (ev_is_active (&ev->iosig.sig))
188 { 216 {
189 ev_io_stop (&ev->io); 217 ev_signal_stop (&ev->iosig.sig);
190 --x_actives; 218 --x_actives;
191 } 219 }
192
193 ev_io_set (&ev->io, ev->ev_fd, ev->ev_events);
194 ev_io_start (&ev->io);
195 ++x_actives;
196 }
197
198 if (ev->ev_events & EV_SIGNAL)
199 { 220 }
221 else
222 {
223 /* io */
200 if (ev_is_active (&ev->sig)) 224 if (ev_is_active (&ev->iosig.io))
201 { 225 {
202 ev_signal_stop (&ev->sig); 226 ev_io_stop (&ev->iosig.io);
203 --x_actives; 227 --x_actives;
204 } 228 }
205
206 ev_signal_set (&ev->sig, ev->ev_fd);
207 ev_signal_start (&ev->sig);
208 ++x_actives;
209 }
210
211 return 0;
212}
213
214int event_del (struct event *ev)
215{
216 if (ev_is_active (&ev->io))
217 {
218 ev_io_stop (&ev->io);
219 --x_actives;
220 } 229 }
221 230
222 if (ev_is_active (&ev->to)) 231 if (ev_is_active (&ev->to))
223 { 232 {
224 ev_timer_stop (&ev->to); 233 ev_timer_stop (&ev->to);
225 --x_actives; 234 --x_actives;
226 } 235 }
227 236
228 if (ev_is_active (&ev->sig))
229 {
230 ev_signal_stop (&ev->sig);
231 --x_actives;
232 }
233
234 return 0; 237 return 0;
235}
236
237void event_active (struct event *ev, int fd, short events)
238{
239 /* unclear what this does, likely internal-use */
240} 238}
241 239
242int event_pending (struct event *ev, short events, struct timeval *tv) 240int event_pending (struct event *ev, short events, struct timeval *tv)
243{ 241{
244 short revents; 242 short revents = 0;
245 243
244 if (ev->ev_events & EV_SIGNAL)
245 {
246 /* sig */
247 if (ev->iosig.sig.pending)
248 revents |= EV_SIGNAL;
249 }
250 else
251 {
252 /* io */
246 if (ev->io.pending) 253 if (ev->iosig.io.pending)
247 revents |= ev->ev_events & (EV_READ | EV_WRITE); 254 revents |= ev->ev_events & (EV_READ | EV_WRITE);
255 }
248 256
249 if (ev->to.pending) 257 if (ev->to.pending)
250 { 258 {
251 revents |= EV_TIMEOUT; 259 revents |= EV_TIMEOUT;
252 260
253 if (tv) 261 if (tv)
254 tv_set (tv, ev_now); /* not sure if this is right :) */ 262 tv_set (tv, ev_now); /* not sure if this is right :) */
255 } 263 }
256 264
257 if (ev->sig.pending)
258 revents |= EV_SIGNAL;
259
260 return events & revents; 265 return events & revents;
261} 266}
262 267
263int event_priority_init (int npri) 268int event_priority_init (int npri)
264{ 269{
… …
304int event_base_loopexit (struct event_base *base, struct timeval *tv) 309int event_base_loopexit (struct event_base *base, struct timeval *tv)
305{ 310{
306 ev_tstamp after = tv_get (tv); 311 ev_tstamp after = tv_get (tv);
307 312
308 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 313 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
314
315 return -1;
309} 316}
310 317
311struct x_once 318struct x_once
312{ 319{
313 int fd; 320 int fd;
… …
333 340
334 once->fd = fd; 341 once->fd = fd;
335 once->cb = cb; 342 once->cb = cb;
336 once->arg = arg; 343 once->arg = arg;
337 344
338 ev_once (fd, events & (EV_READ|EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 345 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
339 346
340 return 0; 347 return 0;
341} 348}
342 349
343int event_base_priority_init (struct event_base *base, int npri) 350int event_base_priority_init (struct event_base *base, int npri)

Diff Legend

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