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

Comparing libev/event.c (file contents):
Revision 1.5 by root, Sat Nov 3 19:41:56 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{
85 /* nop */ 95 dLOOPbase;
96
97#if EV_MULTIPLICITY
98 ev_loop_delete (loop);
99#endif
86} 100}
87 101
88int event_dispatch (void) 102int event_dispatch (void)
89{ 103{
90 return event_base_dispatch (x_cur); 104 return event_base_dispatch (x_cur);
… …
108} 122}
109 123
110static void 124static void
111x_cb (struct event *ev, int revents) 125x_cb (struct event *ev, int revents)
112{ 126{
113 if (ev->ev_events & EV_SIGNAL)
114 {
115 /* sig */
116 if (ev_is_active (&ev->iosig.sig))
117 {
118 ev_signal_stop (&ev->iosig.sig);
119 --x_actives;
120 }
121 }
122 else
123 {
124 /* io */
125 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (&ev->iosig.io))
126 {
127 ev_io_stop (&ev->iosig.io);
128 --x_actives;
129 }
130 }
131
132 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 127 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
133
134 if (revents & EV_TIMEOUT)
135 --x_actives;
136 128
137 ev->ev_res = revents; 129 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 130 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
139} 131}
140 132
141static void 133static void
142x_cb_io (struct ev_io *w, int revents) 134x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 135{
144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents); 136 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
145} 137}
146 138
147static 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
148x_cb_to (struct ev_timer *w, int revents) 151x_cb_to (EV_P_ struct ev_timer *w, int revents)
149{ 152{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 153 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151} 154}
152 155
153static void
154x_cb_sig (struct ev_signal *w, int revents)
155{
156 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
157}
158
159void 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)
160{ 157{
158 if (!ev->initialised)
159 {
160 ev->initialised = 1;
161
161 if (events & EV_SIGNAL) 162 if (events & EV_SIGNAL)
162 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 163 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
163 else 164 else
164 ev_watcher_init (&ev->iosig.io, x_cb_io); 165 ev_watcher_init (&ev->iosig.io, x_cb_io);
165 166
166 ev_watcher_init (&ev->to, x_cb_to); 167 ev_watcher_init (&ev->to, x_cb_to);
168 }
167 169
168 ev->ev_base = x_cur; 170 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
169 ev->ev_fd = fd; 171 ev->ev_fd = fd;
170 ev->ev_events = events; 172 ev->ev_events = events;
171 ev->ev_pri = 0; 173 ev->ev_pri = 0;
172 ev->ev_callback = cb; 174 ev->ev_callback = cb;
173 ev->ev_arg = arg; 175 ev->ev_arg = arg;
… …
179 return event_base_once (x_cur, fd, events, cb, arg, tv); 181 return event_base_once (x_cur, fd, events, cb, arg, tv);
180} 182}
181 183
182int event_add (struct event *ev, struct timeval *tv) 184int event_add (struct event *ev, struct timeval *tv)
183{ 185{
186 dLOOPev;
187
184 /* disable all watchers */ 188 /* disable all watchers */
185 event_del (ev); 189 event_del (ev);
186 190
187 if (ev->ev_events & EV_SIGNAL) 191 if (ev->ev_events & EV_SIGNAL)
188 { 192 {
189 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 193 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
190 ev_signal_start (&ev->iosig.sig); 194 ev_signal_start (EV_A_ &ev->iosig.sig);
191 ++x_actives;
192 } 195 }
193 else if (ev->ev_events & (EV_READ | EV_WRITE)) 196 else if (ev->ev_events & (EV_READ | EV_WRITE))
194 { 197 {
195 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 198 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
196 ev_io_start (&ev->iosig.io); 199 ev_io_start (EV_A_ &ev->iosig.io);
197 ++x_actives;
198 } 200 }
199 201
200 if (tv) 202 if (tv)
201 { 203 {
202 ev_timer_set (&ev->to, tv_get (tv), 0.); 204 ev_timer_set (&ev->to, tv_get (tv), 0.);
203 ev_timer_start (&ev->to); 205 ev_timer_start (EV_A_ &ev->to);
204 ++x_actives;
205 } 206 }
206 207
207 return 0; 208 return 0;
208} 209}
209 210
210int event_del (struct event *ev) 211int event_del (struct event *ev)
211{ 212{
213 dLOOPev;
214
212 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
213 { 216 {
214 /* sig */ 217 /* sig */
215 if (ev_is_active (&ev->iosig.sig)) 218 if (ev_is_active (&ev->iosig.sig))
216 {
217 ev_signal_stop (&ev->iosig.sig); 219 ev_signal_stop (EV_A_ &ev->iosig.sig);
218 --x_actives;
219 }
220 } 220 }
221 else 221 else
222 { 222 {
223 /* io */ 223 /* io */
224 if (ev_is_active (&ev->iosig.io)) 224 if (ev_is_active (&ev->iosig.io))
225 {
226 ev_io_stop (&ev->iosig.io); 225 ev_io_stop (EV_A_ &ev->iosig.io);
227 --x_actives;
228 }
229 } 226 }
230 227
231 if (ev_is_active (&ev->to)) 228 if (ev_is_active (&ev->to))
232 {
233 ev_timer_stop (&ev->to); 229 ev_timer_stop (EV_A_ &ev->to);
234 --x_actives;
235 }
236 230
237 return 0; 231 return 0;
238} 232}
239 233
240int event_pending (struct event *ev, short events, struct timeval *tv) 234int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 235{
236 dLOOPev;
237
242 short revents = 0; 238 short revents = 0;
243 239
244 if (ev->ev_events & EV_SIGNAL) 240 if (ev->ev_events & EV_SIGNAL)
245 { 241 {
246 /* sig */ 242 /* sig */
… …
257 if (ev->to.pending) 253 if (ev->to.pending)
258 { 254 {
259 revents |= EV_TIMEOUT; 255 revents |= EV_TIMEOUT;
260 256
261 if (tv) 257 if (tv)
262 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 :) */
263 } 259 }
264 260
265 return events & revents; 261 return events & revents;
266} 262}
267 263
… …
284 return 0; 280 return 0;
285} 281}
286 282
287int event_base_loop (struct event_base *base, int flags) 283int event_base_loop (struct event_base *base, int flags)
288{ 284{
289 do 285 dLOOPbase;
290 { 286
291 ev_loop (flags | EVLOOP_ONESHOT); 287 ev_loop (EV_A_ flags);
292 }
293 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
294 288
295 return 0; 289 return 0;
296} 290}
297 291
298int event_base_dispatch (struct event_base *base) 292int event_base_dispatch (struct event_base *base)
299{ 293{
300 return event_base_loop (base, 0); 294 return event_base_loop (base, 0);
301} 295}
302 296
303static void 297static void
304x_loopexit_cb (int revents, void *arg) 298x_loopexit_cb (int revents, void *base)
305{ 299{
306 ev_loop_done = 2; 300 dLOOPbase;
301
302 ev_unloop (EV_A_ EVUNLOOP_ONCE);
307} 303}
308 304
309int event_base_loopexit (struct event_base *base, struct timeval *tv) 305int event_base_loopexit (struct event_base *base, struct timeval *tv)
310{ 306{
307 dLOOPbase;
311 ev_tstamp after = tv_get (tv); 308 ev_tstamp after = tv_get (tv);
312 309
313 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);
314 311
315 return -1; 312 return -1;
316} 313}
317 314
318struct x_once 315struct x_once
… …
331 free (once); 328 free (once);
332} 329}
333 330
334int 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)
335{ 332{
333 dLOOPbase;
336 struct x_once *once = malloc (sizeof (struct x_once)); 334 struct x_once *once = malloc (sizeof (struct x_once));
337 335
338 if (!once) 336 if (!once)
339 return -1; 337 return -1;
340 338
341 once->fd = fd; 339 once->fd = fd;
342 once->cb = cb; 340 once->cb = cb;
343 once->arg = arg; 341 once->arg = arg;
344 342
345 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);
346 344
347 return 0; 345 return 0;
348} 346}
349 347
350int event_base_priority_init (struct event_base *base, int npri) 348int event_base_priority_init (struct event_base *base, int npri)
351{ 349{
352 return 0; 350 dLOOPbase;
353}
354 351
352 return 0;
353}
354

Diff Legend

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