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

Diff Legend

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