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.32 by root, Thu Nov 29 12:21:06 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
141 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 163 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
142 ev_io_stop (w); 164 event_del (ev);
143 165
144 x_cb (ev, revents); 166 x_cb (ev, revents);
145} 167}
146 168
147static void 169static void
148x_cb_to (EV_P_ struct ev_timer *w, int revents) 170x_cb_to (EV_P_ struct ev_timer *w, int revents)
149{ 171{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 172 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
173
174 event_del (ev);
175
176 x_cb (ev, revents);
151} 177}
152 178
153void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 179void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
154{ 180{
155 if (events & EV_SIGNAL) 181 if (events & EV_SIGNAL)
156 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 182 ev_init (&ev->iosig.sig, x_cb_sig);
157 else 183 else
158 ev_watcher_init (&ev->iosig.io, x_cb_io); 184 ev_init (&ev->iosig.io, x_cb_io);
159 185
160 ev_watcher_init (&ev->to, x_cb_to); 186 ev_init (&ev->to, x_cb_to);
161 187
162 ev->ev_base = x_cur; 188 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
163 ev->ev_fd = fd; 189 ev->ev_fd = fd;
164 ev->ev_events = events; 190 ev->ev_events = events;
165 ev->ev_pri = 0; 191 ev->ev_pri = 0;
166 ev->ev_callback = cb; 192 ev->ev_callback = cb;
167 ev->ev_arg = arg; 193 ev->ev_arg = arg;
168 ev->ev_res = 0; 194 ev->ev_res = 0;
195 ev->ev_flags = EVLIST_INIT;
169} 196}
170 197
171int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 198int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
172{ 199{
173 return event_base_once (x_cur, fd, events, cb, arg, tv); 200 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
175 202
176int event_add (struct event *ev, struct timeval *tv) 203int event_add (struct event *ev, struct timeval *tv)
177{ 204{
178 dLOOPev; 205 dLOOPev;
179 206
180 /* disable all watchers */
181 event_del (ev);
182
183 if (ev->ev_events & EV_SIGNAL) 207 if (ev->ev_events & EV_SIGNAL)
184 { 208 {
209 if (!ev_is_active (&ev->iosig.sig))
210 {
185 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 211 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
186 ev_signal_start (EV_A_ &ev->iosig.sig); 212 ev_signal_start (EV_A_ &ev->iosig.sig);
213
214 ev->ev_flags |= EVLIST_SIGNAL;
215 }
187 } 216 }
188 else if (ev->ev_events & (EV_READ | EV_WRITE)) 217 else if (ev->ev_events & (EV_READ | EV_WRITE))
189 { 218 {
219 if (!ev_is_active (&ev->iosig.io))
220 {
190 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 221 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); 222 ev_io_start (EV_A_ &ev->iosig.io);
223
224 ev->ev_flags |= EVLIST_INSERTED;
225 }
192 } 226 }
193 227
194 if (tv) 228 if (tv)
195 { 229 {
196 ev_timer_set (&ev->to, tv_get (tv), 0.); 230 ev->to.repeat = tv_get (tv);
231 ev_timer_again (EV_A_ &ev->to);
232 ev->ev_flags |= EVLIST_TIMEOUT;
233 }
234 else
235 {
197 ev_timer_start (EV_A_ &ev->to); 236 ev_timer_stop (EV_A_ &ev->to);
237 ev->ev_flags &= ~EVLIST_TIMEOUT;
198 } 238 }
239
240 ev->ev_flags |= EVLIST_ACTIVE;
199 241
200 return 0; 242 return 0;
201} 243}
202 244
203int event_del (struct event *ev) 245int event_del (struct event *ev)
204{ 246{
205 dLOOPev; 247 dLOOPev;
206 248
207 if (ev->ev_events & EV_SIGNAL) 249 if (ev->ev_events & EV_SIGNAL)
208 {
209 /* sig */
210 if (ev_is_active (&ev->iosig.sig))
211 ev_signal_stop (EV_A_ &ev->iosig.sig); 250 ev_signal_stop (EV_A_ &ev->iosig.sig);
212 } 251 else if (ev->ev_events & (EV_READ | EV_WRITE))
213 else
214 {
215 /* io */
216 if (ev_is_active (&ev->iosig.io))
217 ev_io_stop (EV_A_ &ev->iosig.io); 252 ev_io_stop (EV_A_ &ev->iosig.io);
218 }
219 253
220 if (ev_is_active (&ev->to)) 254 if (ev_is_active (&ev->to))
221 ev_timer_stop (EV_A_ &ev->to); 255 ev_timer_stop (EV_A_ &ev->to);
222 256
257 ev->ev_flags = EVLIST_INIT;
258
223 return 0; 259 return 0;
260}
261
262void event_active (struct event *ev, int res, short ncalls)
263{
264 dLOOPev;
265
266 if (res & EV_TIMEOUT)
267 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
268
269 if (res & EV_SIGNAL)
270 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
271
272 if (res & (EV_READ | EV_WRITE))
273 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
224} 274}
225 275
226int event_pending (struct event *ev, short events, struct timeval *tv) 276int event_pending (struct event *ev, short events, struct timeval *tv)
227{ 277{
278 short revents = 0;
228 dLOOPev; 279 dLOOPev;
229 280
230 short revents = 0;
231 281
232 if (ev->ev_events & EV_SIGNAL) 282 if (ev->ev_events & EV_SIGNAL)
233 { 283 {
234 /* sig */ 284 /* sig */
235 if (ev->iosig.sig.pending) 285 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
236 revents |= EV_SIGNAL; 286 revents |= EV_SIGNAL;
237 } 287 }
238 else 288 else if (ev->ev_events & (EV_READ | EV_WRITE))
239 { 289 {
240 /* io */ 290 /* io */
241 if (ev->iosig.io.pending) 291 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
242 revents |= ev->ev_events & (EV_READ | EV_WRITE); 292 revents |= ev->ev_events & (EV_READ | EV_WRITE);
243 } 293 }
244 294
245 if (ev->to.pending) 295 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
246 { 296 {
247 revents |= EV_TIMEOUT; 297 revents |= EV_TIMEOUT;
248 298
249 if (tv) 299 if (tv)
250 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 300 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
285{ 335{
286 return event_base_loop (base, 0); 336 return event_base_loop (base, 0);
287} 337}
288 338
289static void 339static void
290x_loopexit_cb (EV_P_ int revents, void *arg) 340x_loopexit_cb (int revents, void *base)
291{ 341{
342 dLOOPbase;
343
292 ev_unloop (EV_A_ 2); 344 ev_unloop (EV_A_ EVUNLOOP_ONE);
293} 345}
294 346
295int event_base_loopexit (struct event_base *base, struct timeval *tv) 347int event_base_loopexit (struct event_base *base, struct timeval *tv)
296{ 348{
297 dLOOPbase;
298 ev_tstamp after = tv_get (tv); 349 ev_tstamp after = tv_get (tv);
350 dLOOPbase;
299 351
300 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 352 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
301 353
302 return -1; 354 return -1;
303} 355}
… …
310}; 362};
311 363
312static void 364static void
313x_once_cb (int revents, void *arg) 365x_once_cb (int revents, void *arg)
314{ 366{
315 struct x_once *once = arg; 367 struct x_once *once = (struct x_once *)arg;
316 368
317 once->cb (once->fd, revents, once->arg); 369 once->cb (once->fd, (short)revents, once->arg);
318 free (once); 370 free (once);
319} 371}
320 372
321int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 373int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
322{ 374{
323 dLOOPbase;
324 struct x_once *once = malloc (sizeof (struct x_once)); 375 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
376 dLOOPbase;
325 377
326 if (!once) 378 if (!once)
327 return -1; 379 return -1;
328 380
329 once->fd = fd; 381 once->fd = fd;
… …
335 return 0; 387 return 0;
336} 388}
337 389
338int event_base_priority_init (struct event_base *base, int npri) 390int event_base_priority_init (struct event_base *base, int npri)
339{ 391{
340 dLOOPbase; 392 /*dLOOPbase;*/
341 393
342 return 0; 394 return 0;
343} 395}
344 396

Diff Legend

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