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

Comparing libev/event.c (file contents):
Revision 1.2 by root, Thu Nov 1 18:13:44 2007 UTC vs.
Revision 1.9 by root, Sun Nov 4 00:24:17 2007 UTC

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

Diff Legend

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