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

Comparing libev/event.c (file contents):
Revision 1.15 by root, Sun Nov 4 20:38:07 2007 UTC vs.
Revision 1.30 by root, Mon Nov 12 21:51:14 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
… …
165 x_cb (ev, revents); 181 x_cb (ev, revents);
166} 182}
167 183
168void 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)
169{ 185{
170 printf ("event set %p\n", ev);//D
171 if (events & EV_SIGNAL) 186 if (events & EV_SIGNAL)
172 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 187 ev_init (&ev->iosig.sig, x_cb_sig);
173 else 188 else
174 ev_watcher_init (&ev->iosig.io, x_cb_io); 189 ev_init (&ev->iosig.io, x_cb_io);
175 190
176 ev_watcher_init (&ev->to, x_cb_to); 191 ev_init (&ev->to, x_cb_to);
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);
190} 206}
191 207
192int event_add (struct event *ev, struct timeval *tv) 208int event_add (struct event *ev, struct timeval *tv)
193{ 209{
194 printf ("event add %p %p\n", ev, &ev->to);//D
195 dLOOPev; 210 dLOOPev;
196 211
197 /* disable all watchers */ 212 /* disable all watchers */
198 event_del (ev); 213 event_del (ev);
199 214
200 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
201 { 216 {
202 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 217 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
203 ev_signal_start (EV_A_ &ev->iosig.sig); 218 ev_signal_start (EV_A_ &ev->iosig.sig);
219
220 ev->ev_flags |= EVLIST_SIGNAL;
204 } 221 }
205 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
206 { 223 {
207 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 224 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
208 ev_io_start (EV_A_ &ev->iosig.io); 225 ev_io_start (EV_A_ &ev->iosig.io);
226
227 ev->ev_flags |= EVLIST_INSERTED;
209 } 228 }
210 229
211 if (tv) 230 if (tv)
212 { 231 {
213 ev_timer_set (&ev->to, tv_get (tv), 0.); 232 ev_timer_set (&ev->to, tv_get (tv), 0.);
214 ev_timer_start (EV_A_ &ev->to); 233 ev_timer_start (EV_A_ &ev->to);
234
235 ev->ev_flags |= EVLIST_TIMEOUT;
215 } 236 }
237
238 ev->ev_flags |= EVLIST_ACTIVE;
216 239
217 return 0; 240 return 0;
218} 241}
219 242
220int event_del (struct event *ev) 243int event_del (struct event *ev)
221{ 244{
222 printf ("event del %p\n", ev);//D
223 dLOOPev; 245 dLOOPev;
224 246
225 if (ev->ev_events & EV_SIGNAL) 247 if (ev->ev_events & EV_SIGNAL)
226 { 248 {
227 /* sig */ 249 /* sig */
228 if (ev_is_active (&ev->iosig.sig)) 250 if (ev_is_active (&ev->iosig.sig))
229 ev_signal_stop (EV_A_ &ev->iosig.sig); 251 ev_signal_stop (EV_A_ &ev->iosig.sig);
230 } 252 }
231 else 253 else if (ev->ev_events & (EV_READ | EV_WRITE))
232 { 254 {
233 /* io */ 255 /* io */
234 if (ev_is_active (&ev->iosig.io)) 256 if (ev_is_active (&ev->iosig.io))
235 ev_io_stop (EV_A_ &ev->iosig.io); 257 ev_io_stop (EV_A_ &ev->iosig.io);
236 } 258 }
237 259
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
239 if (ev_is_active (&ev->to)) 260 if (ev_is_active (&ev->to))
240 ev_timer_stop (EV_A_ &ev->to); 261 ev_timer_stop (EV_A_ &ev->to);
241 262
263 ev->ev_flags = EVLIST_INIT;
264
242 return 0; 265 return 0;
266}
267
268void event_active (struct event *ev, int res, short ncalls)
269{
270 dLOOPev;
271
272 if (res & EV_TIMEOUT)
273 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
274
275 if (res & EV_SIGNAL)
276 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
277
278 if (res & (EV_READ | EV_WRITE))
279 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
243} 280}
244 281
245int event_pending (struct event *ev, short events, struct timeval *tv) 282int event_pending (struct event *ev, short events, struct timeval *tv)
246{ 283{
284 short revents = 0;
247 dLOOPev; 285 dLOOPev;
248 286
249 short revents = 0;
250 287
251 if (ev->ev_events & EV_SIGNAL) 288 if (ev->ev_events & EV_SIGNAL)
252 { 289 {
253 /* sig */ 290 /* sig */
254 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) 291 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
255 revents |= EV_SIGNAL; 292 revents |= EV_SIGNAL;
256 } 293 }
257 else 294 else if (ev->ev_events & (EV_READ | EV_WRITE))
258 { 295 {
259 /* io */ 296 /* io */
260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io)) 297 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
261 revents |= ev->ev_events & (EV_READ | EV_WRITE); 298 revents |= ev->ev_events & (EV_READ | EV_WRITE);
262 } 299 }
… …
308static void 345static void
309x_loopexit_cb (int revents, void *base) 346x_loopexit_cb (int revents, void *base)
310{ 347{
311 dLOOPbase; 348 dLOOPbase;
312 349
313 ev_unloop (EV_A_ EVUNLOOP_ONCE); 350 ev_unloop (EV_A_ EVUNLOOP_ONE);
314} 351}
315 352
316int event_base_loopexit (struct event_base *base, struct timeval *tv) 353int event_base_loopexit (struct event_base *base, struct timeval *tv)
317{ 354{
355 ev_tstamp after = tv_get (tv);
318 dLOOPbase; 356 dLOOPbase;
319 ev_tstamp after = tv_get (tv);
320 357
321 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 358 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
322 359
323 return -1; 360 return -1;
324} 361}
… …
331}; 368};
332 369
333static void 370static void
334x_once_cb (int revents, void *arg) 371x_once_cb (int revents, void *arg)
335{ 372{
336 struct x_once *once = arg; 373 struct x_once *once = (struct x_once *)arg;
337 374
338 once->cb (once->fd, revents, once->arg); 375 once->cb (once->fd, (short)revents, once->arg);
339 free (once); 376 free (once);
340} 377}
341 378
342int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 379int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
343{ 380{
381 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
344 dLOOPbase; 382 dLOOPbase;
345 struct x_once *once = malloc (sizeof (struct x_once));
346 383
347 if (!once) 384 if (!once)
348 return -1; 385 return -1;
349 386
350 once->fd = fd; 387 once->fd = fd;

Diff Legend

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