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

Comparing libev/event.c (file contents):
Revision 1.8 by root, Sat Nov 3 22:10:39 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
38#ifdef EV_MULTIPLICITY 46#if EV_MULTIPLICITY
39# define dLOOPev struct ev_loop *loop = ev->ev_base->loop 47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
40# define dLOOPbase struct ev_loop *loop = base->loop 48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
41#else 49#else
42# define dLOOPev 50# define dLOOPev
43# define dLOOPbase 51# define dLOOPbase
44#endif 52#endif
45 53
54/* never accessed, will always be cast from/to ev_loop */
46struct event_base 55struct event_base
47{ 56{
48#ifdef EV_MULTIPLICITY
49 struct ev_loop *loop;
50#endif
51 int dummy; 57 int dummy;
52}; 58};
53 59
54static struct event_base x_base, *x_cur; 60static struct event_base *x_cur;
55 61
56static void 62static void
57tv_set (struct timeval *tv, ev_tstamp at) 63tv_set (struct timeval *tv, ev_tstamp at)
58{ 64{
59 tv->tv_sec = (long)at; 65 tv->tv_sec = (long)at;
… …
81 return "libev"; 87 return "libev";
82} 88}
83 89
84void *event_init (void) 90void *event_init (void)
85{ 91{
86 if (!x_cur && ev_init (0)) 92#if EV_MULTIPLICITY
87 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));
88 99
100 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
101#endif
102
89 return 0; 103 return x_cur;
90} 104}
91 105
92void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
93{ 107{
94 dLOOPbase; 108 dLOOPbase;
95 109
96 /* nop */ 110#if EV_MULTIPLICITY
111 if (ev_default_loop (EVFLAG_AUTO) != loop)
112 ev_loop_destroy (loop);
113#endif
97} 114}
98 115
99int event_dispatch (void) 116int event_dispatch (void)
100{ 117{
101 return event_base_dispatch (x_cur); 118 return event_base_dispatch (x_cur);
… …
122x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
123{ 140{
124 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
125 142
126 ev->ev_res = revents; 143 ev->ev_res = revents;
127 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
128} 145}
129 146
130static void 147static void
131x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
132{ 149{
133 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);
134} 156}
135 157
136static void 158static void
137x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
138{ 160{
139 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));
140 162
163 if (revents & EV_ERROR)
164 event_del (ev);
141 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
142 ev_io_stop (w); 167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
143 170
144 x_cb (ev, revents); 171 x_cb (ev, revents);
145} 172}
146 173
147static void 174static void
148x_cb_to (EV_P_ struct ev_timer *w, int revents) 175x_cb_to (EV_P_ struct ev_timer *w, int revents)
149{ 176{
150 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);
151} 182}
152 183
153void 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)
154{ 185{
155 if (events & EV_SIGNAL) 186 if (events & EV_SIGNAL)
156 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 187 ev_init (&ev->iosig.sig, x_cb_sig);
157 else 188 else
158 ev_watcher_init (&ev->iosig.io, x_cb_io); 189 ev_init (&ev->iosig.io, x_cb_io);
159 190
160 ev_watcher_init (&ev->to, x_cb_to); 191 ev_init (&ev->to, x_cb_to);
161 192
162 ev->ev_base = x_cur; 193 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
163 ev->ev_fd = fd; 194 ev->ev_fd = fd;
164 ev->ev_events = events; 195 ev->ev_events = events;
165 ev->ev_pri = 0; 196 ev->ev_pri = 0;
166 ev->ev_callback = cb; 197 ev->ev_callback = cb;
167 ev->ev_arg = arg; 198 ev->ev_arg = arg;
168 ev->ev_res = 0; 199 ev->ev_res = 0;
200 ev->ev_flags = EVLIST_INIT;
169} 201}
170 202
171int 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)
172{ 204{
173 return event_base_once (x_cur, fd, events, cb, arg, tv); 205 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
175 207
176int event_add (struct event *ev, struct timeval *tv) 208int event_add (struct event *ev, struct timeval *tv)
177{ 209{
178 dLOOPev; 210 dLOOPev;
179 211
180 /* disable all watchers */
181 event_del (ev);
182
183 if (ev->ev_events & EV_SIGNAL) 212 if (ev->ev_events & EV_SIGNAL)
184 { 213 {
214 if (!ev_is_active (&ev->iosig.sig))
215 {
185 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 216 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
186 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 }
187 } 221 }
188 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
189 { 223 {
224 if (!ev_is_active (&ev->iosig.io))
225 {
190 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));
191 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 }
192 } 231 }
193 232
194 if (tv) 233 if (tv)
195 { 234 {
196 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))
197 ev_timer_start (EV_A_ &ev->to); 241 ev_timer_stop (EV_A_ &ev->to);
198 } 242
243 ev->ev_flags |= EVLIST_ACTIVE;
199 244
200 return 0; 245 return 0;
201} 246}
202 247
203int event_del (struct event *ev) 248int event_del (struct event *ev)
… …
208 { 253 {
209 /* sig */ 254 /* sig */
210 if (ev_is_active (&ev->iosig.sig)) 255 if (ev_is_active (&ev->iosig.sig))
211 ev_signal_stop (EV_A_ &ev->iosig.sig); 256 ev_signal_stop (EV_A_ &ev->iosig.sig);
212 } 257 }
213 else 258 else if (ev->ev_events & (EV_READ | EV_WRITE))
214 { 259 {
215 /* io */ 260 /* io */
216 if (ev_is_active (&ev->iosig.io)) 261 if (ev_is_active (&ev->iosig.io))
217 ev_io_stop (EV_A_ &ev->iosig.io); 262 ev_io_stop (EV_A_ &ev->iosig.io);
218 } 263 }
219 264
220 if (ev_is_active (&ev->to)) 265 if (ev_is_active (&ev->to))
221 ev_timer_stop (EV_A_ &ev->to); 266 ev_timer_stop (EV_A_ &ev->to);
222 267
268 ev->ev_flags = EVLIST_INIT;
269
223 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));
224} 285}
225 286
226int event_pending (struct event *ev, short events, struct timeval *tv) 287int event_pending (struct event *ev, short events, struct timeval *tv)
227{ 288{
289 short revents = 0;
228 dLOOPev; 290 dLOOPev;
229 291
230 short revents = 0;
231 292
232 if (ev->ev_events & EV_SIGNAL) 293 if (ev->ev_events & EV_SIGNAL)
233 { 294 {
234 /* sig */ 295 /* sig */
235 if (ev->iosig.sig.pending) 296 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
236 revents |= EV_SIGNAL; 297 revents |= EV_SIGNAL;
237 } 298 }
238 else 299 else if (ev->ev_events & (EV_READ | EV_WRITE))
239 { 300 {
240 /* io */ 301 /* io */
241 if (ev->iosig.io.pending) 302 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
242 revents |= ev->ev_events & (EV_READ | EV_WRITE); 303 revents |= ev->ev_events & (EV_READ | EV_WRITE);
243 } 304 }
244 305
245 if (ev->to.pending) 306 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
246 { 307 {
247 revents |= EV_TIMEOUT; 308 revents |= EV_TIMEOUT;
248 309
249 if (tv) 310 if (tv)
250 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 :) */
… …
285{ 346{
286 return event_base_loop (base, 0); 347 return event_base_loop (base, 0);
287} 348}
288 349
289static void 350static void
290x_loopexit_cb (EV_P_ int revents, void *arg) 351x_loopexit_cb (int revents, void *base)
291{ 352{
353 dLOOPbase;
354
292 ev_unloop (EV_A_ 2); 355 ev_unloop (EV_A_ EVUNLOOP_ONE);
293} 356}
294 357
295int event_base_loopexit (struct event_base *base, struct timeval *tv) 358int event_base_loopexit (struct event_base *base, struct timeval *tv)
296{ 359{
360 ev_tstamp after = tv_get (tv);
297 dLOOPbase; 361 dLOOPbase;
298 ev_tstamp after = tv_get (tv);
299 362
300 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);
301 364
302 return -1; 365 return -1;
303} 366}
… …
310}; 373};
311 374
312static void 375static void
313x_once_cb (int revents, void *arg) 376x_once_cb (int revents, void *arg)
314{ 377{
315 struct x_once *once = arg; 378 struct x_once *once = (struct x_once *)arg;
316 379
317 once->cb (once->fd, revents, once->arg); 380 once->cb (once->fd, (short)revents, once->arg);
318 free (once); 381 free (once);
319} 382}
320 383
321int 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)
322{ 385{
386 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
323 dLOOPbase; 387 dLOOPbase;
324 struct x_once *once = malloc (sizeof (struct x_once));
325 388
326 if (!once) 389 if (!once)
327 return -1; 390 return -1;
328 391
329 once->fd = fd; 392 once->fd = fd;
… …
335 return 0; 398 return 0;
336} 399}
337 400
338int event_base_priority_init (struct event_base *base, int npri) 401int event_base_priority_init (struct event_base *base, int npri)
339{ 402{
340 dLOOPbase; 403 /*dLOOPbase;*/
341 404
342 return 0; 405 return 0;
343} 406}
344 407

Diff Legend

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