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.26 by root, Mon Nov 12 00:31:08 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
… …
89 else 95 else
90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 96 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_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 (EVMETHOD_AUTO);
95#endif 101#endif
96 102
97 return x_cur; 103 return x_cur;
98} 104}
99 105
… …
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))
153 ev_io_stop (EV_A_ w); 166 ev_io_stop (EV_A_ w);
154 167
155 x_cb (ev, revents); 168 x_cb (ev, revents);
156} 169}
157 170
… …
165 x_cb (ev, revents); 178 x_cb (ev, revents);
166} 179}
167 180
168void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 181void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
169{ 182{
170 printf ("event set %p\n", ev);//D
171 if (events & EV_SIGNAL) 183 if (events & EV_SIGNAL)
172 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 184 ev_init (&ev->iosig.sig, x_cb_sig);
173 else 185 else
174 ev_watcher_init (&ev->iosig.io, x_cb_io); 186 ev_init (&ev->iosig.io, x_cb_io);
175 187
176 ev_watcher_init (&ev->to, x_cb_to); 188 ev_init (&ev->to, x_cb_to);
177 189
178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 190 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
179 ev->ev_fd = fd; 191 ev->ev_fd = fd;
180 ev->ev_events = events; 192 ev->ev_events = events;
181 ev->ev_pri = 0; 193 ev->ev_pri = 0;
… …
189 return event_base_once (x_cur, fd, events, cb, arg, tv); 201 return event_base_once (x_cur, fd, events, cb, arg, tv);
190} 202}
191 203
192int event_add (struct event *ev, struct timeval *tv) 204int event_add (struct event *ev, struct timeval *tv)
193{ 205{
194 printf ("event add %p %p\n", ev, &ev->to);//D
195 dLOOPev; 206 dLOOPev;
196 207
197 /* disable all watchers */ 208 /* disable all watchers */
198 event_del (ev); 209 event_del (ev);
199 210
… …
217 return 0; 228 return 0;
218} 229}
219 230
220int event_del (struct event *ev) 231int event_del (struct event *ev)
221{ 232{
222 printf ("event del %p\n", ev);//D
223 dLOOPev; 233 dLOOPev;
224 234
225 if (ev->ev_events & EV_SIGNAL) 235 if (ev->ev_events & EV_SIGNAL)
226 { 236 {
227 /* sig */ 237 /* sig */
228 if (ev_is_active (&ev->iosig.sig)) 238 if (ev_is_active (&ev->iosig.sig))
229 ev_signal_stop (EV_A_ &ev->iosig.sig); 239 ev_signal_stop (EV_A_ &ev->iosig.sig);
230 } 240 }
231 else 241 else if (ev->ev_events & (EV_READ | EV_WRITE))
232 { 242 {
233 /* io */ 243 /* io */
234 if (ev_is_active (&ev->iosig.io)) 244 if (ev_is_active (&ev->iosig.io))
235 ev_io_stop (EV_A_ &ev->iosig.io); 245 ev_io_stop (EV_A_ &ev->iosig.io);
236 } 246 }
237 247
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
239 if (ev_is_active (&ev->to)) 248 if (ev_is_active (&ev->to))
240 ev_timer_stop (EV_A_ &ev->to); 249 ev_timer_stop (EV_A_ &ev->to);
241 250
242 return 0; 251 return 0;
243} 252}
244 253
254void event_active (struct event *ev, int res, short ncalls)
255{
256 dLOOPev;
257
258 if (res & EV_TIMEOUT)
259 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
260
261 if (res & EV_SIGNAL)
262 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
263
264 if (res & (EV_READ | EV_WRITE))
265 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
266}
267
245int event_pending (struct event *ev, short events, struct timeval *tv) 268int event_pending (struct event *ev, short events, struct timeval *tv)
246{ 269{
270 short revents = 0;
247 dLOOPev; 271 dLOOPev;
248 272
249 short revents = 0;
250 273
251 if (ev->ev_events & EV_SIGNAL) 274 if (ev->ev_events & EV_SIGNAL)
252 { 275 {
253 /* sig */ 276 /* sig */
254 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig)) 277 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
255 revents |= EV_SIGNAL; 278 revents |= EV_SIGNAL;
256 } 279 }
257 else 280 else if (ev->ev_events & (EV_READ | EV_WRITE))
258 { 281 {
259 /* io */ 282 /* io */
260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io)) 283 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
261 revents |= ev->ev_events & (EV_READ | EV_WRITE); 284 revents |= ev->ev_events & (EV_READ | EV_WRITE);
262 } 285 }
… …
313 ev_unloop (EV_A_ EVUNLOOP_ONCE); 336 ev_unloop (EV_A_ EVUNLOOP_ONCE);
314} 337}
315 338
316int event_base_loopexit (struct event_base *base, struct timeval *tv) 339int event_base_loopexit (struct event_base *base, struct timeval *tv)
317{ 340{
318 dLOOPbase;
319 ev_tstamp after = tv_get (tv); 341 ev_tstamp after = tv_get (tv);
342 dLOOPbase;
320 343
321 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 344 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
322 345
323 return -1; 346 return -1;
324} 347}
… …
331}; 354};
332 355
333static void 356static void
334x_once_cb (int revents, void *arg) 357x_once_cb (int revents, void *arg)
335{ 358{
336 struct x_once *once = arg; 359 struct x_once *once = (struct x_once *)arg;
337 360
338 once->cb (once->fd, revents, once->arg); 361 once->cb (once->fd, (short)revents, once->arg);
339 free (once); 362 free (once);
340} 363}
341 364
342int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 365int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
343{ 366{
344 dLOOPbase;
345 struct x_once *once = malloc (sizeof (struct x_once)); 367 struct x_once *once = (struct x_once *)malloc (sizeof (struct x_once));
368 dLOOPbase;
346 369
347 if (!once) 370 if (!once)
348 return -1; 371 return -1;
349 372
350 once->fd = fd; 373 once->fd = fd;

Diff Legend

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