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

Comparing libev/event.c (file contents):
Revision 1.3 by root, Fri Nov 2 11:02:23 2007 UTC vs.
Revision 1.18 by root, Tue Nov 6 13:17:55 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#include "ev.h"
36#include "event.h" 41#include "event.h"
37 42
43#if EV_MULTIPLICITY
44# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
46#else
47# define dLOOPev
48# define dLOOPbase
49#endif
50
51/* never accessed, will always be cast from/to ev_loop */
38struct event_base 52struct event_base
39{ 53{
40 int dummy; 54 int dummy;
41}; 55};
42 56
43static int x_actives;
44
45static struct event_base x_base, *x_cur; 57static struct event_base *x_cur;
46 58
47static void 59static void
48tv_set (struct timeval *tv, ev_tstamp at) 60tv_set (struct timeval *tv, ev_tstamp at)
49{ 61{
50 tv->tv_sec = (long)at; 62 tv->tv_sec = (long)at;
… …
72 return "libev"; 84 return "libev";
73} 85}
74 86
75void *event_init (void) 87void *event_init (void)
76{ 88{
77 if (ev_init (0)) 89#if EV_MULTIPLICITY
78 return x_cur = &x_base; 90 if (x_cur)
91 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
92 else
93 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
94#else
95 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
79 96
97 x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);
98#endif
99
80 return 0; 100 return x_cur;
81} 101}
82 102
83void event_base_free (struct event_base *base) 103void event_base_free (struct event_base *base)
84{ 104{
105 dLOOPbase;
106
107#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop)
109 ev_loop_destroy (loop);
110#endif
111}
112
113int event_dispatch (void)
114{
115 return event_base_dispatch (x_cur);
116}
117
118#ifdef EV_STANDALONE
119void event_set_log_callback (event_log_cb cb)
120{
85 /* nop */ 121 /* nop */
86} 122}
87 123#endif
88int event_dispatch (void)
89{
90 return event_base_dispatch (x_cur);
91}
92
93void event_set_log_callback (event_log_cb cb)
94{
95 /* nop */
96}
97 124
98int event_loop (int flags) 125int event_loop (int flags)
99{ 126{
100 return event_base_loop (x_cur, flags); 127 return event_base_loop (x_cur, flags);
101} 128}
102 129
103int event_loopexit (struct timeval *tv) 130int event_loopexit (struct timeval *tv)
104{ 131{
105 event_base_loopexit (x_cur, tv); 132 return event_base_loopexit (x_cur, tv);
106} 133}
107 134
108static void 135static void
109x_cb (struct event *ev, int revents) 136x_cb (struct event *ev, int revents)
110{ 137{
111 if (ev_is_active (&ev->sig))
112 {
113 ev_signal_stop (&ev->sig);
114 --x_actives;
115 }
116
117 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->io))
118 {
119 ev_io_stop (&ev->io);
120 --x_actives;
121 }
122
123 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 138 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
124
125 if (revents & EV_TIMEOUT)
126 --x_actives;
127 139
128 ev->ev_res = revents; 140 ev->ev_res = revents;
129 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 141 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
130} 142}
131 143
132static void 144static void
133x_cb_io (struct ev_io *w, int revents)
134{
135 x_cb ((struct event *)(((char *)w) - offsetof (struct event, io)), revents);
136}
137
138static void
139x_cb_to (struct ev_timer *w, int revents)
140{
141 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
142}
143
144static void
145x_cb_sig (struct ev_signal *w, int revents) 145x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 146{
147 x_cb ((struct event *)(((char *)w) - offsetof (struct event, sig)), revents); 147 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
148}
149
150static void
151x_cb_io (EV_P_ struct ev_io *w, int revents)
152{
153 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
154
155 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
156 ev_io_stop (EV_A_ w);
157
158 x_cb (ev, revents);
159}
160
161static void
162x_cb_to (EV_P_ struct ev_timer *w, int revents)
163{
164 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
165
166 event_del (ev);
167
168 x_cb (ev, revents);
148} 169}
149 170
150void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 171void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
151{ 172{
173 if (events & EV_SIGNAL)
174 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
175 else
152 ev_watcher_init (&ev->io, x_cb_io); 176 ev_watcher_init (&ev->iosig.io, x_cb_io);
177
153 ev_watcher_init (&ev->to, x_cb_to); 178 ev_watcher_init (&ev->to, x_cb_to);
154 ev_watcher_init (&ev->sig, x_cb_sig);
155 179
156 ev->ev_base = x_cur; 180 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
157 ev->ev_fd = fd; 181 ev->ev_fd = fd;
158 ev->ev_events = events; 182 ev->ev_events = events;
159 ev->ev_pri = 0; 183 ev->ev_pri = 0;
160 ev->ev_callback = cb; 184 ev->ev_callback = cb;
161 ev->ev_arg = arg; 185 ev->ev_arg = arg;
162 ev->ev_res = 0; 186 ev->ev_res = 0;
163} 187}
164 188
165int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 189int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
166{ 190{
167 event_base_once (x_cur, fd, events, cb, arg, tv); 191 return event_base_once (x_cur, fd, events, cb, arg, tv);
168} 192}
169 193
170int event_add (struct event *ev, struct timeval *tv) 194int event_add (struct event *ev, struct timeval *tv)
171{ 195{
196 dLOOPev;
197
198 /* disable all watchers */
199 event_del (ev);
200
201 if (ev->ev_events & EV_SIGNAL)
202 {
203 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
204 ev_signal_start (EV_A_ &ev->iosig.sig);
205 }
206 else if (ev->ev_events & (EV_READ | EV_WRITE))
207 {
208 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
209 ev_io_start (EV_A_ &ev->iosig.io);
210 }
211
172 if (tv) 212 if (tv)
173 { 213 {
174 if (ev_is_active (&ev->to))
175 {
176 ev_timer_stop (&ev->to);
177 --x_actives;
178 }
179
180 ev_timer_set (&ev->to, tv_get (tv), 0.); 214 ev_timer_set (&ev->to, tv_get (tv), 0.);
181 ev_timer_start (&ev->to); 215 ev_timer_start (EV_A_ &ev->to);
182 ++x_actives;
183 }
184
185 if (ev->ev_events & (EV_READ | EV_WRITE))
186 { 216 }
187 if (ev_is_active (&ev->io))
188 {
189 ev_io_stop (&ev->io);
190 --x_actives;
191 }
192 217
193 ev_io_set (&ev->io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 218 return 0;
194 ev_io_start (&ev->io); 219}
195 ++x_actives; 220
196 } 221int event_del (struct event *ev)
222{
223 dLOOPev;
197 224
198 if (ev->ev_events & EV_SIGNAL) 225 if (ev->ev_events & EV_SIGNAL)
199 { 226 {
227 /* sig */
228 if (ev_is_active (&ev->iosig.sig))
229 ev_signal_stop (EV_A_ &ev->iosig.sig);
230 }
231 else if (ev->ev_events & (EV_READ | EV_WRITE))
232 {
233 /* io */
200 if (ev_is_active (&ev->sig)) 234 if (ev_is_active (&ev->iosig.io))
201 {
202 ev_signal_stop (&ev->sig);
203 --x_actives;
204 }
205
206 ev_signal_set (&ev->sig, ev->ev_fd);
207 ev_signal_start (&ev->sig);
208 ++x_actives;
209 }
210
211 return 0;
212}
213
214int event_del (struct event *ev)
215{
216 if (ev_is_active (&ev->io))
217 {
218 ev_io_stop (&ev->io); 235 ev_io_stop (EV_A_ &ev->iosig.io);
219 --x_actives;
220 } 236 }
221 237
222 if (ev_is_active (&ev->to)) 238 if (ev_is_active (&ev->to))
223 {
224 ev_timer_stop (&ev->to); 239 ev_timer_stop (EV_A_ &ev->to);
225 --x_actives;
226 }
227
228 if (ev_is_active (&ev->sig))
229 {
230 ev_signal_stop (&ev->sig);
231 --x_actives;
232 }
233 240
234 return 0; 241 return 0;
235} 242}
236 243
237int event_pending (struct event *ev, short events, struct timeval *tv) 244int event_pending (struct event *ev, short events, struct timeval *tv)
238{ 245{
239 short revents; 246 short revents = 0;
247 dLOOPev;
240 248
241 if (ev->io.pending) 249
250 if (ev->ev_events & EV_SIGNAL)
251 {
252 /* sig */
253 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
254 revents |= EV_SIGNAL;
255 }
256 else if (ev->ev_events & (EV_READ | EV_WRITE))
257 {
258 /* io */
259 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
242 revents |= ev->ev_events & (EV_READ | EV_WRITE); 260 revents |= ev->ev_events & (EV_READ | EV_WRITE);
261 }
243 262
244 if (ev->to.pending) 263 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
245 { 264 {
246 revents |= EV_TIMEOUT; 265 revents |= EV_TIMEOUT;
247 266
248 if (tv) 267 if (tv)
249 tv_set (tv, ev_now); /* not sure if this is right :) */ 268 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
250 } 269 }
251
252 if (ev->sig.pending)
253 revents |= EV_SIGNAL;
254 270
255 return events & revents; 271 return events & revents;
256} 272}
257 273
258int event_priority_init (int npri) 274int event_priority_init (int npri)
… …
274 return 0; 290 return 0;
275} 291}
276 292
277int event_base_loop (struct event_base *base, int flags) 293int event_base_loop (struct event_base *base, int flags)
278{ 294{
279 do 295 dLOOPbase;
280 { 296
281 ev_loop (flags | EVLOOP_ONESHOT); 297 ev_loop (EV_A_ flags);
282 }
283 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
284 298
285 return 0; 299 return 0;
286} 300}
287 301
288int event_base_dispatch (struct event_base *base) 302int event_base_dispatch (struct event_base *base)
289{ 303{
290 return event_base_loop (base, 0); 304 return event_base_loop (base, 0);
291} 305}
292 306
293static void 307static void
294x_loopexit_cb (int revents, void *arg) 308x_loopexit_cb (int revents, void *base)
295{ 309{
296 ev_loop_done = 2; 310 dLOOPbase;
311
312 ev_unloop (EV_A_ EVUNLOOP_ONCE);
297} 313}
298 314
299int event_base_loopexit (struct event_base *base, struct timeval *tv) 315int event_base_loopexit (struct event_base *base, struct timeval *tv)
300{ 316{
301 ev_tstamp after = tv_get (tv); 317 ev_tstamp after = tv_get (tv);
318 dLOOPbase;
302 319
303 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 320 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
321
322 return -1;
304} 323}
305 324
306struct x_once 325struct x_once
307{ 326{
308 int fd; 327 int fd;
… …
320} 339}
321 340
322int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 341int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
323{ 342{
324 struct x_once *once = malloc (sizeof (struct x_once)); 343 struct x_once *once = malloc (sizeof (struct x_once));
344 dLOOPbase;
325 345
326 if (!once) 346 if (!once)
327 return -1; 347 return -1;
328 348
329 once->fd = fd; 349 once->fd = fd;
330 once->cb = cb; 350 once->cb = cb;
331 once->arg = arg; 351 once->arg = arg;
332 352
333 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 353 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
334 354
335 return 0; 355 return 0;
336} 356}
337 357
338int event_base_priority_init (struct event_base *base, int npri) 358int event_base_priority_init (struct event_base *base, int npri)
339{ 359{
340 return 0; 360 /*dLOOPbase;*/
341}
342 361
362 return 0;
363}
364

Diff Legend

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