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

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

Diff Legend

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