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

Comparing libev/event.c (file contents):
Revision 1.4 by root, Fri Nov 2 13:08:51 2007 UTC vs.
Revision 1.12 by root, Sun Nov 4 18:15:16 2007 UTC

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

Diff Legend

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