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

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

Diff Legend

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