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

Comparing libev/event.c (file contents):
Revision 1.9 by root, Sun Nov 4 00:24:17 2007 UTC vs.
Revision 1.15 by root, Sun Nov 4 20:38:07 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
38#if EV_MULTIPLICITY 40#if EV_MULTIPLICITY
39# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 41# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
40# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 42# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
… …
47struct event_base 49struct event_base
48{ 50{
49 int dummy; 51 int dummy;
50}; 52};
51 53
52static struct event_base x_base, *x_cur; 54static struct event_base *x_cur;
53 55
54static void 56static void
55tv_set (struct timeval *tv, ev_tstamp at) 57tv_set (struct timeval *tv, ev_tstamp at)
56{ 58{
57 tv->tv_sec = (long)at; 59 tv->tv_sec = (long)at;
… …
80} 82}
81 83
82void *event_init (void) 84void *event_init (void)
83{ 85{
84#if EV_MULTIPLICITY 86#if EV_MULTIPLICITY
87 if (x_cur)
85 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO); 88 x_cur = (struct event_base *)ev_loop_new (EVMETHOD_AUTO);
89 else
90 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
86#else 91#else
87 x_cur = &x_base; 92 assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
93
94 x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
88#endif 95#endif
89 96
90 return x_cur; 97 return x_cur;
91} 98}
92 99
93void event_base_free (struct event_base *base) 100void event_base_free (struct event_base *base)
94{ 101{
95 dLOOPbase; 102 dLOOPbase;
96 103
97#if EV_MULTIPLICITY 104#if EV_MULTIPLICITY
105 if (ev_default_loop (EVMETHOD_AUTO) != loop)
98 ev_loop_delete (loop); 106 ev_loop_destroy (loop);
99#endif 107#endif
100} 108}
101 109
102int event_dispatch (void) 110int event_dispatch (void)
103{ 111{
… …
148} 156}
149 157
150static void 158static void
151x_cb_to (EV_P_ struct ev_timer *w, int revents) 159x_cb_to (EV_P_ struct ev_timer *w, int revents)
152{ 160{
153 x_cb ((struct event *)(((char *)w) - offsetof (struct event, to)), revents); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, to));
162
163 event_del (ev);
164
165 x_cb (ev, revents);
154} 166}
155 167
156void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 168void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
157{ 169{
158 if (!ev->initialised) 170 printf ("event set %p\n", ev);//D
159 {
160 ev->initialised = 1;
161
162 if (events & EV_SIGNAL) 171 if (events & EV_SIGNAL)
163 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 172 ev_watcher_init (&ev->iosig.sig, x_cb_sig);
164 else 173 else
165 ev_watcher_init (&ev->iosig.io, x_cb_io); 174 ev_watcher_init (&ev->iosig.io, x_cb_io);
166 175
167 ev_watcher_init (&ev->to, x_cb_to); 176 ev_watcher_init (&ev->to, x_cb_to);
168 }
169 177
170 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 178 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
171 ev->ev_fd = fd; 179 ev->ev_fd = fd;
172 ev->ev_events = events; 180 ev->ev_events = events;
173 ev->ev_pri = 0; 181 ev->ev_pri = 0;
… …
181 return event_base_once (x_cur, fd, events, cb, arg, tv); 189 return event_base_once (x_cur, fd, events, cb, arg, tv);
182} 190}
183 191
184int event_add (struct event *ev, struct timeval *tv) 192int event_add (struct event *ev, struct timeval *tv)
185{ 193{
194 printf ("event add %p %p\n", ev, &ev->to);//D
186 dLOOPev; 195 dLOOPev;
187 196
188 /* disable all watchers */ 197 /* disable all watchers */
189 event_del (ev); 198 event_del (ev);
190 199
… …
208 return 0; 217 return 0;
209} 218}
210 219
211int event_del (struct event *ev) 220int event_del (struct event *ev)
212{ 221{
222 printf ("event del %p\n", ev);//D
213 dLOOPev; 223 dLOOPev;
214 224
215 if (ev->ev_events & EV_SIGNAL) 225 if (ev->ev_events & EV_SIGNAL)
216 { 226 {
217 /* sig */ 227 /* sig */
… …
223 /* io */ 233 /* io */
224 if (ev_is_active (&ev->iosig.io)) 234 if (ev_is_active (&ev->iosig.io))
225 ev_io_stop (EV_A_ &ev->iosig.io); 235 ev_io_stop (EV_A_ &ev->iosig.io);
226 } 236 }
227 237
238 printf ("to %p %d\n", &ev->to, ev->to.active);//D
228 if (ev_is_active (&ev->to)) 239 if (ev_is_active (&ev->to))
229 ev_timer_stop (EV_A_ &ev->to); 240 ev_timer_stop (EV_A_ &ev->to);
230 241
231 return 0; 242 return 0;
232} 243}
… …
238 short revents = 0; 249 short revents = 0;
239 250
240 if (ev->ev_events & EV_SIGNAL) 251 if (ev->ev_events & EV_SIGNAL)
241 { 252 {
242 /* sig */ 253 /* sig */
243 if (ev->iosig.sig.pending) 254 if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
244 revents |= EV_SIGNAL; 255 revents |= EV_SIGNAL;
245 } 256 }
246 else 257 else
247 { 258 {
248 /* io */ 259 /* io */
249 if (ev->iosig.io.pending) 260 if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))
250 revents |= ev->ev_events & (EV_READ | EV_WRITE); 261 revents |= ev->ev_events & (EV_READ | EV_WRITE);
251 } 262 }
252 263
253 if (ev->to.pending) 264 if (ev->ev_events & EV_TIMEOUT || ev_is_active (&ev->to) || ev_is_pending (&ev->to))
254 { 265 {
255 revents |= EV_TIMEOUT; 266 revents |= EV_TIMEOUT;
256 267
257 if (tv) 268 if (tv)
258 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */ 269 tv_set (tv, ev_now (EV_A)); /* not sure if this is right :) */
… …
345 return 0; 356 return 0;
346} 357}
347 358
348int event_base_priority_init (struct event_base *base, int npri) 359int event_base_priority_init (struct event_base *base, int npri)
349{ 360{
350 dLOOPbase; 361 /*dLOOPbase;*/
351 362
352 return 0; 363 return 0;
353} 364}
354 365

Diff Legend

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