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.19 by root, Tue Nov 6 16:51:20 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{
… …
148} 159}
149 160
150static void 161static void
151x_cb_to (EV_P_ struct ev_timer *w, int revents) 162x_cb_to (EV_P_ struct ev_timer *w, int revents)
152{ 163{
153 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 164 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
165
166 event_del (ev);
167
168 x_cb (ev, revents);
154} 169}
155 170
156void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 171void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
157{ 172{
158 if (!ev->initialised)
159 {
160 ev->initialised = 1;
161
162 if (events & EV_SIGNAL) 173 if (events & EV_SIGNAL)
163 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 174 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
164 else 175 else
165 ev_watcher_init (&ev->iosig.io, x_cb_io); 176 ev_watcher_init (&ev->iosig.io, x_cb_io);
166 177
167 ev_watcher_init (&ev->to, x_cb_to); 178 ev_watcher_init (&ev->to, x_cb_to);
168 }
169 179
170 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 180 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
171 ev->ev_fd = fd; 181 ev->ev_fd = fd;
172 ev->ev_events = events; 182 ev->ev_events = events;
173 ev->ev_pri = 0; 183 ev->ev_pri = 0;
… …
216 { 226 {
217 /* sig */ 227 /* sig */
218 if (ev_is_active (&ev->iosig.sig)) 228 if (ev_is_active (&ev->iosig.sig))
219 ev_signal_stop (EV_A_ &ev->iosig.sig); 229 ev_signal_stop (EV_A_ &ev->iosig.sig);
220 } 230 }
221 else 231 else if (ev->ev_events & (EV_READ | EV_WRITE))
222 { 232 {
223 /* io */ 233 /* io */
224 if (ev_is_active (&ev->iosig.io)) 234 if (ev_is_active (&ev->iosig.io))
225 ev_io_stop (EV_A_ &ev->iosig.io); 235 ev_io_stop (EV_A_ &ev->iosig.io);
226 } 236 }
… …
231 return 0; 241 return 0;
232} 242}
233 243
234int event_pending (struct event *ev, short events, struct timeval *tv) 244int event_pending (struct event *ev, short events, struct timeval *tv)
235{ 245{
246 short revents = 0;
236 dLOOPev; 247 dLOOPev;
237 248
238 short revents = 0;
239 249
240 if (ev->ev_events & EV_SIGNAL) 250 if (ev->ev_events & EV_SIGNAL)
241 { 251 {
242 /* sig */ 252 /* sig */
243 if (ev->iosig.sig.pending) 253 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
244 revents |= EV_SIGNAL; 254 revents |= EV_SIGNAL;
245 } 255 }
246 else 256 else if (ev->ev_events & (EV_READ | EV_WRITE))
247 { 257 {
248 /* io */ 258 /* io */
249 if (ev->iosig.io.pending) 259 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
250 revents |= ev->ev_events & (EV_READ | EV_WRITE); 260 revents |= ev->ev_events & (EV_READ | EV_WRITE);
251 } 261 }
252 262
253 if (ev->to.pending) 263 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
254 { 264 {
255 revents |= EV_TIMEOUT; 265 revents |= EV_TIMEOUT;
256 266
257 if (tv) 267 if (tv)
258 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 268 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
302 ev_unloop (EV_A_ EVUNLOOP_ONCE); 312 ev_unloop (EV_A_ EVUNLOOP_ONCE);
303} 313}
304 314
305int event_base_loopexit (struct event_base *base, struct timeval *tv) 315int event_base_loopexit (struct event_base *base, struct timeval *tv)
306{ 316{
307 dLOOPbase;
308 ev_tstamp after = tv_get (tv); 317 ev_tstamp after = tv_get (tv);
318 dLOOPbase;
309 319
310 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 320 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
311 321
312 return -1; 322 return -1;
313} 323}
… …
320}; 330};
321 331
322static void 332static void
323x_once_cb (int revents, void *arg) 333x_once_cb (int revents, void *arg)
324{ 334{
325 struct x_once *once = arg; 335 struct x_once *once = (struct x_once *)arg;
326 336
327 once->cb (once->fd, revents, once->arg); 337 once->cb (once->fd, revents, once->arg);
328 free (once); 338 free (once);
329} 339}
330 340
331int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 341int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
332{ 342{
333 dLOOPbase;
334 struct x_once *once = malloc (sizeof (struct x_once)); 343 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
344 dLOOPbase;
335 345
336 if (!once) 346 if (!once)
337 return -1; 347 return -1;
338 348
339 once->fd = fd; 349 once->fd = fd;
… …
345 return 0; 355 return 0;
346} 356}
347 357
348int event_base_priority_init (struct event_base *base, int npri) 358int event_base_priority_init (struct event_base *base, int npri)
349{ 359{
350 dLOOPbase; 360 /*dLOOPbase;*/
351 361
352 return 0; 362 return 0;
353} 363}
354 364

Diff Legend

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