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

Comparing libev/event.c (file contents):
Revision 1.23 by root, Thu Nov 8 23:53:41 2007 UTC vs.
Revision 1.32 by root, Thu Nov 29 12:21:06 2007 UTC

… …
35 35
36#ifndef WIN32 36#ifndef WIN32
37# include <sys/time.h> 37# include <sys/time.h>
38#endif 38#endif
39 39
40#include "ev.h" 40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
41#include "event.h" 43# include "event.h"
44#endif
42 45
43#if EV_MULTIPLICITY 46#if EV_MULTIPLICITY
44# 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
45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
46#else 49#else
… …
86 89
87void *event_init (void) 90void *event_init (void)
88{ 91{
89#if EV_MULTIPLICITY 92#if EV_MULTIPLICITY
90 if (x_cur) 93 if (x_cur)
91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 94 x_cur = (struct event_base *)ev_loop_new (EVFLAG_AUTO);
92 else 95 else
93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO); 96 x_cur = (struct event_base *)ev_default_loop (EVFLAG_AUTO);
94#else 97#else
95 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));
96 99
97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO); 100 x_cur = (struct event_base *)(long)ev_default_loop (EVFLAG_AUTO);
98#endif 101#endif
99 102
100 return x_cur; 103 return x_cur;
101} 104}
102 105
103void event_base_free (struct event_base *base) 106void event_base_free (struct event_base *base)
104{ 107{
105 dLOOPbase; 108 dLOOPbase;
106 109
107#if EV_MULTIPLICITY 110#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop) 111 if (ev_default_loop (EVFLAG_AUTO) != loop)
109 ev_loop_destroy (loop); 112 ev_loop_destroy (loop);
110#endif 113#endif
111} 114}
112 115
113int event_dispatch (void) 116int event_dispatch (void)
… …
136x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
137{ 140{
138 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
139 142
140 ev->ev_res = revents; 143 ev->ev_res = revents;
141 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
142} 145}
143 146
144static void 147static void
145x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 149{
… …
155static void 158static void
156x_cb_io (EV_P_ struct ev_io *w, int revents) 159x_cb_io (EV_P_ struct ev_io *w, int revents)
157{ 160{
158 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));
159 162
160 if (revents & EV_ERROR) 163 if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
161 event_del (ev); 164 event_del (ev);
162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
163 ev_io_stop (EV_A_ w);
164 165
165 x_cb (ev, revents); 166 x_cb (ev, revents);
166} 167}
167 168
168static void 169static void
… …
176} 177}
177 178
178void 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)
179{ 180{
180 if (events & EV_SIGNAL) 181 if (events & EV_SIGNAL)
181 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 182 ev_init (&ev->iosig.sig, x_cb_sig);
182 else 183 else
183 ev_watcher_init (&ev->iosig.io, x_cb_io); 184 ev_init (&ev->iosig.io, x_cb_io);
184 185
185 ev_watcher_init (&ev->to, x_cb_to); 186 ev_init (&ev->to, x_cb_to);
186 187
187 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 */
188 ev->ev_fd = fd; 189 ev->ev_fd = fd;
189 ev->ev_events = events; 190 ev->ev_events = events;
190 ev->ev_pri = 0; 191 ev->ev_pri = 0;
191 ev->ev_callback = cb; 192 ev->ev_callback = cb;
192 ev->ev_arg = arg; 193 ev->ev_arg = arg;
193 ev->ev_res = 0; 194 ev->ev_res = 0;
195 ev->ev_flags = EVLIST_INIT;
194} 196}
195 197
196int 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)
197{ 199{
198 return event_base_once (x_cur, fd, events, cb, arg, tv); 200 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
200 202
201int event_add (struct event *ev, struct timeval *tv) 203int event_add (struct event *ev, struct timeval *tv)
202{ 204{
203 dLOOPev; 205 dLOOPev;
204 206
205 /* disable all watchers */
206 event_del (ev);
207
208 if (ev->ev_events & EV_SIGNAL) 207 if (ev->ev_events & EV_SIGNAL)
209 { 208 {
209 if (!ev_is_active (&ev->iosig.sig))
210 {
210 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 211 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
211 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 }
212 } 216 }
213 else if (ev->ev_events & (EV_READ | EV_WRITE)) 217 else if (ev->ev_events & (EV_READ | EV_WRITE))
214 { 218 {
219 if (!ev_is_active (&ev->iosig.io))
220 {
215 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));
216 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 }
217 } 226 }
218 227
219 if (tv) 228 if (tv)
220 { 229 {
221 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 {
222 ev_timer_start (EV_A_ &ev->to); 236 ev_timer_stop (EV_A_ &ev->to);
237 ev->ev_flags &= ~EVLIST_TIMEOUT;
223 } 238 }
239
240 ev->ev_flags |= EVLIST_ACTIVE;
224 241
225 return 0; 242 return 0;
226} 243}
227 244
228int event_del (struct event *ev) 245int event_del (struct event *ev)
229{ 246{
230 dLOOPev; 247 dLOOPev;
231 248
232 if (ev->ev_events & EV_SIGNAL) 249 if (ev->ev_events & EV_SIGNAL)
233 {
234 /* sig */
235 if (ev_is_active (&ev->iosig.sig))
236 ev_signal_stop (EV_A_ &ev->iosig.sig); 250 ev_signal_stop (EV_A_ &ev->iosig.sig);
237 }
238 else if (ev->ev_events & (EV_READ | EV_WRITE)) 251 else if (ev->ev_events & (EV_READ | EV_WRITE))
239 {
240 /* io */
241 if (ev_is_active (&ev->iosig.io))
242 ev_io_stop (EV_A_ &ev->iosig.io); 252 ev_io_stop (EV_A_ &ev->iosig.io);
243 }
244 253
245 if (ev_is_active (&ev->to)) 254 if (ev_is_active (&ev->to))
246 ev_timer_stop (EV_A_ &ev->to); 255 ev_timer_stop (EV_A_ &ev->to);
256
257 ev->ev_flags = EVLIST_INIT;
247 258
248 return 0; 259 return 0;
249} 260}
250 261
251void event_active (struct event *ev, int res, short ncalls) 262void event_active (struct event *ev, int res, short ncalls)
… …
328static void 339static void
329x_loopexit_cb (int revents, void *base) 340x_loopexit_cb (int revents, void *base)
330{ 341{
331 dLOOPbase; 342 dLOOPbase;
332 343
333 ev_unloop (EV_A_ EVUNLOOP_ONCE); 344 ev_unloop (EV_A_ EVUNLOOP_ONE);
334} 345}
335 346
336int event_base_loopexit (struct event_base *base, struct timeval *tv) 347int event_base_loopexit (struct event_base *base, struct timeval *tv)
337{ 348{
338 ev_tstamp after = tv_get (tv); 349 ev_tstamp after = tv_get (tv);
… …
353static void 364static void
354x_once_cb (int revents, void *arg) 365x_once_cb (int revents, void *arg)
355{ 366{
356 struct x_once *once = (struct x_once *)arg; 367 struct x_once *once = (struct x_once *)arg;
357 368
358 once->cb (once->fd, revents, once->arg); 369 once->cb (once->fd, (short)revents, once->arg);
359 free (once); 370 free (once);
360} 371}
361 372
362int 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)
363{ 374{

Diff Legend

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