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

Comparing libev/event.c (file contents):
Revision 1.12 by root, Sun Nov 4 18:15:16 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 = 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
111 if (ev_default_loop (EVFLAG_AUTO) != loop)
105 ev_loop_delete (loop); 112 ev_loop_destroy (loop);
106#endif 113#endif
107} 114}
108 115
109int event_dispatch (void) 116int event_dispatch (void)
110{ 117{
… …
132x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
133{ 140{
134 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
135 142
136 ev->ev_res = revents; 143 ev->ev_res = revents;
137 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
138} 145}
139 146
140static void 147static void
141x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
142{ 149{
143 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);
144} 156}
145 157
146static void 158static void
147x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
148{ 160{
149 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));
150 162
151 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 163 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
152 ev_io_stop (EV_A_ w); 164 event_del (ev);
153 165
154 x_cb (ev, revents); 166 x_cb (ev, revents);
155} 167}
156 168
157static void 169static void
158x_cb_to (EV_P_ struct ev_timer *w, int revents) 170x_cb_to (EV_P_ struct ev_timer *w, int revents)
159{ 171{
160 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);
161} 177}
162 178
163void 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)
164{ 180{
165 if (!ev->initialised)
166 {
167 ev->initialised = 1;
168
169 if (events & EV_SIGNAL) 181 if (events & EV_SIGNAL)
170 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 182 ev_init (&ev->iosig.sig, x_cb_sig);
171 else 183 else
172 ev_watcher_init (&ev->iosig.io, x_cb_io); 184 ev_init (&ev->iosig.io, x_cb_io);
173 185
174 ev_watcher_init (&ev->to, x_cb_to); 186 ev_init (&ev->to, x_cb_to);
175 }
176 187
177 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 */
178 ev->ev_fd = fd; 189 ev->ev_fd = fd;
179 ev->ev_events = events; 190 ev->ev_events = events;
180 ev->ev_pri = 0; 191 ev->ev_pri = 0;
181 ev->ev_callback = cb; 192 ev->ev_callback = cb;
182 ev->ev_arg = arg; 193 ev->ev_arg = arg;
183 ev->ev_res = 0; 194 ev->ev_res = 0;
195 ev->ev_flags = EVLIST_INIT;
184} 196}
185 197
186int 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)
187{ 199{
188 return event_base_once (x_cur, fd, events, cb, arg, tv); 200 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
190 202
191int event_add (struct event *ev, struct timeval *tv) 203int event_add (struct event *ev, struct timeval *tv)
192{ 204{
193 dLOOPev; 205 dLOOPev;
194 206
195 /* disable all watchers */
196 event_del (ev);
197
198 if (ev->ev_events & EV_SIGNAL) 207 if (ev->ev_events & EV_SIGNAL)
199 { 208 {
209 if (!ev_is_active (&ev->iosig.sig))
210 {
200 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 211 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
201 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 }
202 } 216 }
203 else if (ev->ev_events & (EV_READ | EV_WRITE)) 217 else if (ev->ev_events & (EV_READ | EV_WRITE))
204 { 218 {
219 if (!ev_is_active (&ev->iosig.io))
220 {
205 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));
206 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 }
207 } 226 }
208 227
209 if (tv) 228 if (tv)
210 { 229 {
211 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 {
212 ev_timer_start (EV_A_ &ev->to); 236 ev_timer_stop (EV_A_ &ev->to);
237 ev->ev_flags &= ~EVLIST_TIMEOUT;
213 } 238 }
239
240 ev->ev_flags |= EVLIST_ACTIVE;
214 241
215 return 0; 242 return 0;
216} 243}
217 244
218int event_del (struct event *ev) 245int event_del (struct event *ev)
219{ 246{
220 dLOOPev; 247 dLOOPev;
221 248
222 if (ev->ev_events & EV_SIGNAL) 249 if (ev->ev_events & EV_SIGNAL)
223 {
224 /* sig */
225 if (ev_is_active (&ev->iosig.sig))
226 ev_signal_stop (EV_A_ &ev->iosig.sig); 250 ev_signal_stop (EV_A_ &ev->iosig.sig);
227 } 251 else if (ev->ev_events & (EV_READ | EV_WRITE))
228 else
229 {
230 /* io */
231 if (ev_is_active (&ev->iosig.io))
232 ev_io_stop (EV_A_ &ev->iosig.io); 252 ev_io_stop (EV_A_ &ev->iosig.io);
233 }
234 253
235 if (ev_is_active (&ev->to)) 254 if (ev_is_active (&ev->to))
236 ev_timer_stop (EV_A_ &ev->to); 255 ev_timer_stop (EV_A_ &ev->to);
237 256
257 ev->ev_flags = EVLIST_INIT;
258
238 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));
239} 274}
240 275
241int event_pending (struct event *ev, short events, struct timeval *tv) 276int event_pending (struct event *ev, short events, struct timeval *tv)
242{ 277{
278 short revents = 0;
243 dLOOPev; 279 dLOOPev;
244 280
245 short revents = 0;
246 281
247 if (ev->ev_events & EV_SIGNAL) 282 if (ev->ev_events & EV_SIGNAL)
248 { 283 {
249 /* sig */ 284 /* sig */
250 if (ev->iosig.sig.pending) 285 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
251 revents |= EV_SIGNAL; 286 revents |= EV_SIGNAL;
252 } 287 }
253 else 288 else if (ev->ev_events & (EV_READ | EV_WRITE))
254 { 289 {
255 /* io */ 290 /* io */
256 if (ev->iosig.io.pending) 291 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
257 revents |= ev->ev_events & (EV_READ | EV_WRITE); 292 revents |= ev->ev_events & (EV_READ | EV_WRITE);
258 } 293 }
259 294
260 if (ev->to.pending) 295 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
261 { 296 {
262 revents |= EV_TIMEOUT; 297 revents |= EV_TIMEOUT;
263 298
264 if (tv) 299 if (tv)
265 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 :) */
… …
304static void 339static void
305x_loopexit_cb (int revents, void *base) 340x_loopexit_cb (int revents, void *base)
306{ 341{
307 dLOOPbase; 342 dLOOPbase;
308 343
309 ev_unloop (EV_A_ EVUNLOOP_ONCE); 344 ev_unloop (EV_A_ EVUNLOOP_ONE);
310} 345}
311 346
312int event_base_loopexit (struct event_base *base, struct timeval *tv) 347int event_base_loopexit (struct event_base *base, struct timeval *tv)
313{ 348{
314 dLOOPbase;
315 ev_tstamp after = tv_get (tv); 349 ev_tstamp after = tv_get (tv);
350 dLOOPbase;
316 351
317 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);
318 353
319 return -1; 354 return -1;
320} 355}
… …
327}; 362};
328 363
329static void 364static void
330x_once_cb (int revents, void *arg) 365x_once_cb (int revents, void *arg)
331{ 366{
332 struct x_once *once = arg; 367 struct x_once *once = (struct x_once *)arg;
333 368
334 once->cb (once->fd, revents, once->arg); 369 once->cb (once->fd, (short)revents, once->arg);
335 free (once); 370 free (once);
336} 371}
337 372
338int 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)
339{ 374{
340 dLOOPbase;
341 struct x_once *once = malloc (sizeof (struct x_once)); 375 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
376 dLOOPbase;
342 377
343 if (!once) 378 if (!once)
344 return -1; 379 return -1;
345 380
346 once->fd = fd; 381 once->fd = fd;
… …
352 return 0; 387 return 0;
353} 388}
354 389
355int event_base_priority_init (struct event_base *base, int npri) 390int event_base_priority_init (struct event_base *base, int npri)
356{ 391{
357 dLOOPbase; 392 /*dLOOPbase;*/
358 393
359 return 0; 394 return 0;
360} 395}
361 396

Diff Legend

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