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

Comparing libev/event.c (file contents):
Revision 1.21 by root, Thu Nov 8 21:14:15 2007 UTC vs.
Revision 1.27 by root, Mon Nov 12 01:11:36 2007 UTC

… …
35 35
36#ifndef WIN32 36#ifndef WIN32
37# include <sys/time.h> 37# include <sys/time.h>
38#endif 38#endif
39 39
40#include "ev.h" 40#ifdef EV_EVENT_H
41# include EV_EVENT_H
42#else
41#include "event.h" 43# include "event.h"
44#endif
42 45
43#if EV_MULTIPLICITY 46#if EV_MULTIPLICITY
44# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base 47# define dLOOPev struct ev_loop *loop = (struct ev_loop *)ev->ev_base
45# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base 48# define dLOOPbase struct ev_loop *loop = (struct ev_loop *)base
46#else 49#else
… …
136x_cb (struct event *ev, int revents) 139x_cb (struct event *ev, int revents)
137{ 140{
138 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL; 141 revents &= EV_READ | EV_WRITE | EV_TIMEOUT | EV_SIGNAL;
139 142
140 ev->ev_res = revents; 143 ev->ev_res = revents;
141 ev->ev_callback (ev->ev_fd, revents, ev->ev_arg); 144 ev->ev_callback (ev->ev_fd, (short)revents, ev->ev_arg);
142} 145}
143 146
144static void 147static void
145x_cb_sig (EV_P_ struct ev_signal *w, int revents) 148x_cb_sig (EV_P_ struct ev_signal *w, int revents)
146{ 149{
… …
158 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io)); 161 struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
159 162
160 if (revents & EV_ERROR) 163 if (revents & EV_ERROR)
161 event_del (ev); 164 event_del (ev);
162 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w)) 165 else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
166 {
163 ev_io_stop (EV_A_ w); 167 ev_io_stop (EV_A_ w);
168 ev->ev_flags &= ~EVLIST_INSERTED;
169 }
164 170
165 x_cb (ev, revents); 171 x_cb (ev, revents);
166} 172}
167 173
168static void 174static void
… …
176} 182}
177 183
178void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg) 184void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
179{ 185{
180 if (events & EV_SIGNAL) 186 if (events & EV_SIGNAL)
181 ev_watcher_init (&ev->iosig.sig, x_cb_sig); 187 ev_init (&ev->iosig.sig, x_cb_sig);
182 else 188 else
183 ev_watcher_init (&ev->iosig.io, x_cb_io); 189 ev_init (&ev->iosig.io, x_cb_io);
184 190
185 ev_watcher_init (&ev->to, x_cb_to); 191 ev_init (&ev->to, x_cb_to);
186 192
187 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */ 193 ev->ev_base = x_cur; /* not threadsafe, but its like libevent works */
188 ev->ev_fd = fd; 194 ev->ev_fd = fd;
189 ev->ev_events = events; 195 ev->ev_events = events;
190 ev->ev_pri = 0; 196 ev->ev_pri = 0;
191 ev->ev_callback = cb; 197 ev->ev_callback = cb;
192 ev->ev_arg = arg; 198 ev->ev_arg = arg;
193 ev->ev_res = 0; 199 ev->ev_res = 0;
200 ev->ev_flags = EVLIST_INIT;
194} 201}
195 202
196int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 203int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
197{ 204{
198 return event_base_once (x_cur, fd, events, cb, arg, tv); 205 return event_base_once (x_cur, fd, events, cb, arg, tv);
… …
207 214
208 if (ev->ev_events & EV_SIGNAL) 215 if (ev->ev_events & EV_SIGNAL)
209 { 216 {
210 ev_signal_set (&ev->iosig.sig, ev->ev_fd); 217 ev_signal_set (&ev->iosig.sig, ev->ev_fd);
211 ev_signal_start (EV_A_ &ev->iosig.sig); 218 ev_signal_start (EV_A_ &ev->iosig.sig);
219
220 ev->ev_flags |= EVLIST_SIGNAL;
212 } 221 }
213 else if (ev->ev_events & (EV_READ | EV_WRITE)) 222 else if (ev->ev_events & (EV_READ | EV_WRITE))
214 { 223 {
215 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE)); 224 ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
216 ev_io_start (EV_A_ &ev->iosig.io); 225 ev_io_start (EV_A_ &ev->iosig.io);
226
227 ev->ev_flags |= EVLIST_INSERTED;
217 } 228 }
218 229
219 if (tv) 230 if (tv)
220 { 231 {
221 ev_timer_set (&ev->to, tv_get (tv), 0.); 232 ev_timer_set (&ev->to, tv_get (tv), 0.);
222 ev_timer_start (EV_A_ &ev->to); 233 ev_timer_start (EV_A_ &ev->to);
234
235 ev->ev_flags |= EVLIST_TIMEOUT;
223 } 236 }
237
238 ev->ev_flags |= EVLIST_ACTIVE;
224 239
225 return 0; 240 return 0;
226} 241}
227 242
228int event_del (struct event *ev) 243int event_del (struct event *ev)
… …
243 } 258 }
244 259
245 if (ev_is_active (&ev->to)) 260 if (ev_is_active (&ev->to))
246 ev_timer_stop (EV_A_ &ev->to); 261 ev_timer_stop (EV_A_ &ev->to);
247 262
263 ev->ev_flags = EVLIST_INIT;
264
248 return 0; 265 return 0;
249} 266}
250 267
251void event_active (struct event *ev, int res, short ncalls) 268void event_active (struct event *ev, int res, short ncalls)
252{ 269{
270 dLOOPev;
271
253 if (res & EV_TIMEOUT) 272 if (res & EV_TIMEOUT)
254 ev_feed_event (&iosig.to, res & EV_TIMEOUT); 273 ev_feed_event (EV_A_ &ev->to, res & EV_TIMEOUT);
255 274
256 if (res & EV_SIGNAL) 275 if (res & EV_SIGNAL)
257 ev_feed_event (&iosig.sig, res & EV_SIGNAL); 276 ev_feed_event (EV_A_ &ev->iosig.sig, res & EV_SIGNAL);
258 277
259 if (res & (EV_READ | EV_WRITE)) 278 if (res & (EV_READ | EV_WRITE))
260 ev_feed_event (&iosig.io, res & (EV_READ | EV_WRITE)); 279 ev_feed_event (EV_A_ &ev->iosig.io, res & (EV_READ | EV_WRITE));
261} 280}
262 281
263int event_pending (struct event *ev, short events, struct timeval *tv) 282int event_pending (struct event *ev, short events, struct timeval *tv)
264{ 283{
265 short revents = 0; 284 short revents = 0;
… …
351static void 370static void
352x_once_cb (int revents, void *arg) 371x_once_cb (int revents, void *arg)
353{ 372{
354 struct x_once *once = (struct x_once *)arg; 373 struct x_once *once = (struct x_once *)arg;
355 374
356 once->cb (once->fd, revents, once->arg); 375 once->cb (once->fd, (short)revents, once->arg);
357 free (once); 376 free (once);
358} 377}
359 378
360int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv) 379int event_base_once (struct event_base *base, int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
361{ 380{

Diff Legend

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