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.7 by root, Sat Nov 3 21:58:51 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#define dLOOPev
39#define dLOOPbase
40
38struct event_base 41struct event_base
39{ 42{
40 int dummy; 43 int dummy;
41}; 44};
42
43static int x_actives;
44 45
45static struct event_base x_base, *x_cur; 46static struct event_base x_base, *x_cur;
46 47
47static void 48static void
48tv_set (struct timeval *tv, ev_tstamp at) 49tv_set (struct timeval *tv, ev_tstamp at)
… …
108} 109}
109 110
110static void 111static void
111x_cb (struct event *ev, int revents) 112x_cb (struct event *ev, int revents)
112{ 113{
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; 114 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
133
134 if (revents & EV_TIMEOUT)
135 --x_actives;
136 115
137 ev->ev_res = revents; 116 ev->ev_res = revents;
138 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 117 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg);
139} 118}
140 119
141static void 120static void
142x_cb_io (struct ev_io *w, int revents) 121x_cb_sig (EV_P_ struct ev_signal *w, int revents)
143{ 122{
144 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.io)), revents); 123 x_cb ((struct event *)(((char *)w) - offsetof (struct event, iosig.sig)), revents);
145} 124}
146 125
147static void 126static void
127x_cb_io (EV_P_ struct ev_io *w, int revents)
128{
129 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
130
131 if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
132 ev_io_stop (w);
133
134 x_cb (ev, revents);
135}
136
137static void
148x_cb_to (struct ev_timer *w, int revents) 138x_cb_to (EV_P_ struct ev_timer *w, int revents)
149{ 139{
150 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 140 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents);
151}
152
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} 141}
158 142
159void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 143void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
160{ 144{
161 if (events & EV_SIGNAL) 145 if (events & EV_SIGNAL)
… …
179 return event_base_once (x_cur, fd, events, cb, arg, tv); 163 return event_base_once (x_cur, fd, events, cb, arg, tv);
180} 164}
181 165
182int event_add (struct event *ev, struct timeval *tv) 166int event_add (struct event *ev, struct timeval *tv)
183{ 167{
168 dLOOPev;
169
184 /* disable all watchers */ 170 /* disable all watchers */
185 event_del (ev); 171 event_del (ev);
186 172
187 if (ev->ev_events & EV_SIGNAL) 173 if (ev->ev_events & EV_SIGNAL)
188 { 174 {
189 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 175 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
190 ev_signal_start (&ev->iosig.sig); 176 ev_signal_start (EV_A_ &ev->iosig.sig);
191 ++x_actives;
192 } 177 }
193 else if (ev->ev_events & (EV_READ | EV_WRITE)) 178 else if (ev->ev_events & (EV_READ | EV_WRITE))
194 { 179 {
195 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 180 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
196 ev_io_start (&ev->iosig.io); 181 ev_io_start (EV_A_ &ev->iosig.io);
197 ++x_actives;
198 } 182 }
199 183
200 if (tv) 184 if (tv)
201 { 185 {
202 ev_timer_set (&ev->to, tv_get (tv), 0.); 186 ev_timer_set (&ev->to, tv_get (tv), 0.);
203 ev_timer_start (&ev->to); 187 ev_timer_start (EV_A_ &ev->to);
204 ++x_actives;
205 } 188 }
206 189
207 return 0; 190 return 0;
208} 191}
209 192
210int event_del (struct event *ev) 193int event_del (struct event *ev)
211{ 194{
195 dLOOPev;
196
212 if (ev->ev_events & EV_SIGNAL) 197 if (ev->ev_events & EV_SIGNAL)
213 { 198 {
214 /* sig */ 199 /* sig */
215 if (ev_is_active (&ev->iosig.sig)) 200 if (ev_is_active (&ev->iosig.sig))
216 {
217 ev_signal_stop (&ev->iosig.sig); 201 ev_signal_stop (EV_A_ &ev->iosig.sig);
218 --x_actives;
219 }
220 } 202 }
221 else 203 else
222 { 204 {
223 /* io */ 205 /* io */
224 if (ev_is_active (&ev->iosig.io)) 206 if (ev_is_active (&ev->iosig.io))
225 {
226 ev_io_stop (&ev->iosig.io); 207 ev_io_stop (EV_A_ &ev->iosig.io);
227 --x_actives;
228 }
229 } 208 }
230 209
231 if (ev_is_active (&ev->to)) 210 if (ev_is_active (&ev->to))
232 {
233 ev_timer_stop (&ev->to); 211 ev_timer_stop (EV_A_ &ev->to);
234 --x_actives;
235 }
236 212
237 return 0; 213 return 0;
238} 214}
239 215
240int event_pending (struct event *ev, short events, struct timeval *tv) 216int event_pending (struct event *ev, short events, struct timeval *tv)
241{ 217{
218 dLOOPev;
219
242 short revents = 0; 220 short revents = 0;
243 221
244 if (ev->ev_events & EV_SIGNAL) 222 if (ev->ev_events & EV_SIGNAL)
245 { 223 {
246 /* sig */ 224 /* sig */
… …
257 if (ev->to.pending) 235 if (ev->to.pending)
258 { 236 {
259 revents |= EV_TIMEOUT; 237 revents |= EV_TIMEOUT;
260 238
261 if (tv) 239 if (tv)
262 tv_set (tv, ev_now); /* not sure if this is right :) */ 240 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
263 } 241 }
264 242
265 return events & revents; 243 return events & revents;
266} 244}
267 245
… …
284 return 0; 262 return 0;
285} 263}
286 264
287int event_base_loop (struct event_base *base, int flags) 265int event_base_loop (struct event_base *base, int flags)
288{ 266{
289 do 267 dLOOPbase;
290 {
291 ev_loop (flags | EVLOOP_ONESHOT); 268 ev_loop (EV_A_ flags | EVLOOP_ONESHOT);
292 }
293 while (!(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)) && x_actives && !ev_loop_done);
294 269
295 return 0; 270 return 0;
296} 271}
297 272
298int event_base_dispatch (struct event_base *base) 273int event_base_dispatch (struct event_base *base)
299{ 274{
300 return event_base_loop (base, 0); 275 return event_base_loop (base, 0);
301} 276}
302 277
303static void 278static void
304x_loopexit_cb (int revents, void *arg) 279x_loopexit_cb (EV_P_ int revents, void *arg)
305{ 280{
306 ev_loop_done = 2; 281 ev_unloop (EV_A_ 2);
307} 282}
308 283
309int event_base_loopexit (struct event_base *base, struct timeval *tv) 284int event_base_loopexit (struct event_base *base, struct timeval *tv)
310{ 285{
286 dLOOPbase;
311 ev_tstamp after = tv_get (tv); 287 ev_tstamp after = tv_get (tv);
312 288
313 ev_once (-1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base); 289 ev_once (EV_A_ -1, 0, after >= 0. ? after : 0., x_loopexit_cb, (void *)base);
314 290
315 return -1; 291 return -1;
316} 292}
317 293
318struct x_once 294struct x_once
… …
331 free (once); 307 free (once);
332} 308}
333 309
334int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 310int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
335{ 311{
312 dLOOPbase;
336 struct x_once *once = malloc (sizeof (struct x_once)); 313 struct x_once *once = malloc (sizeof (struct x_once));
337 314
338 if (!once) 315 if (!once)
339 return -1; 316 return -1;
340 317
341 once->fd = fd; 318 once->fd = fd;
342 once->cb = cb; 319 once->cb = cb;
343 once->arg = arg; 320 once->arg = arg;
344 321
345 ev_once (fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once); 322 ev_once (EV_A_ fd, events & (EV_READ | EV_WRITE), tv_get (tv), x_once_cb, (void *)once);
346 323
347 return 0; 324 return 0;
348} 325}
349 326
350int event_base_priority_init (struct event_base *base, int npri) 327int event_base_priority_init (struct event_base *base, int npri)
351{ 328{
352 return 0; 329 dLOOPbase;
353}
354 330
331 return 0;
332}
333

Diff Legend

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