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.30 by root, Mon Nov 12 21:51:14 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);
… …
172 214
173 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
174 { 216 {
175 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 217 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
176 ev_signal_start (EV_A_ &ev->iosig.sig); 218 ev_signal_start (EV_A_ &ev->iosig.sig);
219
220 ev->ev_flags |= EVLIST_SIGNAL;
177 } 221 }
178 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
179 { 223 {
180 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 224 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); 225 ev_io_start (EV_A_ &ev->iosig.io);
226
227 ev->ev_flags |= EVLIST_INSERTED;
182 } 228 }
183 229
184 if (tv) 230 if (tv)
185 { 231 {
186 ev_timer_set (&ev->to, tv_get (tv), 0.); 232 ev_timer_set (&ev->to, tv_get (tv), 0.);
187 ev_timer_start (EV_A_ &ev->to); 233 ev_timer_start (EV_A_ &ev->to);
234
235 ev->ev_flags |= EVLIST_TIMEOUT;
188 } 236 }
237
238 ev->ev_flags |= EVLIST_ACTIVE;
189 239
190 return 0; 240 return 0;
191} 241}
192 242
193int event_del (struct event *ev) 243int event_del (struct event *ev)
… …
198 { 248 {
199 /* sig */ 249 /* sig */
200 if (ev_is_active (&ev->iosig.sig)) 250 if (ev_is_active (&ev->iosig.sig))
201 ev_signal_stop (EV_A_ &ev->iosig.sig); 251 ev_signal_stop (EV_A_ &ev->iosig.sig);
202 } 252 }
203 else 253 else if (ev->ev_events & (EV_READ | EV_WRITE))
204 { 254 {
205 /* io */ 255 /* io */
206 if (ev_is_active (&ev->iosig.io)) 256 if (ev_is_active (&ev->iosig.io))
207 ev_io_stop (EV_A_ &ev->iosig.io); 257 ev_io_stop (EV_A_ &ev->iosig.io);
208 } 258 }
209 259
210 if (ev_is_active (&ev->to)) 260 if (ev_is_active (&ev->to))
211 ev_timer_stop (EV_A_ &ev->to); 261 ev_timer_stop (EV_A_ &ev->to);
212 262
263 ev->ev_flags = EVLIST_INIT;
264
213 return 0; 265 return 0;
266}
267
268void event_active (struct event *ev, int res, short ncalls)
269{
270 dLOOPev;
271
272 if (res & EV_TIMEOUT)
273 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
274
275 if (res & EV_SIGNAL)
276 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
277
278 if (res & (EV_READ | EV_WRITE))
279 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
214} 280}
215 281
216int event_pending (struct event *ev, short events, struct timeval *tv) 282int event_pending (struct event *ev, short events, struct timeval *tv)
217{ 283{
284 short revents = 0;
218 dLOOPev; 285 dLOOPev;
219 286
220 short revents = 0;
221 287
222 if (ev->ev_events & EV_SIGNAL) 288 if (ev->ev_events & EV_SIGNAL)
223 { 289 {
224 /* sig */ 290 /* sig */
225 if (ev->iosig.sig.pending) 291 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
226 revents |= EV_SIGNAL; 292 revents |= EV_SIGNAL;
227 } 293 }
228 else 294 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 { 295 {
230 /* io */ 296 /* io */
231 if (ev->iosig.io.pending) 297 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
232 revents |= ev->ev_events & (EV_READ | EV_WRITE); 298 revents |= ev->ev_events & (EV_READ | EV_WRITE);
233 } 299 }
234 300
235 if (ev->to.pending) 301 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
236 { 302 {
237 revents |= EV_TIMEOUT; 303 revents |= EV_TIMEOUT;
238 304
239 if (tv) 305 if (tv)
240 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 306 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
263} 329}
264 330
265int event_base_loop (struct event_base *base, int flags) 331int event_base_loop (struct event_base *base, int flags)
266{ 332{
267 dLOOPbase; 333 dLOOPbase;
268 ev_loop (EV_A_ flags | EVLOOP_ONESHOT); 334
335 ev_loop (EV_A_ flags);
269 336
270 return 0; 337 return 0;
271} 338}
272 339
273int event_base_dispatch (struct event_base *base) 340int event_base_dispatch (struct event_base *base)
274{ 341{
275 return event_base_loop (base, 0); 342 return event_base_loop (base, 0);
276} 343}
277 344
278static void 345static void
279x_loopexit_cb (EV_P_ int revents, void *arg) 346x_loopexit_cb (int revents, void *base)
280{ 347{
348 dLOOPbase;
349
281 ev_unloop (EV_A_ 2); 350 ev_unloop (EV_A_ EVUNLOOP_ONE);
282} 351}
283 352
284int event_base_loopexit (struct event_base *base, struct timeval *tv) 353int event_base_loopexit (struct event_base *base, struct timeval *tv)
285{ 354{
355 ev_tstamp after = tv_get (tv);
286 dLOOPbase; 356 dLOOPbase;
287 ev_tstamp after = tv_get (tv);
288 357
289 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 358 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
290 359
291 return -1; 360 return -1;
292} 361}
… …
299}; 368};
300 369
301static void 370static void
302x_once_cb (int revents, void *arg) 371x_once_cb (int revents, void *arg)
303{ 372{
304 struct x_once *once = arg; 373 struct x_once *once = (struct x_once *)arg;
305 374
306 once->cb (once->fd, revents, once->arg); 375 once->cb (once->fd, (short)revents, once->arg);
307 free (once); 376 free (once);
308} 377}
309 378
310int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 379int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
311{ 380{
381 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
312 dLOOPbase; 382 dLOOPbase;
313 struct x_once *once = malloc (sizeof (struct x_once));
314 383
315 if (!once) 384 if (!once)
316 return -1; 385 return -1;
317 386
318 once->fd = fd; 387 once->fd = fd;
… …
324 return 0; 393 return 0;
325} 394}
326 395
327int event_base_priority_init (struct event_base *base, int npri) 396int event_base_priority_init (struct event_base *base, int npri)
328{ 397{
329 dLOOPbase; 398 /*dLOOPbase;*/
330 399
331 return 0; 400 return 0;
332} 401}
333 402

Diff Legend

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