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

Comparing libev/event.c (file contents):
Revision 1.13 by root, Sun Nov 4 18:29:44 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 <sys/time.h>
35#include <assert.h> 34#include <assert.h>
36 35
37#include "ev.h" 36#ifndef WIN32
37# include <sys/time.h>
38#endif
39
40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
38#include "event.h" 43# include "event.h"
44#endif
39 45
40#if EV_MULTIPLICITY 46#if EV_MULTIPLICITY
41# 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
42# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
43#else 49#else
… …
83 89
84void *event_init (void) 90void *event_init (void)
85{ 91{
86#if EV_MULTIPLICITY 92#if EV_MULTIPLICITY
87 if (x_cur) 93 if (x_cur)
88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 94 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
89 else 95 else
90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 96 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
91#else 97#else
92 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));
93 99
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 100 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
95#endif 101#endif
96 102
97 return x_cur; 103 return x_cur;
98} 104}
99 105
100void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
101{ 107{
102 dLOOPbase; 108 dLOOPbase;
103 109
104#if EV_MULTIPLICITY 110#if EV_MULTIPLICITY
105 if (ev_default_loop (EVMETHOD_AUTO) != loop) 111 if (ev_default_loop (EVFLAG_AUTO) != loop)
106 ev_loop_destroy (loop); 112 ev_loop_destroy (loop);
107#endif 113#endif
108} 114}
109 115
110int event_dispatch (void) 116int event_dispatch (void)
… …
133x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
134{ 140{
135 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
136 142
137 ev->ev_res = revents; 143 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
139} 145}
140 146
141static void 147static void
142x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 149{
144 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);
145} 156}
146 157
147static void 158static void
148x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
149{ 160{
150 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));
151 162
152 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 163 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
153 ev_io_stop (EV_A_ w); 164 event_del (ev);
154 165
155 x_cb (ev, revents); 166 x_cb (ev, revents);
156} 167}
157 168
158static void 169static void
159x_cb_to (EV_P_ struct ev_timer *w, int revents) 170x_cb_to (EV_P_ struct ev_timer *w, int revents)
160{ 171{
161 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);
162} 177}
163 178
164void 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)
165{ 180{
166 if (!ev->initialised)
167 {
168 ev->initialised = 1;
169
170 if (events & EV_SIGNAL) 181 if (events & EV_SIGNAL)
171 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 182 ev_init (&ev->iosig.sig, x_cb_sig);
172 else 183 else
173 ev_watcher_init (&ev->iosig.io, x_cb_io); 184 ev_init (&ev->iosig.io, x_cb_io);
174 185
175 ev_watcher_init (&ev->to, x_cb_to); 186 ev_init (&ev->to, x_cb_to);
176 }
177 187
178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 188 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
179 ev->ev_fd = fd; 189 ev->ev_fd = fd;
180 ev->ev_events = events; 190 ev->ev_events = events;
181 ev->ev_pri = 0; 191 ev->ev_pri = 0;
182 ev->ev_callback = cb; 192 ev->ev_callback = cb;
183 ev->ev_arg = arg; 193 ev->ev_arg = arg;
184 ev->ev_res = 0; 194 ev->ev_res = 0;
195 ev->ev_flags = EVLIST_INIT;
185} 196}
186 197
187int 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)
188{ 199{
189 return event_base_once (x_cur, fd, events, cb, arg, tv); 200 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
191 202
192int event_add (struct event *ev, struct timeval *tv) 203int event_add (struct event *ev, struct timeval *tv)
193{ 204{
194 dLOOPev; 205 dLOOPev;
195 206
196 /* disable all watchers */
197 event_del (ev);
198
199 if (ev->ev_events & EV_SIGNAL) 207 if (ev->ev_events & EV_SIGNAL)
200 { 208 {
209 if (!ev_is_active (&ev->iosig.sig))
210 {
201 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 211 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
202 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 }
203 } 216 }
204 else if (ev->ev_events & (EV_READ | EV_WRITE)) 217 else if (ev->ev_events & (EV_READ | EV_WRITE))
205 { 218 {
219 if (!ev_is_active (&ev->iosig.io))
220 {
206 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));
207 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 }
208 } 226 }
209 227
210 if (tv) 228 if (tv)
211 { 229 {
212 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 {
213 ev_timer_start (EV_A_ &ev->to); 236 ev_timer_stop (EV_A_ &ev->to);
237 ev->ev_flags &= ~EVLIST_TIMEOUT;
214 } 238 }
239
240 ev->ev_flags |= EVLIST_ACTIVE;
215 241
216 return 0; 242 return 0;
217} 243}
218 244
219int event_del (struct event *ev) 245int event_del (struct event *ev)
220{ 246{
221 dLOOPev; 247 dLOOPev;
222 248
223 if (ev->ev_events & EV_SIGNAL) 249 if (ev->ev_events & EV_SIGNAL)
224 {
225 /* sig */
226 if (ev_is_active (&ev->iosig.sig))
227 ev_signal_stop (EV_A_ &ev->iosig.sig); 250 ev_signal_stop (EV_A_ &ev->iosig.sig);
228 } 251 else if (ev->ev_events & (EV_READ | EV_WRITE))
229 else
230 {
231 /* io */
232 if (ev_is_active (&ev->iosig.io))
233 ev_io_stop (EV_A_ &ev->iosig.io); 252 ev_io_stop (EV_A_ &ev->iosig.io);
234 }
235 253
236 if (ev_is_active (&ev->to)) 254 if (ev_is_active (&ev->to))
237 ev_timer_stop (EV_A_ &ev->to); 255 ev_timer_stop (EV_A_ &ev->to);
238 256
257 ev->ev_flags = EVLIST_INIT;
258
239 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));
240} 274}
241 275
242int event_pending (struct event *ev, short events, struct timeval *tv) 276int event_pending (struct event *ev, short events, struct timeval *tv)
243{ 277{
278 short revents = 0;
244 dLOOPev; 279 dLOOPev;
245 280
246 short revents = 0;
247 281
248 if (ev->ev_events & EV_SIGNAL) 282 if (ev->ev_events & EV_SIGNAL)
249 { 283 {
250 /* sig */ 284 /* sig */
251 if (ev->iosig.sig.pending) 285 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
252 revents |= EV_SIGNAL; 286 revents |= EV_SIGNAL;
253 } 287 }
254 else 288 else if (ev->ev_events & (EV_READ | EV_WRITE))
255 { 289 {
256 /* io */ 290 /* io */
257 if (ev->iosig.io.pending) 291 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
258 revents |= ev->ev_events & (EV_READ | EV_WRITE); 292 revents |= ev->ev_events & (EV_READ | EV_WRITE);
259 } 293 }
260 294
261 if (ev->to.pending) 295 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
262 { 296 {
263 revents |= EV_TIMEOUT; 297 revents |= EV_TIMEOUT;
264 298
265 if (tv) 299 if (tv)
266 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 :) */
… …
305static void 339static void
306x_loopexit_cb (int revents, void *base) 340x_loopexit_cb (int revents, void *base)
307{ 341{
308 dLOOPbase; 342 dLOOPbase;
309 343
310 ev_unloop (EV_A_ EVUNLOOP_ONCE); 344 ev_unloop (EV_A_ EVUNLOOP_ONE);
311} 345}
312 346
313int event_base_loopexit (struct event_base *base, struct timeval *tv) 347int event_base_loopexit (struct event_base *base, struct timeval *tv)
314{ 348{
315 dLOOPbase;
316 ev_tstamp after = tv_get (tv); 349 ev_tstamp after = tv_get (tv);
350 dLOOPbase;
317 351
318 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);
319 353
320 return -1; 354 return -1;
321} 355}
… …
328}; 362};
329 363
330static void 364static void
331x_once_cb (int revents, void *arg) 365x_once_cb (int revents, void *arg)
332{ 366{
333 struct x_once *once = arg; 367 struct x_once *once = (struct x_once *)arg;
334 368
335 once->cb (once->fd, revents, once->arg); 369 once->cb (once->fd, (short)revents, once->arg);
336 free (once); 370 free (once);
337} 371}
338 372
339int 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)
340{ 374{
341 dLOOPbase;
342 struct x_once *once = malloc (sizeof (struct x_once)); 375 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
376 dLOOPbase;
343 377
344 if (!once) 378 if (!once)
345 return -1; 379 return -1;
346 380
347 once->fd = fd; 381 once->fd = fd;

Diff Legend

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