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

Comparing libev/event.c (file contents):
Revision 1.18 by root, Tue Nov 6 13:17:55 2007 UTC vs.
Revision 1.31 by root, Wed Nov 14 05:30:02 2007 UTC

… …
35 35
36#ifndef WIN32 36#ifndef WIN32
37# include <sys/time.h> 37# include <sys/time.h>
38#endif 38#endif
39 39
40#include "ev.h" 40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
41#include "event.h" 43# include "event.h"
44#endif
42 45
43#if EV_MULTIPLICITY 46#if EV_MULTIPLICITY
44# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
46#else 49#else
… …
86 89
87void *event_init (void) 90void *event_init (void)
88{ 91{
89#if EV_MULTIPLICITY 92#if EV_MULTIPLICITY
90 if (x_cur) 93 if (x_cur)
91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 94 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
92 else 95 else
93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 96 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
94#else 97#else
95 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 98 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
96 99
97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); 100 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
98#endif 101#endif
99 102
100 return x_cur; 103 return x_cur;
101} 104}
102 105
103void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
104{ 107{
105 dLOOPbase; 108 dLOOPbase;
106 109
107#if EV_MULTIPLICITY 110#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop) 111 if (ev_default_loop (EVFLAG_AUTO) != loop)
109 ev_loop_destroy (loop); 112 ev_loop_destroy (loop);
110#endif 113#endif
111} 114}
112 115
113int event_dispatch (void) 116int event_dispatch (void)
… …
136x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
137{ 140{
138 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
139 142
140 ev->ev_res = revents; 143 ev->ev_res = revents;
141 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
142} 145}
143 146
144static void 147static void
145x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 149{
147 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);
148} 156}
149 157
150static void 158static void
151x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
152{ 160{
153 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));
154 162
163 if (revents & EV_ERROR)
164 event_del (ev);
155 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
156 ev_io_stop (EV_A_ w); 167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
157 170
158 x_cb (ev, revents); 171 x_cb (ev, revents);
159} 172}
160 173
161static void 174static void
… …
169} 182}
170 183
171void 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)
172{ 185{
173 if (events & EV_SIGNAL) 186 if (events & EV_SIGNAL)
174 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 187 ev_init (&ev->iosig.sig, x_cb_sig);
175 else 188 else
176 ev_watcher_init (&ev->iosig.io, x_cb_io); 189 ev_init (&ev->iosig.io, x_cb_io);
177 190
178 ev_watcher_init (&ev->to, x_cb_to); 191 ev_init (&ev->to, x_cb_to);
179 192
180 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 193 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
181 ev->ev_fd = fd; 194 ev->ev_fd = fd;
182 ev->ev_events = events; 195 ev->ev_events = events;
183 ev->ev_pri = 0; 196 ev->ev_pri = 0;
184 ev->ev_callback = cb; 197 ev->ev_callback = cb;
185 ev->ev_arg = arg; 198 ev->ev_arg = arg;
186 ev->ev_res = 0; 199 ev->ev_res = 0;
200 ev->ev_flags = EVLIST_INIT;
187} 201}
188 202
189int 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)
190{ 204{
191 return event_base_once (x_cur, fd, events, cb, arg, tv); 205 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
193 207
194int event_add (struct event *ev, struct timeval *tv) 208int event_add (struct event *ev, struct timeval *tv)
195{ 209{
196 dLOOPev; 210 dLOOPev;
197 211
198 /* disable all watchers */
199 event_del (ev);
200
201 if (ev->ev_events & EV_SIGNAL) 212 if (ev->ev_events & EV_SIGNAL)
202 { 213 {
214 if (!ev_is_active (&ev->iosig.sig))
215 {
203 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 216 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
204 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 }
205 } 221 }
206 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
207 { 223 {
224 if (!ev_is_active (&ev->iosig.io))
225 {
208 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));
209 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 }
210 } 231 }
211 232
212 if (tv) 233 if (tv)
213 { 234 {
214 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))
215 ev_timer_start (EV_A_ &ev->to); 241 ev_timer_stop (EV_A_ &ev->to);
216 } 242
243 ev->ev_flags |= EVLIST_ACTIVE;
217 244
218 return 0; 245 return 0;
219} 246}
220 247
221int event_del (struct event *ev) 248int event_del (struct event *ev)
… …
236 } 263 }
237 264
238 if (ev_is_active (&ev->to)) 265 if (ev_is_active (&ev->to))
239 ev_timer_stop (EV_A_ &ev->to); 266 ev_timer_stop (EV_A_ &ev->to);
240 267
268 ev->ev_flags = EVLIST_INIT;
269
241 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));
242} 285}
243 286
244int event_pending (struct event *ev, short events, struct timeval *tv) 287int event_pending (struct event *ev, short events, struct timeval *tv)
245{ 288{
246 short revents = 0; 289 short revents = 0;
… …
307static void 350static void
308x_loopexit_cb (int revents, void *base) 351x_loopexit_cb (int revents, void *base)
309{ 352{
310 dLOOPbase; 353 dLOOPbase;
311 354
312 ev_unloop (EV_A_ EVUNLOOP_ONCE); 355 ev_unloop (EV_A_ EVUNLOOP_ONE);
313} 356}
314 357
315int event_base_loopexit (struct event_base *base, struct timeval *tv) 358int event_base_loopexit (struct event_base *base, struct timeval *tv)
316{ 359{
317 ev_tstamp after = tv_get (tv); 360 ev_tstamp after = tv_get (tv);
… …
330}; 373};
331 374
332static void 375static void
333x_once_cb (int revents, void *arg) 376x_once_cb (int revents, void *arg)
334{ 377{
335 struct x_once *once = arg; 378 struct x_once *once = (struct x_once *)arg;
336 379
337 once->cb (once->fd, revents, once->arg); 380 once->cb (once->fd, (short)revents, once->arg);
338 free (once); 381 free (once);
339} 382}
340 383
341int 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)
342{ 385{
343 struct x_once *once = malloc (sizeof (struct x_once)); 386 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
344 dLOOPbase; 387 dLOOPbase;
345 388
346 if (!once) 389 if (!once)
347 return -1; 390 return -1;
348 391

Diff Legend

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