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

Comparing libev/event.c (file contents):
Revision 1.7 by root, Sat Nov 3 21:58:51 2007 UTC vs.
Revision 1.31 by root, Wed Nov 14 05:30:02 2007 UTC

… …
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <stddef.h> 32#include <stddef.h>
33#include <stdlib.h> 33#include <stdlib.h>
34#include <assert.h>
35
36#ifndef WIN32
34#include <sys/time.h> 37# include <sys/time.h>
38#endif
35 39
40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
36#include "event.h" 43# include "event.h"
44#endif
37 45
46#if EV_MULTIPLICITY
47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
49#else
38#define dLOOPev 50# define dLOOPev
39#define dLOOPbase 51# define dLOOPbase
52#endif
40 53
54/* never accessed, will always be cast from/to ev_loop */
41struct event_base 55struct event_base
42{ 56{
43 int dummy; 57 int dummy;
44}; 58};
45 59
46static struct event_base x_base, *x_cur; 60static struct event_base *x_cur;
47 61
48static void 62static void
49tv_set (struct timeval *tv, ev_tstamp at) 63tv_set (struct timeval *tv, ev_tstamp at)
50{ 64{
51 tv->tv_sec = (long)at; 65 tv->tv_sec = (long)at;
… …
73 return "libev"; 87 return "libev";
74} 88}
75 89
76void *event_init (void) 90void *event_init (void)
77{ 91{
78 if (!x_cur && ev_init (0)) 92#if EV_MULTIPLICITY
79 return x_cur = &x_base; 93 if (x_cur)
94 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
95 else
96 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
97#else
98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
80 99
100 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
101#endif
102
81 return 0; 103 return x_cur;
82} 104}
83 105
84void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
85{ 107{
86 /* nop */ 108 dLOOPbase;
109
110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVFLAG_AUTO) != loop)
112 ev_loop_destroy (loop);
113#endif
87} 114}
88 115
89int event_dispatch (void) 116int event_dispatch (void)
90{ 117{
91 return event_base_dispatch (x_cur); 118 return event_base_dispatch (x_cur);
… …
112x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
113{ 140{
114 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
115 142
116 ev->ev_res = revents; 143 ev->ev_res = revents;
117 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
118} 145}
119 146
120static void 147static void
121x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
122{ 149{
123 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 150 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
151
152 if (revents & EV_ERROR)
153 event_del (ev);
154
155 x_cb (ev, revents);
124} 156}
125 157
126static void 158static void
127x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
128{ 160{
129 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
130 162
163 if (revents & EV_ERROR)
164 event_del (ev);
131 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
132 ev_io_stop (w); 167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
133 170
134 x_cb (ev, revents); 171 x_cb (ev, revents);
135} 172}
136 173
137static void 174static void
138x_cb_to (EV_P_ struct ev_timer *w, int revents) 175x_cb_to (EV_P_ struct ev_timer *w, int revents)
139{ 176{
140 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 177 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
178
179 event_del (ev);
180
181 x_cb (ev, revents);
141} 182}
142 183
143void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 184void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
144{ 185{
145 if (events & EV_SIGNAL) 186 if (events & EV_SIGNAL)
146 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 187 ev_init (&ev->iosig.sig, x_cb_sig);
147 else 188 else
148 ev_watcher_init (&ev->iosig.io, x_cb_io); 189 ev_init (&ev->iosig.io, x_cb_io);
149 190
150 ev_watcher_init (&ev->to, x_cb_to); 191 ev_init (&ev->to, x_cb_to);
151 192
152 ev->ev_base = x_cur; 193 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
153 ev->ev_fd = fd; 194 ev->ev_fd = fd;
154 ev->ev_events = events; 195 ev->ev_events = events;
155 ev->ev_pri = 0; 196 ev->ev_pri = 0;
156 ev->ev_callback = cb; 197 ev->ev_callback = cb;
157 ev->ev_arg = arg; 198 ev->ev_arg = arg;
158 ev->ev_res = 0; 199 ev->ev_res = 0;
200 ev->ev_flags = EVLIST_INIT;
159} 201}
160 202
161int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 203int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
162{ 204{
163 return event_base_once (x_cur, fd, events, cb, arg, tv); 205 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
165 207
166int event_add (struct event *ev, struct timeval *tv) 208int event_add (struct event *ev, struct timeval *tv)
167{ 209{
168 dLOOPev; 210 dLOOPev;
169 211
170 /* disable all watchers */
171 event_del (ev);
172
173 if (ev->ev_events & EV_SIGNAL) 212 if (ev->ev_events & EV_SIGNAL)
174 { 213 {
214 if (!ev_is_active (&ev->iosig.sig))
215 {
175 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 216 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
176 ev_signal_start (EV_A_ &ev->iosig.sig); 217 ev_signal_start (EV_A_ &ev->iosig.sig);
218
219 ev->ev_flags |= EVLIST_SIGNAL;
220 }
177 } 221 }
178 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
179 { 223 {
224 if (!ev_is_active (&ev->iosig.io))
225 {
180 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 226 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
181 ev_io_start (EV_A_ &ev->iosig.io); 227 ev_io_start (EV_A_ &ev->iosig.io);
228
229 ev->ev_flags |= EVLIST_INSERTED;
230 }
182 } 231 }
183 232
184 if (tv) 233 if (tv)
185 { 234 {
186 ev_timer_set (&ev->to, tv_get (tv), 0.); 235 ev->to.repeat = tv_get (tv);
236 ev_timer_again (EV_A_ &ev->to);
237 ev->ev_flags |= EVLIST_TIMEOUT;
238 }
239 else
240 if (ev_is_active (&ev->to))
187 ev_timer_start (EV_A_ &ev->to); 241 ev_timer_stop (EV_A_ &ev->to);
188 } 242
243 ev->ev_flags |= EVLIST_ACTIVE;
189 244
190 return 0; 245 return 0;
191} 246}
192 247
193int event_del (struct event *ev) 248int event_del (struct event *ev)
… …
198 { 253 {
199 /* sig */ 254 /* sig */
200 if (ev_is_active (&ev->iosig.sig)) 255 if (ev_is_active (&ev->iosig.sig))
201 ev_signal_stop (EV_A_ &ev->iosig.sig); 256 ev_signal_stop (EV_A_ &ev->iosig.sig);
202 } 257 }
203 else 258 else if (ev->ev_events & (EV_READ | EV_WRITE))
204 { 259 {
205 /* io */ 260 /* io */
206 if (ev_is_active (&ev->iosig.io)) 261 if (ev_is_active (&ev->iosig.io))
207 ev_io_stop (EV_A_ &ev->iosig.io); 262 ev_io_stop (EV_A_ &ev->iosig.io);
208 } 263 }
209 264
210 if (ev_is_active (&ev->to)) 265 if (ev_is_active (&ev->to))
211 ev_timer_stop (EV_A_ &ev->to); 266 ev_timer_stop (EV_A_ &ev->to);
212 267
268 ev->ev_flags = EVLIST_INIT;
269
213 return 0; 270 return 0;
271}
272
273void event_active (struct event *ev, int res, short ncalls)
274{
275 dLOOPev;
276
277 if (res & EV_TIMEOUT)
278 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
279
280 if (res & EV_SIGNAL)
281 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
282
283 if (res & (EV_READ | EV_WRITE))
284 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
214} 285}
215 286
216int event_pending (struct event *ev, short events, struct timeval *tv) 287int event_pending (struct event *ev, short events, struct timeval *tv)
217{ 288{
289 short revents = 0;
218 dLOOPev; 290 dLOOPev;
219 291
220 short revents = 0;
221 292
222 if (ev->ev_events & EV_SIGNAL) 293 if (ev->ev_events & EV_SIGNAL)
223 { 294 {
224 /* sig */ 295 /* sig */
225 if (ev->iosig.sig.pending) 296 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
226 revents |= EV_SIGNAL; 297 revents |= EV_SIGNAL;
227 } 298 }
228 else 299 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 { 300 {
230 /* io */ 301 /* io */
231 if (ev->iosig.io.pending) 302 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
232 revents |= ev->ev_events & (EV_READ | EV_WRITE); 303 revents |= ev->ev_events & (EV_READ | EV_WRITE);
233 } 304 }
234 305
235 if (ev->to.pending) 306 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
236 { 307 {
237 revents |= EV_TIMEOUT; 308 revents |= EV_TIMEOUT;
238 309
239 if (tv) 310 if (tv)
240 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 311 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
263} 334}
264 335
265int event_base_loop (struct event_base *base, int flags) 336int event_base_loop (struct event_base *base, int flags)
266{ 337{
267 dLOOPbase; 338 dLOOPbase;
268 ev_loop (EV_A_ flags | EVLOOP_ONESHOT); 339
340 ev_loop (EV_A_ flags);
269 341
270 return 0; 342 return 0;
271} 343}
272 344
273int event_base_dispatch (struct event_base *base) 345int event_base_dispatch (struct event_base *base)
274{ 346{
275 return event_base_loop (base, 0); 347 return event_base_loop (base, 0);
276} 348}
277 349
278static void 350static void
279x_loopexit_cb (EV_P_ int revents, void *arg) 351x_loopexit_cb (int revents, void *base)
280{ 352{
353 dLOOPbase;
354
281 ev_unloop (EV_A_ 2); 355 ev_unloop (EV_A_ EVUNLOOP_ONE);
282} 356}
283 357
284int event_base_loopexit (struct event_base *base, struct timeval *tv) 358int event_base_loopexit (struct event_base *base, struct timeval *tv)
285{ 359{
360 ev_tstamp after = tv_get (tv);
286 dLOOPbase; 361 dLOOPbase;
287 ev_tstamp after = tv_get (tv);
288 362
289 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 363 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
290 364
291 return -1; 365 return -1;
292} 366}
… …
299}; 373};
300 374
301static void 375static void
302x_once_cb (int revents, void *arg) 376x_once_cb (int revents, void *arg)
303{ 377{
304 struct x_once *once = arg; 378 struct x_once *once = (struct x_once *)arg;
305 379
306 once->cb (once->fd, revents, once->arg); 380 once->cb (once->fd, (short)revents, once->arg);
307 free (once); 381 free (once);
308} 382}
309 383
310int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 384int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
311{ 385{
386 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
312 dLOOPbase; 387 dLOOPbase;
313 struct x_once *once = malloc (sizeof (struct x_once));
314 388
315 if (!once) 389 if (!once)
316 return -1; 390 return -1;
317 391
318 once->fd = fd; 392 once->fd = fd;
… …
324 return 0; 398 return 0;
325} 399}
326 400
327int event_base_priority_init (struct event_base *base, int npri) 401int event_base_priority_init (struct event_base *base, int npri)
328{ 402{
329 dLOOPbase; 403 /*dLOOPbase;*/
330 404
331 return 0; 405 return 0;
332} 406}
333 407

Diff Legend

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