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

Diff Legend

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