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

Comparing libev/event.c (file contents):
Revision 1.11 by root, Sun Nov 4 16:52:52 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 <sys/time.h>
35#include <assert.h> 34#include <assert.h>
36 35
37#ifndef EV_EMBED 36#ifndef WIN32
37# include <sys/time.h>
38#endif
39
40#include "ev.h"
38# include "event.h" 41#include "event.h"
39#endif
40 42
41#if EV_MULTIPLICITY 43#if EV_MULTIPLICITY
42# 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
43# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
44#else 46#else
… …
86{ 88{
87#if EV_MULTIPLICITY 89#if EV_MULTIPLICITY
88 if (x_cur) 90 if (x_cur)
89 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
90 else 92 else
91 x_cur = ev_default_loop (EVMETHOD_AUTO); 93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
92#else 94#else
93 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur)); 95 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
94 96
95 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
96#endif 98#endif
97 99
98 return x_cur; 100 return x_cur;
99} 101}
100 102
101void event_base_free (struct event_base *base) 103void event_base_free (struct event_base *base)
102{ 104{
103 dLOOPbase; 105 dLOOPbase;
104 106
105#if EV_MULTIPLICITY 107#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop)
106 ev_loop_delete (loop); 109 ev_loop_destroy (loop);
107#endif 110#endif
108} 111}
109 112
110int event_dispatch (void) 113int event_dispatch (void)
111{ 114{
112 return event_base_dispatch (x_cur); 115 return event_base_dispatch (x_cur);
113} 116}
114 117
115#ifdef EV_EMBED 118#ifdef EV_STANDALONE
116void event_set_log_callback (event_log_cb cb) 119void event_set_log_callback (event_log_cb cb)
117{ 120{
118 /* nop */ 121 /* nop */
119} 122}
120#endif 123#endif
… …
139} 142}
140 143
141static void 144static void
142x_cb_sig (EV_P_ struct ev_signal *w, int revents) 145x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 146{
144 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);
145} 153}
146 154
147static void 155static void
148x_cb_io (EV_P_ struct ev_io *w, int revents) 156x_cb_io (EV_P_ struct ev_io *w, int revents)
149{ 157{
150 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));
151 159
160 if (revents & EV_ERROR)
161 event_del (ev);
152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
153 ev_io_stop (EV_A_ w); 163 ev_io_stop (EV_A_ w);
154 164
155 x_cb (ev, revents); 165 x_cb (ev, revents);
156} 166}
157 167
158static void 168static void
159x_cb_to (EV_P_ struct ev_timer *w, int revents) 169x_cb_to (EV_P_ struct ev_timer *w, int revents)
160{ 170{
161 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);
162} 176}
163 177
164void 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)
165{ 179{
166 if (!ev->initialised)
167 {
168 ev->initialised = 1;
169
170 if (events & EV_SIGNAL) 180 if (events & EV_SIGNAL)
171 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 181 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
172 else 182 else
173 ev_watcher_init (&ev->iosig.io, x_cb_io); 183 ev_watcher_init (&ev->iosig.io, x_cb_io);
174 184
175 ev_watcher_init (&ev->to, x_cb_to); 185 ev_watcher_init (&ev->to, x_cb_to);
176 }
177 186
178 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 */
179 ev->ev_fd = fd; 188 ev->ev_fd = fd;
180 ev->ev_events = events; 189 ev->ev_events = events;
181 ev->ev_pri = 0; 190 ev->ev_pri = 0;
… …
224 { 233 {
225 /* sig */ 234 /* sig */
226 if (ev_is_active (&ev->iosig.sig)) 235 if (ev_is_active (&ev->iosig.sig))
227 ev_signal_stop (EV_A_ &ev->iosig.sig); 236 ev_signal_stop (EV_A_ &ev->iosig.sig);
228 } 237 }
229 else 238 else if (ev->ev_events & (EV_READ | EV_WRITE))
230 { 239 {
231 /* io */ 240 /* io */
232 if (ev_is_active (&ev->iosig.io)) 241 if (ev_is_active (&ev->iosig.io))
233 ev_io_stop (EV_A_ &ev->iosig.io); 242 ev_io_stop (EV_A_ &ev->iosig.io);
234 } 243 }
… …
239 return 0; 248 return 0;
240} 249}
241 250
242int event_pending (struct event *ev, short events, struct timeval *tv) 251int event_pending (struct event *ev, short events, struct timeval *tv)
243{ 252{
253 short revents = 0;
244 dLOOPev; 254 dLOOPev;
245 255
246 short revents = 0;
247 256
248 if (ev->ev_events & EV_SIGNAL) 257 if (ev->ev_events & EV_SIGNAL)
249 { 258 {
250 /* sig */ 259 /* sig */
251 if (ev->iosig.sig.pending) 260 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
252 revents |= EV_SIGNAL; 261 revents |= EV_SIGNAL;
253 } 262 }
254 else 263 else if (ev->ev_events & (EV_READ | EV_WRITE))
255 { 264 {
256 /* io */ 265 /* io */
257 if (ev->iosig.io.pending) 266 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
258 revents |= ev->ev_events & (EV_READ | EV_WRITE); 267 revents |= ev->ev_events & (EV_READ | EV_WRITE);
259 } 268 }
260 269
261 if (ev->to.pending) 270 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
262 { 271 {
263 revents |= EV_TIMEOUT; 272 revents |= EV_TIMEOUT;
264 273
265 if (tv) 274 if (tv)
266 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 :) */
… …
310 ev_unloop (EV_A_ EVUNLOOP_ONCE); 319 ev_unloop (EV_A_ EVUNLOOP_ONCE);
311} 320}
312 321
313int event_base_loopexit (struct event_base *base, struct timeval *tv) 322int event_base_loopexit (struct event_base *base, struct timeval *tv)
314{ 323{
315 dLOOPbase;
316 ev_tstamp after = tv_get (tv); 324 ev_tstamp after = tv_get (tv);
325 dLOOPbase;
317 326
318 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);
319 328
320 return -1; 329 return -1;
321} 330}
… …
328}; 337};
329 338
330static void 339static void
331x_once_cb (int revents, void *arg) 340x_once_cb (int revents, void *arg)
332{ 341{
333 struct x_once *once = arg; 342 struct x_once *once = (struct x_once *)arg;
334 343
335 once->cb (once->fd, revents, once->arg); 344 once->cb (once->fd, revents, once->arg);
336 free (once); 345 free (once);
337} 346}
338 347
339int 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)
340{ 349{
341 dLOOPbase;
342 struct x_once *once = malloc (sizeof (struct x_once)); 350 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
351 dLOOPbase;
343 352
344 if (!once) 353 if (!once)
345 return -1; 354 return -1;
346 355
347 once->fd = fd; 356 once->fd = fd;
… …
353 return 0; 362 return 0;
354} 363}
355 364
356int event_base_priority_init (struct event_base *base, int npri) 365int event_base_priority_init (struct event_base *base, int npri)
357{ 366{
358 dLOOPbase; 367 /*dLOOPbase;*/
359 368
360 return 0; 369 return 0;
361} 370}
362 371

Diff Legend

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