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

Comparing libev/event.c (file contents):
Revision 1.9 by root, Sun Nov 4 00:24:17 2007 UTC vs.
Revision 1.20 by root, Tue Nov 6 18:49:32 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#include "ev.h"
36#include "event.h" 41#include "event.h"
37 42
38#if EV_MULTIPLICITY 43#if EV_MULTIPLICITY
39# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 44# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
40# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
… …
47struct event_base 52struct event_base
48{ 53{
49 int dummy; 54 int dummy;
50}; 55};
51 56
52static struct event_base x_base, *x_cur; 57static struct event_base *x_cur;
53 58
54static void 59static void
55tv_set (struct timeval *tv, ev_tstamp at) 60tv_set (struct timeval *tv, ev_tstamp at)
56{ 61{
57 tv->tv_sec = (long)at; 62 tv->tv_sec = (long)at;
… …
80} 85}
81 86
82void *event_init (void) 87void *event_init (void)
83{ 88{
84#if EV_MULTIPLICITY 89#if EV_MULTIPLICITY
90 if (x_cur)
85 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
92 else
93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
86#else 94#else
87 x_cur = &x_base; 95 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
96
97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
88#endif 98#endif
89 99
90 return x_cur; 100 return x_cur;
91} 101}
92 102
93void event_base_free (struct event_base *base) 103void event_base_free (struct event_base *base)
94{ 104{
95 dLOOPbase; 105 dLOOPbase;
96 106
97#if EV_MULTIPLICITY 107#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop)
98 ev_loop_delete (loop); 109 ev_loop_destroy (loop);
99#endif 110#endif
100} 111}
101 112
102int event_dispatch (void) 113int event_dispatch (void)
103{ 114{
… …
131} 142}
132 143
133static void 144static void
134x_cb_sig (EV_P_ struct ev_signal *w, int revents) 145x_cb_sig (EV_P_ struct ev_signal *w, int revents)
135{ 146{
136 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents); 147 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.sig));
148
149 if (revents & EV_ERROR)
150 event_del (ev);
151
152 x_cb (ev, revents);
137} 153}
138 154
139static void 155static void
140x_cb_io (EV_P_ struct ev_io *w, int revents) 156x_cb_io (EV_P_ struct ev_io *w, int revents)
141{ 157{
142 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 158 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
143 159
160 if (revents & EV_ERROR)
161 event_del (ev);
144 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
145 ev_io_stop (EV_A_ w); 163 ev_io_stop (EV_A_ w);
146 164
147 x_cb (ev, revents); 165 x_cb (ev, revents);
148} 166}
149 167
150static void 168static void
151x_cb_to (EV_P_ struct ev_timer *w, int revents) 169x_cb_to (EV_P_ struct ev_timer *w, int revents)
152{ 170{
153 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 171 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
172
173 event_del (ev);
174
175 x_cb (ev, revents);
154} 176}
155 177
156void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 178void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
157{ 179{
158 if (!ev->initialised)
159 {
160 ev->initialised = 1;
161
162 if (events & EV_SIGNAL) 180 if (events & EV_SIGNAL)
163 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 181 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
164 else 182 else
165 ev_watcher_init (&ev->iosig.io, x_cb_io); 183 ev_watcher_init (&ev->iosig.io, x_cb_io);
166 184
167 ev_watcher_init (&ev->to, x_cb_to); 185 ev_watcher_init (&ev->to, x_cb_to);
168 }
169 186
170 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 187 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
171 ev->ev_fd = fd; 188 ev->ev_fd = fd;
172 ev->ev_events = events; 189 ev->ev_events = events;
173 ev->ev_pri = 0; 190 ev->ev_pri = 0;
… …
216 { 233 {
217 /* sig */ 234 /* sig */
218 if (ev_is_active (&ev->iosig.sig)) 235 if (ev_is_active (&ev->iosig.sig))
219 ev_signal_stop (EV_A_ &ev->iosig.sig); 236 ev_signal_stop (EV_A_ &ev->iosig.sig);
220 } 237 }
221 else 238 else if (ev->ev_events & (EV_READ | EV_WRITE))
222 { 239 {
223 /* io */ 240 /* io */
224 if (ev_is_active (&ev->iosig.io)) 241 if (ev_is_active (&ev->iosig.io))
225 ev_io_stop (EV_A_ &ev->iosig.io); 242 ev_io_stop (EV_A_ &ev->iosig.io);
226 } 243 }
… …
231 return 0; 248 return 0;
232} 249}
233 250
234int event_pending (struct event *ev, short events, struct timeval *tv) 251int event_pending (struct event *ev, short events, struct timeval *tv)
235{ 252{
253 short revents = 0;
236 dLOOPev; 254 dLOOPev;
237 255
238 short revents = 0;
239 256
240 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
241 { 258 {
242 /* sig */ 259 /* sig */
243 if (ev->iosig.sig.pending) 260 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
244 revents |= EV_SIGNAL; 261 revents |= EV_SIGNAL;
245 } 262 }
246 else 263 else if (ev->ev_events & (EV_READ | EV_WRITE))
247 { 264 {
248 /* io */ 265 /* io */
249 if (ev->iosig.io.pending) 266 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
250 revents |= ev->ev_events & (EV_READ | EV_WRITE); 267 revents |= ev->ev_events & (EV_READ | EV_WRITE);
251 } 268 }
252 269
253 if (ev->to.pending) 270 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
254 { 271 {
255 revents |= EV_TIMEOUT; 272 revents |= EV_TIMEOUT;
256 273
257 if (tv) 274 if (tv)
258 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 275 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
302 ev_unloop (EV_A_ EVUNLOOP_ONCE); 319 ev_unloop (EV_A_ EVUNLOOP_ONCE);
303} 320}
304 321
305int event_base_loopexit (struct event_base *base, struct timeval *tv) 322int event_base_loopexit (struct event_base *base, struct timeval *tv)
306{ 323{
307 dLOOPbase;
308 ev_tstamp after = tv_get (tv); 324 ev_tstamp after = tv_get (tv);
325 dLOOPbase;
309 326
310 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 327 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
311 328
312 return -1; 329 return -1;
313} 330}
… …
320}; 337};
321 338
322static void 339static void
323x_once_cb (int revents, void *arg) 340x_once_cb (int revents, void *arg)
324{ 341{
325 struct x_once *once = arg; 342 struct x_once *once = (struct x_once *)arg;
326 343
327 once->cb (once->fd, revents, once->arg); 344 once->cb (once->fd, revents, once->arg);
328 free (once); 345 free (once);
329} 346}
330 347
331int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 348int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
332{ 349{
333 dLOOPbase;
334 struct x_once *once = malloc (sizeof (struct x_once)); 350 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
351 dLOOPbase;
335 352
336 if (!once) 353 if (!once)
337 return -1; 354 return -1;
338 355
339 once->fd = fd; 356 once->fd = fd;
… …
345 return 0; 362 return 0;
346} 363}
347 364
348int event_base_priority_init (struct event_base *base, int npri) 365int event_base_priority_init (struct event_base *base, int npri)
349{ 366{
350 dLOOPbase; 367 /*dLOOPbase;*/
351 368
352 return 0; 369 return 0;
353} 370}
354 371

Diff Legend

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