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

Comparing libev/event.c (file contents):
Revision 1.6 by root, Sat Nov 3 20:24:42 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 (!x_cur && 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{
85 /* nop */ 105 dLOOPbase;
106
107#if EV_MULTIPLICITY
108 if (ev_default_loop (EVMETHOD_AUTO) != loop)
109 ev_loop_destroy (loop);
110#endif
86} 111}
87 112
88int event_dispatch (void) 113int event_dispatch (void)
89{ 114{
90 return event_base_dispatch (x_cur); 115 return event_base_dispatch (x_cur);
… …
108} 133}
109 134
110static void 135static void
111x_cb (struct event *ev, int revents) 136x_cb (struct event *ev, int revents)
112{ 137{
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; 138 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
133
134 if (revents & EV_TIMEOUT)
135 --x_actives;
136 139
137 ev->ev_res = revents; 140 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 141 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
139} 142}
140 143
141static void 144static void
142x_cb_io (struct ev_io *w, int revents)
143{
144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents);
145}
146
147static void
148x_cb_to (struct ev_timer *w, int revents)
149{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151}
152
153static void
154x_cb_sig (struct ev_signal *w, int revents) 145x_cb_sig (EV_P_ struct ev_signal *w, int revents)
155{ 146{
156 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.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);
157} 169}
158 170
159void 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)
160{ 172{
161 if (events & EV_SIGNAL) 173 if (events & EV_SIGNAL)
… …
163 else 175 else
164 ev_watcher_init (&ev->iosig.io, x_cb_io); 176 ev_watcher_init (&ev->iosig.io, x_cb_io);
165 177
166 ev_watcher_init (&ev->to, x_cb_to); 178 ev_watcher_init (&ev->to, x_cb_to);
167 179
168 ev->ev_base = x_cur; 180 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
169 ev->ev_fd = fd; 181 ev->ev_fd = fd;
170 ev->ev_events = events; 182 ev->ev_events = events;
171 ev->ev_pri = 0; 183 ev->ev_pri = 0;
172 ev->ev_callback = cb; 184 ev->ev_callback = cb;
173 ev->ev_arg = arg; 185 ev->ev_arg = arg;
… …
179 return event_base_once (x_cur, fd, events, cb, arg, tv); 191 return event_base_once (x_cur, fd, events, cb, arg, tv);
180} 192}
181 193
182int event_add (struct event *ev, struct timeval *tv) 194int event_add (struct event *ev, struct timeval *tv)
183{ 195{
196 dLOOPev;
197
184 /* disable all watchers */ 198 /* disable all watchers */
185 event_del (ev); 199 event_del (ev);
186 200
187 if (ev->ev_events & EV_SIGNAL) 201 if (ev->ev_events & EV_SIGNAL)
188 { 202 {
189 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 203 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
190 ev_signal_start (&ev->iosig.sig); 204 ev_signal_start (EV_A_ &ev->iosig.sig);
191 ++x_actives;
192 } 205 }
193 else if (ev->ev_events & (EV_READ | EV_WRITE)) 206 else if (ev->ev_events & (EV_READ | EV_WRITE))
194 { 207 {
195 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 208 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
196 ev_io_start (&ev->iosig.io); 209 ev_io_start (EV_A_ &ev->iosig.io);
197 ++x_actives;
198 } 210 }
199 211
200 if (tv) 212 if (tv)
201 { 213 {
202 ev_timer_set (&ev->to, tv_get (tv), 0.); 214 ev_timer_set (&ev->to, tv_get (tv), 0.);
203 ev_timer_start (&ev->to); 215 ev_timer_start (EV_A_ &ev->to);
204 ++x_actives;
205 } 216 }
206 217
207 return 0; 218 return 0;
208} 219}
209 220
210int event_del (struct event *ev) 221int event_del (struct event *ev)
211{ 222{
223 dLOOPev;
224
212 if (ev->ev_events & EV_SIGNAL) 225 if (ev->ev_events & EV_SIGNAL)
213 { 226 {
214 /* sig */ 227 /* sig */
215 if (ev_is_active (&ev->iosig.sig)) 228 if (ev_is_active (&ev->iosig.sig))
216 {
217 ev_signal_stop (&ev->iosig.sig); 229 ev_signal_stop (EV_A_ &ev->iosig.sig);
218 --x_actives;
219 }
220 } 230 }
221 else 231 else if (ev->ev_events & (EV_READ | EV_WRITE))
222 { 232 {
223 /* io */ 233 /* io */
224 if (ev_is_active (&ev->iosig.io)) 234 if (ev_is_active (&ev->iosig.io))
225 {
226 ev_io_stop (&ev->iosig.io); 235 ev_io_stop (EV_A_ &ev->iosig.io);
227 --x_actives;
228 }
229 } 236 }
230 237
231 if (ev_is_active (&ev->to)) 238 if (ev_is_active (&ev->to))
232 {
233 ev_timer_stop (&ev->to); 239 ev_timer_stop (EV_A_ &ev->to);
234 --x_actives;
235 }
236 240
237 return 0; 241 return 0;
238} 242}
239 243
240int event_pending (struct event *ev, short events, struct timeval *tv) 244int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 245{
242 short revents = 0; 246 short revents = 0;
247 dLOOPev;
248
243 249
244 if (ev->ev_events & EV_SIGNAL) 250 if (ev->ev_events & EV_SIGNAL)
245 { 251 {
246 /* sig */ 252 /* sig */
247 if (ev->iosig.sig.pending) 253 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
248 revents |= EV_SIGNAL; 254 revents |= EV_SIGNAL;
249 } 255 }
250 else 256 else if (ev->ev_events & (EV_READ | EV_WRITE))
251 { 257 {
252 /* io */ 258 /* io */
253 if (ev->iosig.io.pending) 259 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
254 revents |= ev->ev_events & (EV_READ | EV_WRITE); 260 revents |= ev->ev_events & (EV_READ | EV_WRITE);
255 } 261 }
256 262
257 if (ev->to.pending) 263 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
258 { 264 {
259 revents |= EV_TIMEOUT; 265 revents |= EV_TIMEOUT;
260 266
261 if (tv) 267 if (tv)
262 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 :) */
263 } 269 }
264 270
265 return events & revents; 271 return events & revents;
266} 272}
267 273
… …
284 return 0; 290 return 0;
285} 291}
286 292
287int event_base_loop (struct event_base *base, int flags) 293int event_base_loop (struct event_base *base, int flags)
288{ 294{
289 do 295 dLOOPbase;
290 { 296
291 ev_loop (flags | EVLOOP_ONESHOT); 297 ev_loop (EV_A_ flags);
292 }
293 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
294 298
295 return 0; 299 return 0;
296} 300}
297 301
298int event_base_dispatch (struct event_base *base) 302int event_base_dispatch (struct event_base *base)
299{ 303{
300 return event_base_loop (base, 0); 304 return event_base_loop (base, 0);
301} 305}
302 306
303static void 307static void
304x_loopexit_cb (int revents, void *arg) 308x_loopexit_cb (int revents, void *base)
305{ 309{
306 ev_loop_done = 2; 310 dLOOPbase;
311
312 ev_unloop (EV_A_ EVUNLOOP_ONCE);
307} 313}
308 314
309int event_base_loopexit (struct event_base *base, struct timeval *tv) 315int event_base_loopexit (struct event_base *base, struct timeval *tv)
310{ 316{
311 ev_tstamp after = tv_get (tv); 317 ev_tstamp after = tv_get (tv);
318 dLOOPbase;
312 319
313 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);
314 321
315 return -1; 322 return -1;
316} 323}
317 324
318struct x_once 325struct x_once
… …
332} 339}
333 340
334int 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)
335{ 342{
336 struct x_once *once = malloc (sizeof (struct x_once)); 343 struct x_once *once = malloc (sizeof (struct x_once));
344 dLOOPbase;
337 345
338 if (!once) 346 if (!once)
339 return -1; 347 return -1;
340 348
341 once->fd = fd; 349 once->fd = fd;
342 once->cb = cb; 350 once->cb = cb;
343 once->arg = arg; 351 once->arg = arg;
344 352
345 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);
346 354
347 return 0; 355 return 0;
348} 356}
349 357
350int event_base_priority_init (struct event_base *base, int npri) 358int event_base_priority_init (struct event_base *base, int npri)
351{ 359{
352 return 0; 360 /*dLOOPbase;*/
353}
354 361
362 return 0;
363}
364

Diff Legend

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