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

Diff Legend

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