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

Comparing libev/ev.c (file contents):
Revision 1.37 by root, Thu Nov 1 13:33:12 2007 UTC vs.
Revision 1.55 by root, Sun Nov 4 00:39:24 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31#if EV_USE_CONFIG_H 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33#endif 33#endif
34 34
35#include <math.h> 35#include <math.h>
36#include <stdlib.h> 36#include <stdlib.h>
42#include <stdio.h> 42#include <stdio.h>
43 43
44#include <assert.h> 44#include <assert.h>
45#include <errno.h> 45#include <errno.h>
46#include <sys/types.h> 46#include <sys/types.h>
47#ifndef WIN32
47#include <sys/wait.h> 48# include <sys/wait.h>
49#endif
48#include <sys/time.h> 50#include <sys/time.h>
49#include <time.h> 51#include <time.h>
50 52
53/**/
54
51#ifndef EV_USE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 1 56# define EV_USE_MONOTONIC 1
53#endif 57#endif
58
59#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1
61#endif
62
63#ifndef EV_USEV_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif
66
67#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0
69#endif
70
71#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0
73#endif
74
75#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1
77#endif
78
79/**/
54 80
55#ifndef CLOCK_MONOTONIC 81#ifndef CLOCK_MONOTONIC
56# undef EV_USE_MONOTONIC 82# undef EV_USE_MONOTONIC
57# define EV_USE_MONOTONIC 0 83# define EV_USE_MONOTONIC 0
58#endif 84#endif
59 85
60#ifndef EV_USE_SELECT
61# define EV_USE_SELECT 1
62#endif
63
64#ifndef EV_USE_EPOLL
65# define EV_USE_EPOLL 0
66#endif
67
68#ifndef CLOCK_REALTIME 86#ifndef CLOCK_REALTIME
87# undef EV_USE_REALTIME
69# define EV_USE_REALTIME 0 88# define EV_USE_REALTIME 0
70#endif 89#endif
71#ifndef EV_USE_REALTIME 90
72# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ 91/**/
73#endif
74 92
75#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 93#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
76#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */ 94#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
77#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 95#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
78#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 96/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
79 97
80#include "ev.h" 98#include "ev.h"
99
100#if __GNUC__ >= 3
101# define expect(expr,value) __builtin_expect ((expr),(value))
102# define inline inline
103#else
104# define expect(expr,value) (expr)
105# define inline static
106#endif
107
108#define expect_false(expr) expect ((expr) != 0, 0)
109#define expect_true(expr) expect ((expr) != 0, 1)
110
111#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
112#define ABSPRI(w) ((w)->priority - EV_MINPRI)
81 113
82typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
83typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
84typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
85 117
86static ev_tstamp now, diff; /* monotonic clock */ 118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
87ev_tstamp ev_now;
88int ev_method;
89
90static int have_monotonic; /* runtime */
91
92static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
93static void (*method_modify)(int fd, int oev, int nev);
94static void (*method_poll)(ev_tstamp timeout);
95 119
96/*****************************************************************************/ 120/*****************************************************************************/
97 121
98ev_tstamp 122typedef struct
123{
124 struct ev_watcher_list *head;
125 unsigned char events;
126 unsigned char reify;
127} ANFD;
128
129typedef struct
130{
131 W w;
132 int events;
133} ANPENDING;
134
135#if EV_MULTIPLICITY
136
137struct ev_loop
138{
139# define VAR(name,decl) decl;
140# include "ev_vars.h"
141};
142# undef VAR
143# include "ev_wrap.h"
144
145#else
146
147# define VAR(name,decl) static decl;
148# include "ev_vars.h"
149# undef VAR
150
151#endif
152
153/*****************************************************************************/
154
155inline ev_tstamp
99ev_time (void) 156ev_time (void)
100{ 157{
101#if EV_USE_REALTIME 158#if EV_USE_REALTIME
102 struct timespec ts; 159 struct timespec ts;
103 clock_gettime (CLOCK_REALTIME, &ts); 160 clock_gettime (CLOCK_REALTIME, &ts);
107 gettimeofday (&tv, 0); 164 gettimeofday (&tv, 0);
108 return tv.tv_sec + tv.tv_usec * 1e-6; 165 return tv.tv_sec + tv.tv_usec * 1e-6;
109#endif 166#endif
110} 167}
111 168
112static ev_tstamp 169inline ev_tstamp
113get_clock (void) 170get_clock (void)
114{ 171{
115#if EV_USE_MONOTONIC 172#if EV_USE_MONOTONIC
116 if (have_monotonic) 173 if (expect_true (have_monotonic))
117 { 174 {
118 struct timespec ts; 175 struct timespec ts;
119 clock_gettime (CLOCK_MONOTONIC, &ts); 176 clock_gettime (CLOCK_MONOTONIC, &ts);
120 return ts.tv_sec + ts.tv_nsec * 1e-9; 177 return ts.tv_sec + ts.tv_nsec * 1e-9;
121 } 178 }
122#endif 179#endif
123 180
124 return ev_time (); 181 return ev_time ();
125} 182}
126 183
184ev_tstamp
185ev_now (EV_P)
186{
187 return rt_now;
188}
189
127#define array_roundsize(base,n) ((n) | 4 & ~3) 190#define array_roundsize(base,n) ((n) | 4 & ~3)
128 191
129#define array_needsize(base,cur,cnt,init) \ 192#define array_needsize(base,cur,cnt,init) \
130 if ((cnt) > cur) \ 193 if (expect_false ((cnt) > cur)) \
131 { \ 194 { \
132 int newcnt = cur; \ 195 int newcnt = cur; \
133 do \ 196 do \
134 { \ 197 { \
135 newcnt = array_roundsize (base, newcnt << 1); \ 198 newcnt = array_roundsize (base, newcnt << 1); \
141 cur = newcnt; \ 204 cur = newcnt; \
142 } 205 }
143 206
144/*****************************************************************************/ 207/*****************************************************************************/
145 208
146typedef struct
147{
148 struct ev_io *head;
149 unsigned char events;
150 unsigned char reify;
151} ANFD;
152
153static ANFD *anfds;
154static int anfdmax;
155
156static void 209static void
157anfds_init (ANFD *base, int count) 210anfds_init (ANFD *base, int count)
158{ 211{
159 while (count--) 212 while (count--)
160 { 213 {
164 217
165 ++base; 218 ++base;
166 } 219 }
167} 220}
168 221
169typedef struct
170{
171 W w;
172 int events;
173} ANPENDING;
174
175static ANPENDING *pendings;
176static int pendingmax, pendingcnt;
177
178static void 222static void
179event (W w, int events) 223event (EV_P_ W w, int events)
180{ 224{
181 if (w->pending) 225 if (w->pending)
182 { 226 {
183 pendings [w->pending - 1].events |= events; 227 pendings [ABSPRI (w)][w->pending - 1].events |= events;
184 return; 228 return;
185 } 229 }
186 230
187 w->pending = ++pendingcnt; 231 w->pending = ++pendingcnt [ABSPRI (w)];
188 array_needsize (pendings, pendingmax, pendingcnt, ); 232 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
189 pendings [pendingcnt - 1].w = w; 233 pendings [ABSPRI (w)][w->pending - 1].w = w;
190 pendings [pendingcnt - 1].events = events; 234 pendings [ABSPRI (w)][w->pending - 1].events = events;
191} 235}
192 236
193static void 237static void
194queue_events (W *events, int eventcnt, int type) 238queue_events (EV_P_ W *events, int eventcnt, int type)
195{ 239{
196 int i; 240 int i;
197 241
198 for (i = 0; i < eventcnt; ++i) 242 for (i = 0; i < eventcnt; ++i)
199 event (events [i], type); 243 event (EV_A_ events [i], type);
200} 244}
201 245
202static void 246static void
203fd_event (int fd, int events) 247fd_event (EV_P_ int fd, int events)
204{ 248{
205 ANFD *anfd = anfds + fd; 249 ANFD *anfd = anfds + fd;
206 struct ev_io *w; 250 struct ev_io *w;
207 251
208 for (w = anfd->head; w; w = w->next) 252 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
209 { 253 {
210 int ev = w->events & events; 254 int ev = w->events & events;
211 255
212 if (ev) 256 if (ev)
213 event ((W)w, ev); 257 event (EV_A_ (W)w, ev);
214 } 258 }
215} 259}
216 260
217/*****************************************************************************/ 261/*****************************************************************************/
218 262
219static int *fdchanges;
220static int fdchangemax, fdchangecnt;
221
222static void 263static void
223fd_reify (void) 264fd_reify (EV_P)
224{ 265{
225 int i; 266 int i;
226 267
227 for (i = 0; i < fdchangecnt; ++i) 268 for (i = 0; i < fdchangecnt; ++i)
228 { 269 {
230 ANFD *anfd = anfds + fd; 271 ANFD *anfd = anfds + fd;
231 struct ev_io *w; 272 struct ev_io *w;
232 273
233 int events = 0; 274 int events = 0;
234 275
235 for (w = anfd->head; w; w = w->next) 276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
236 events |= w->events; 277 events |= w->events;
237 278
238 anfd->reify = 0; 279 anfd->reify = 0;
239 280
240 if (anfd->events != events) 281 if (anfd->events != events)
241 { 282 {
242 method_modify (fd, anfd->events, events); 283 method_modify (EV_A_ fd, anfd->events, events);
243 anfd->events = events; 284 anfd->events = events;
244 } 285 }
245 } 286 }
246 287
247 fdchangecnt = 0; 288 fdchangecnt = 0;
248} 289}
249 290
250static void 291static void
251fd_change (int fd) 292fd_change (EV_P_ int fd)
252{ 293{
253 if (anfds [fd].reify || fdchangecnt < 0) 294 if (anfds [fd].reify || fdchangecnt < 0)
254 return; 295 return;
255 296
256 anfds [fd].reify = 1; 297 anfds [fd].reify = 1;
258 ++fdchangecnt; 299 ++fdchangecnt;
259 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 300 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
260 fdchanges [fdchangecnt - 1] = fd; 301 fdchanges [fdchangecnt - 1] = fd;
261} 302}
262 303
304static void
305fd_kill (EV_P_ int fd)
306{
307 struct ev_io *w;
308
309 while ((w = (struct ev_io *)anfds [fd].head))
310 {
311 ev_io_stop (EV_A_ w);
312 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
313 }
314}
315
263/* called on EBADF to verify fds */ 316/* called on EBADF to verify fds */
264static void 317static void
265fd_recheck (void) 318fd_ebadf (EV_P)
266{ 319{
267 int fd; 320 int fd;
268 321
269 for (fd = 0; fd < anfdmax; ++fd) 322 for (fd = 0; fd < anfdmax; ++fd)
270 if (anfds [fd].events) 323 if (anfds [fd].events)
271 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 324 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
272 while (anfds [fd].head) 325 fd_kill (EV_A_ fd);
326}
327
328/* called on ENOMEM in select/poll to kill some fds and retry */
329static void
330fd_enomem (EV_P)
331{
332 int fd = anfdmax;
333
334 while (fd--)
335 if (anfds [fd].events)
273 { 336 {
274 ev_io_stop (anfds [fd].head); 337 close (fd);
275 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE); 338 fd_kill (EV_A_ fd);
339 return;
276 } 340 }
277} 341}
278 342
279/*****************************************************************************/ 343/*****************************************************************************/
280 344
281static struct ev_timer **timers;
282static int timermax, timercnt;
283
284static struct ev_periodic **periodics;
285static int periodicmax, periodiccnt;
286
287static void 345static void
288upheap (WT *timers, int k) 346upheap (WT *heap, int k)
289{ 347{
290 WT w = timers [k]; 348 WT w = heap [k];
291 349
292 while (k && timers [k >> 1]->at > w->at) 350 while (k && heap [k >> 1]->at > w->at)
293 { 351 {
294 timers [k] = timers [k >> 1]; 352 heap [k] = heap [k >> 1];
295 timers [k]->active = k + 1; 353 heap [k]->active = k + 1;
296 k >>= 1; 354 k >>= 1;
297 } 355 }
298 356
299 timers [k] = w; 357 heap [k] = w;
300 timers [k]->active = k + 1; 358 heap [k]->active = k + 1;
301 359
302} 360}
303 361
304static void 362static void
305downheap (WT *timers, int N, int k) 363downheap (WT *heap, int N, int k)
306{ 364{
307 WT w = timers [k]; 365 WT w = heap [k];
308 366
309 while (k < (N >> 1)) 367 while (k < (N >> 1))
310 { 368 {
311 int j = k << 1; 369 int j = k << 1;
312 370
313 if (j + 1 < N && timers [j]->at > timers [j + 1]->at) 371 if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
314 ++j; 372 ++j;
315 373
316 if (w->at <= timers [j]->at) 374 if (w->at <= heap [j]->at)
317 break; 375 break;
318 376
319 timers [k] = timers [j]; 377 heap [k] = heap [j];
320 timers [k]->active = k + 1; 378 heap [k]->active = k + 1;
321 k = j; 379 k = j;
322 } 380 }
323 381
324 timers [k] = w; 382 heap [k] = w;
325 timers [k]->active = k + 1; 383 heap [k]->active = k + 1;
326} 384}
327 385
328/*****************************************************************************/ 386/*****************************************************************************/
329 387
330typedef struct 388typedef struct
331{ 389{
332 struct ev_signal *head; 390 struct ev_watcher_list *head;
333 sig_atomic_t volatile gotsig; 391 sig_atomic_t volatile gotsig;
334} ANSIG; 392} ANSIG;
335 393
336static ANSIG *signals; 394static ANSIG *signals;
337static int signalmax; 395static int signalmax;
338 396
339static int sigpipe [2]; 397static int sigpipe [2];
340static sig_atomic_t volatile gotsig; 398static sig_atomic_t volatile gotsig;
341static struct ev_io sigev;
342 399
343static void 400static void
344signals_init (ANSIG *base, int count) 401signals_init (ANSIG *base, int count)
345{ 402{
346 while (count--) 403 while (count--)
357{ 414{
358 signals [signum - 1].gotsig = 1; 415 signals [signum - 1].gotsig = 1;
359 416
360 if (!gotsig) 417 if (!gotsig)
361 { 418 {
419 int old_errno = errno;
362 gotsig = 1; 420 gotsig = 1;
363 write (sigpipe [1], &signum, 1); 421 write (sigpipe [1], &signum, 1);
422 errno = old_errno;
364 } 423 }
365} 424}
366 425
367static void 426static void
368sigcb (struct ev_io *iow, int revents) 427sigcb (EV_P_ struct ev_io *iow, int revents)
369{ 428{
370 struct ev_signal *w; 429 struct ev_watcher_list *w;
371 int sig; 430 int signum;
372 431
373 read (sigpipe [0], &revents, 1); 432 read (sigpipe [0], &revents, 1);
374 gotsig = 0; 433 gotsig = 0;
375 434
376 for (sig = signalmax; sig--; ) 435 for (signum = signalmax; signum--; )
377 if (signals [sig].gotsig) 436 if (signals [signum].gotsig)
378 { 437 {
379 signals [sig].gotsig = 0; 438 signals [signum].gotsig = 0;
380 439
381 for (w = signals [sig].head; w; w = w->next) 440 for (w = signals [signum].head; w; w = w->next)
382 event ((W)w, EV_SIGNAL); 441 event (EV_A_ (W)w, EV_SIGNAL);
383 } 442 }
384} 443}
385 444
386static void 445static void
387siginit (void) 446siginit (EV_P)
388{ 447{
448#ifndef WIN32
389 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 449 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
390 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 450 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
391 451
392 /* rather than sort out wether we really need nb, set it */ 452 /* rather than sort out wether we really need nb, set it */
393 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 453 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
394 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 454 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
455#endif
395 456
396 ev_io_set (&sigev, sigpipe [0], EV_READ); 457 ev_io_set (&sigev, sigpipe [0], EV_READ);
397 ev_io_start (&sigev); 458 ev_io_start (EV_A_ &sigev);
459 ev_unref (EV_A); /* child watcher should not keep loop alive */
398} 460}
399 461
400/*****************************************************************************/ 462/*****************************************************************************/
401 463
402static struct ev_idle **idles; 464#ifndef WIN32
403static int idlemax, idlecnt;
404
405static struct ev_prepare **prepares;
406static int preparemax, preparecnt;
407
408static struct ev_check **checks;
409static int checkmax, checkcnt;
410
411/*****************************************************************************/
412
413static struct ev_child *childs [PID_HASHSIZE];
414static struct ev_signal childev;
415 465
416#ifndef WCONTINUED 466#ifndef WCONTINUED
417# define WCONTINUED 0 467# define WCONTINUED 0
418#endif 468#endif
419 469
420static void 470static void
421childcb (struct ev_signal *sw, int revents) 471child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
422{ 472{
423 struct ev_child *w; 473 struct ev_child *w;
474
475 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
476 if (w->pid == pid || !w->pid)
477 {
478 w->priority = sw->priority; /* need to do it *now* */
479 w->rpid = pid;
480 w->rstatus = status;
481 event (EV_A_ (W)w, EV_CHILD);
482 }
483}
484
485static void
486childcb (EV_P_ struct ev_signal *sw, int revents)
487{
424 int pid, status; 488 int pid, status;
425 489
426 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 490 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
427 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 491 {
428 if (w->pid == pid || w->pid == -1) 492 /* make sure we are called again until all childs have been reaped */
429 { 493 event (EV_A_ (W)sw, EV_SIGNAL);
430 w->status = status; 494
431 event ((W)w, EV_CHILD); 495 child_reap (EV_A_ sw, pid, pid, status);
432 } 496 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
497 }
433} 498}
499
500#endif
434 501
435/*****************************************************************************/ 502/*****************************************************************************/
436 503
504#if EV_USE_KQUEUE
505# include "ev_kqueue.c"
506#endif
437#if EV_USE_EPOLL 507#if EV_USE_EPOLL
438# include "ev_epoll.c" 508# include "ev_epoll.c"
439#endif 509#endif
510#if EV_USEV_POLL
511# include "ev_poll.c"
512#endif
440#if EV_USE_SELECT 513#if EV_USE_SELECT
441# include "ev_select.c" 514# include "ev_select.c"
442#endif 515#endif
443 516
444int 517int
451ev_version_minor (void) 524ev_version_minor (void)
452{ 525{
453 return EV_VERSION_MINOR; 526 return EV_VERSION_MINOR;
454} 527}
455 528
456int ev_init (int flags) 529/* return true if we are running with elevated privileges and should ignore env variables */
530static int
531enable_secure (void)
457{ 532{
533#ifdef WIN32
534 return 0;
535#else
536 return getuid () != geteuid ()
537 || getgid () != getegid ();
538#endif
539}
540
541int
542ev_method (EV_P)
543{
544 return method;
545}
546
547inline int
548loop_init (EV_P_ int methods)
549{
458 if (!ev_method) 550 if (!method)
459 { 551 {
460#if EV_USE_MONOTONIC 552#if EV_USE_MONOTONIC
461 { 553 {
462 struct timespec ts; 554 struct timespec ts;
463 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 555 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
464 have_monotonic = 1; 556 have_monotonic = 1;
465 } 557 }
466#endif 558#endif
467 559
468 ev_now = ev_time (); 560 rt_now = ev_time ();
469 now = get_clock (); 561 mn_now = get_clock ();
562 now_floor = mn_now;
470 diff = ev_now - now; 563 rtmn_diff = rt_now - mn_now;
471 564
472 if (pipe (sigpipe)) 565 if (pipe (sigpipe))
473 return 0; 566 return 0;
474 567
568 if (methods == EVMETHOD_AUTO)
569 if (!enable_secure () && getenv ("LIBmethodS"))
570 methods = atoi (getenv ("LIBmethodS"));
571 else
475 ev_method = EVMETHOD_NONE; 572 methods = EVMETHOD_ANY;
573
574 method = 0;
575#if EV_USE_KQUEUE
576 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
577#endif
476#if EV_USE_EPOLL 578#if EV_USE_EPOLL
477 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 579 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
580#endif
581#if EV_USEV_POLL
582 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
478#endif 583#endif
479#if EV_USE_SELECT 584#if EV_USE_SELECT
480 if (ev_method == EVMETHOD_NONE) select_init (flags); 585 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
481#endif 586#endif
482 587
483 if (ev_method) 588 if (method)
484 { 589 {
485 ev_watcher_init (&sigev, sigcb); 590 ev_watcher_init (&sigev, sigcb);
591 ev_set_priority (&sigev, EV_MAXPRI);
486 siginit (); 592 siginit (EV_A);
487 593
594#ifndef WIN32
488 ev_signal_init (&childev, childcb, SIGCHLD); 595 ev_signal_init (&childev, childcb, SIGCHLD);
596 ev_set_priority (&childev, EV_MAXPRI);
489 ev_signal_start (&childev); 597 ev_signal_start (EV_A_ &childev);
598 ev_unref (EV_A); /* child watcher should not keep loop alive */
599#endif
490 } 600 }
491 } 601 }
492 602
493 return ev_method; 603 return method;
494} 604}
605
606#if EV_MULTIPLICITY
607
608struct ev_loop *
609ev_loop_new (int methods)
610{
611 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop));
612
613 if (loop_init (EV_A_ methods))
614 return loop;
615
616 ev_loop_delete (loop);
617
618 return 0;
619}
620
621void
622ev_loop_delete (EV_P)
623{
624 /*TODO*/
625 free (loop);
626}
627
628#else
629
630int
631ev_init (int methods)
632{
633 return loop_init (methods);
634}
635
636#endif
495 637
496/*****************************************************************************/ 638/*****************************************************************************/
497 639
498void 640void
499ev_fork_prepare (void) 641ev_fork_prepare (void)
508} 650}
509 651
510void 652void
511ev_fork_child (void) 653ev_fork_child (void)
512{ 654{
655 /*TODO*/
656#if !EV_MULTIPLICITY
513#if EV_USE_EPOLL 657#if EV_USE_EPOLL
514 if (ev_method == EVMETHOD_EPOLL) 658 if (method == EVMETHOD_EPOLL)
515 epoll_postfork_child (); 659 epoll_postfork_child (EV_A);
516#endif 660#endif
517 661
518 ev_io_stop (&sigev); 662 ev_io_stop (EV_A_ &sigev);
519 close (sigpipe [0]); 663 close (sigpipe [0]);
520 close (sigpipe [1]); 664 close (sigpipe [1]);
521 pipe (sigpipe); 665 pipe (sigpipe);
522 siginit (); 666 siginit (EV_A);
667#endif
523} 668}
524 669
525/*****************************************************************************/ 670/*****************************************************************************/
526 671
527static void 672static void
528call_pending (void) 673call_pending (EV_P)
529{ 674{
675 int pri;
676
677 for (pri = NUMPRI; pri--; )
530 while (pendingcnt) 678 while (pendingcnt [pri])
531 { 679 {
532 ANPENDING *p = pendings + --pendingcnt; 680 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
533 681
534 if (p->w) 682 if (p->w)
535 { 683 {
536 p->w->pending = 0; 684 p->w->pending = 0;
537 p->w->cb (p->w, p->events); 685 p->w->cb (EV_A_ p->w, p->events);
538 } 686 }
539 } 687 }
540} 688}
541 689
542static void 690static void
543timers_reify (void) 691timers_reify (EV_P)
544{ 692{
545 while (timercnt && timers [0]->at <= now) 693 while (timercnt && timers [0]->at <= mn_now)
546 { 694 {
547 struct ev_timer *w = timers [0]; 695 struct ev_timer *w = timers [0];
548 696
549 /* first reschedule or stop timer */ 697 /* first reschedule or stop timer */
550 if (w->repeat) 698 if (w->repeat)
551 { 699 {
552 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 700 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
553 w->at = now + w->repeat; 701 w->at = mn_now + w->repeat;
554 downheap ((WT *)timers, timercnt, 0); 702 downheap ((WT *)timers, timercnt, 0);
555 } 703 }
556 else 704 else
557 ev_timer_stop (w); /* nonrepeating: stop timer */ 705 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
558 706
559 event ((W)w, EV_TIMEOUT); 707 event (EV_A_ (W)w, EV_TIMEOUT);
560 } 708 }
561} 709}
562 710
563static void 711static void
564periodics_reify (void) 712periodics_reify (EV_P)
565{ 713{
566 while (periodiccnt && periodics [0]->at <= ev_now) 714 while (periodiccnt && periodics [0]->at <= rt_now)
567 { 715 {
568 struct ev_periodic *w = periodics [0]; 716 struct ev_periodic *w = periodics [0];
569 717
570 /* first reschedule or stop timer */ 718 /* first reschedule or stop timer */
571 if (w->interval) 719 if (w->interval)
572 { 720 {
573 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 721 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
574 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now)); 722 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
575 downheap ((WT *)periodics, periodiccnt, 0); 723 downheap ((WT *)periodics, periodiccnt, 0);
576 } 724 }
577 else 725 else
578 ev_periodic_stop (w); /* nonrepeating: stop timer */ 726 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
579 727
580 event ((W)w, EV_PERIODIC); 728 event (EV_A_ (W)w, EV_PERIODIC);
581 } 729 }
582} 730}
583 731
584static void 732static void
585periodics_reschedule (ev_tstamp diff) 733periodics_reschedule (EV_P)
586{ 734{
587 int i; 735 int i;
588 736
589 /* adjust periodics after time jump */ 737 /* adjust periodics after time jump */
590 for (i = 0; i < periodiccnt; ++i) 738 for (i = 0; i < periodiccnt; ++i)
591 { 739 {
592 struct ev_periodic *w = periodics [i]; 740 struct ev_periodic *w = periodics [i];
593 741
594 if (w->interval) 742 if (w->interval)
595 { 743 {
596 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 744 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
597 745
598 if (fabs (diff) >= 1e-4) 746 if (fabs (diff) >= 1e-4)
599 { 747 {
600 ev_periodic_stop (w); 748 ev_periodic_stop (EV_A_ w);
601 ev_periodic_start (w); 749 ev_periodic_start (EV_A_ w);
602 750
603 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 751 i = 0; /* restart loop, inefficient, but time jumps should be rare */
604 } 752 }
605 } 753 }
606 } 754 }
607} 755}
608 756
757inline int
758time_update_monotonic (EV_P)
759{
760 mn_now = get_clock ();
761
762 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
763 {
764 rt_now = rtmn_diff + mn_now;
765 return 0;
766 }
767 else
768 {
769 now_floor = mn_now;
770 rt_now = ev_time ();
771 return 1;
772 }
773}
774
609static void 775static void
610time_update (void) 776time_update (EV_P)
611{ 777{
612 int i; 778 int i;
613 779
614 ev_now = ev_time (); 780#if EV_USE_MONOTONIC
615
616 if (have_monotonic) 781 if (expect_true (have_monotonic))
617 { 782 {
618 ev_tstamp odiff = diff; 783 if (time_update_monotonic (EV_A))
619
620 for (i = 4; --i; ) /* loop a few times, before making important decisions */
621 { 784 {
622 now = get_clock (); 785 ev_tstamp odiff = rtmn_diff;
786
787 for (i = 4; --i; ) /* loop a few times, before making important decisions */
788 {
623 diff = ev_now - now; 789 rtmn_diff = rt_now - mn_now;
624 790
625 if (fabs (odiff - diff) < MIN_TIMEJUMP) 791 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
626 return; /* all is well */ 792 return; /* all is well */
627 793
628 ev_now = ev_time (); 794 rt_now = ev_time ();
795 mn_now = get_clock ();
796 now_floor = mn_now;
797 }
798
799 periodics_reschedule (EV_A);
800 /* no timer adjustment, as the monotonic clock doesn't jump */
801 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
629 } 802 }
630
631 periodics_reschedule (diff - odiff);
632 /* no timer adjustment, as the monotonic clock doesn't jump */
633 } 803 }
634 else 804 else
805#endif
635 { 806 {
636 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 807 rt_now = ev_time ();
808
809 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
637 { 810 {
638 periodics_reschedule (ev_now - now); 811 periodics_reschedule (EV_A);
639 812
640 /* adjust timers. this is easy, as the offset is the same for all */ 813 /* adjust timers. this is easy, as the offset is the same for all */
641 for (i = 0; i < timercnt; ++i) 814 for (i = 0; i < timercnt; ++i)
642 timers [i]->at += diff; 815 timers [i]->at += rt_now - mn_now;
643 } 816 }
644 817
645 now = ev_now; 818 mn_now = rt_now;
646 } 819 }
647} 820}
648 821
649int ev_loop_done; 822void
823ev_ref (EV_P)
824{
825 ++activecnt;
826}
650 827
828void
829ev_unref (EV_P)
830{
831 --activecnt;
832}
833
834static int loop_done;
835
836void
651void ev_loop (int flags) 837ev_loop (EV_P_ int flags)
652{ 838{
653 double block; 839 double block;
654 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 840 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
655 841
656 do 842 do
657 { 843 {
658 /* queue check watchers (and execute them) */ 844 /* queue check watchers (and execute them) */
659 if (preparecnt) 845 if (expect_false (preparecnt))
660 { 846 {
661 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 847 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
662 call_pending (); 848 call_pending (EV_A);
663 } 849 }
664 850
665 /* update fd-related kernel structures */ 851 /* update fd-related kernel structures */
666 fd_reify (); 852 fd_reify (EV_A);
667 853
668 /* calculate blocking time */ 854 /* calculate blocking time */
669 855
670 /* we only need this for !monotonic clockor timers, but as we basically 856 /* we only need this for !monotonic clockor timers, but as we basically
671 always have timers, we just calculate it always */ 857 always have timers, we just calculate it always */
858#if EV_USE_MONOTONIC
859 if (expect_true (have_monotonic))
860 time_update_monotonic (EV_A);
861 else
862#endif
863 {
672 ev_now = ev_time (); 864 rt_now = ev_time ();
865 mn_now = rt_now;
866 }
673 867
674 if (flags & EVLOOP_NONBLOCK || idlecnt) 868 if (flags & EVLOOP_NONBLOCK || idlecnt)
675 block = 0.; 869 block = 0.;
676 else 870 else
677 { 871 {
678 block = MAX_BLOCKTIME; 872 block = MAX_BLOCKTIME;
679 873
680 if (timercnt) 874 if (timercnt)
681 { 875 {
682 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 876 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
683 if (block > to) block = to; 877 if (block > to) block = to;
684 } 878 }
685 879
686 if (periodiccnt) 880 if (periodiccnt)
687 { 881 {
688 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 882 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
689 if (block > to) block = to; 883 if (block > to) block = to;
690 } 884 }
691 885
692 if (block < 0.) block = 0.; 886 if (block < 0.) block = 0.;
693 } 887 }
694 888
695 method_poll (block); 889 method_poll (EV_A_ block);
696 890
697 /* update ev_now, do magic */ 891 /* update rt_now, do magic */
698 time_update (); 892 time_update (EV_A);
699 893
700 /* queue pending timers and reschedule them */ 894 /* queue pending timers and reschedule them */
701 timers_reify (); /* relative timers called last */ 895 timers_reify (EV_A); /* relative timers called last */
702 periodics_reify (); /* absolute timers called first */ 896 periodics_reify (EV_A); /* absolute timers called first */
703 897
704 /* queue idle watchers unless io or timers are pending */ 898 /* queue idle watchers unless io or timers are pending */
705 if (!pendingcnt) 899 if (!pendingcnt)
706 queue_events ((W *)idles, idlecnt, EV_IDLE); 900 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
707 901
708 /* queue check watchers, to be executed first */ 902 /* queue check watchers, to be executed first */
709 if (checkcnt) 903 if (checkcnt)
710 queue_events ((W *)checks, checkcnt, EV_CHECK); 904 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
711 905
712 call_pending (); 906 call_pending (EV_A);
713 } 907 }
714 while (!ev_loop_done); 908 while (activecnt && !loop_done);
715 909
716 if (ev_loop_done != 2) 910 if (loop_done != 2)
717 ev_loop_done = 0; 911 loop_done = 0;
912}
913
914void
915ev_unloop (EV_P_ int how)
916{
917 loop_done = how;
718} 918}
719 919
720/*****************************************************************************/ 920/*****************************************************************************/
721 921
722static void 922inline void
723wlist_add (WL *head, WL elem) 923wlist_add (WL *head, WL elem)
724{ 924{
725 elem->next = *head; 925 elem->next = *head;
726 *head = elem; 926 *head = elem;
727} 927}
728 928
729static void 929inline void
730wlist_del (WL *head, WL elem) 930wlist_del (WL *head, WL elem)
731{ 931{
732 while (*head) 932 while (*head)
733 { 933 {
734 if (*head == elem) 934 if (*head == elem)
739 939
740 head = &(*head)->next; 940 head = &(*head)->next;
741 } 941 }
742} 942}
743 943
744static void 944inline void
745ev_clear_pending (W w) 945ev_clear_pending (EV_P_ W w)
746{ 946{
747 if (w->pending) 947 if (w->pending)
748 { 948 {
749 pendings [w->pending - 1].w = 0; 949 pendings [ABSPRI (w)][w->pending - 1].w = 0;
750 w->pending = 0; 950 w->pending = 0;
751 } 951 }
752} 952}
753 953
754static void 954inline void
755ev_start (W w, int active) 955ev_start (EV_P_ W w, int active)
756{ 956{
957 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
958 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
959
757 w->active = active; 960 w->active = active;
961 ev_ref (EV_A);
758} 962}
759 963
760static void 964inline void
761ev_stop (W w) 965ev_stop (EV_P_ W w)
762{ 966{
967 ev_unref (EV_A);
763 w->active = 0; 968 w->active = 0;
764} 969}
765 970
766/*****************************************************************************/ 971/*****************************************************************************/
767 972
768void 973void
769ev_io_start (struct ev_io *w) 974ev_io_start (EV_P_ struct ev_io *w)
770{ 975{
771 int fd = w->fd; 976 int fd = w->fd;
772 977
773 if (ev_is_active (w)) 978 if (ev_is_active (w))
774 return; 979 return;
775 980
776 assert (("ev_io_start called with negative fd", fd >= 0)); 981 assert (("ev_io_start called with negative fd", fd >= 0));
777 982
778 ev_start ((W)w, 1); 983 ev_start (EV_A_ (W)w, 1);
779 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 984 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
780 wlist_add ((WL *)&anfds[fd].head, (WL)w); 985 wlist_add ((WL *)&anfds[fd].head, (WL)w);
781 986
782 fd_change (fd); 987 fd_change (EV_A_ fd);
783} 988}
784 989
785void 990void
786ev_io_stop (struct ev_io *w) 991ev_io_stop (EV_P_ struct ev_io *w)
787{ 992{
788 ev_clear_pending ((W)w); 993 ev_clear_pending (EV_A_ (W)w);
789 if (!ev_is_active (w)) 994 if (!ev_is_active (w))
790 return; 995 return;
791 996
792 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 997 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
793 ev_stop ((W)w); 998 ev_stop (EV_A_ (W)w);
794 999
795 fd_change (w->fd); 1000 fd_change (EV_A_ w->fd);
796} 1001}
797 1002
798void 1003void
799ev_timer_start (struct ev_timer *w) 1004ev_timer_start (EV_P_ struct ev_timer *w)
800{ 1005{
801 if (ev_is_active (w)) 1006 if (ev_is_active (w))
802 return; 1007 return;
803 1008
804 w->at += now; 1009 w->at += mn_now;
805 1010
806 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1011 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
807 1012
808 ev_start ((W)w, ++timercnt); 1013 ev_start (EV_A_ (W)w, ++timercnt);
809 array_needsize (timers, timermax, timercnt, ); 1014 array_needsize (timers, timermax, timercnt, );
810 timers [timercnt - 1] = w; 1015 timers [timercnt - 1] = w;
811 upheap ((WT *)timers, timercnt - 1); 1016 upheap ((WT *)timers, timercnt - 1);
812} 1017}
813 1018
814void 1019void
815ev_timer_stop (struct ev_timer *w) 1020ev_timer_stop (EV_P_ struct ev_timer *w)
816{ 1021{
817 ev_clear_pending ((W)w); 1022 ev_clear_pending (EV_A_ (W)w);
818 if (!ev_is_active (w)) 1023 if (!ev_is_active (w))
819 return; 1024 return;
820 1025
821 if (w->active < timercnt--) 1026 if (w->active < timercnt--)
822 { 1027 {
824 downheap ((WT *)timers, timercnt, w->active - 1); 1029 downheap ((WT *)timers, timercnt, w->active - 1);
825 } 1030 }
826 1031
827 w->at = w->repeat; 1032 w->at = w->repeat;
828 1033
829 ev_stop ((W)w); 1034 ev_stop (EV_A_ (W)w);
830} 1035}
831 1036
832void 1037void
833ev_timer_again (struct ev_timer *w) 1038ev_timer_again (EV_P_ struct ev_timer *w)
834{ 1039{
835 if (ev_is_active (w)) 1040 if (ev_is_active (w))
836 { 1041 {
837 if (w->repeat) 1042 if (w->repeat)
838 { 1043 {
839 w->at = now + w->repeat; 1044 w->at = mn_now + w->repeat;
840 downheap ((WT *)timers, timercnt, w->active - 1); 1045 downheap ((WT *)timers, timercnt, w->active - 1);
841 } 1046 }
842 else 1047 else
843 ev_timer_stop (w); 1048 ev_timer_stop (EV_A_ w);
844 } 1049 }
845 else if (w->repeat) 1050 else if (w->repeat)
846 ev_timer_start (w); 1051 ev_timer_start (EV_A_ w);
847} 1052}
848 1053
849void 1054void
850ev_periodic_start (struct ev_periodic *w) 1055ev_periodic_start (EV_P_ struct ev_periodic *w)
851{ 1056{
852 if (ev_is_active (w)) 1057 if (ev_is_active (w))
853 return; 1058 return;
854 1059
855 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1060 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
856 1061
857 /* this formula differs from the one in periodic_reify because we do not always round up */ 1062 /* this formula differs from the one in periodic_reify because we do not always round up */
858 if (w->interval) 1063 if (w->interval)
859 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1064 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
860 1065
861 ev_start ((W)w, ++periodiccnt); 1066 ev_start (EV_A_ (W)w, ++periodiccnt);
862 array_needsize (periodics, periodicmax, periodiccnt, ); 1067 array_needsize (periodics, periodicmax, periodiccnt, );
863 periodics [periodiccnt - 1] = w; 1068 periodics [periodiccnt - 1] = w;
864 upheap ((WT *)periodics, periodiccnt - 1); 1069 upheap ((WT *)periodics, periodiccnt - 1);
865} 1070}
866 1071
867void 1072void
868ev_periodic_stop (struct ev_periodic *w) 1073ev_periodic_stop (EV_P_ struct ev_periodic *w)
869{ 1074{
870 ev_clear_pending ((W)w); 1075 ev_clear_pending (EV_A_ (W)w);
871 if (!ev_is_active (w)) 1076 if (!ev_is_active (w))
872 return; 1077 return;
873 1078
874 if (w->active < periodiccnt--) 1079 if (w->active < periodiccnt--)
875 { 1080 {
876 periodics [w->active - 1] = periodics [periodiccnt]; 1081 periodics [w->active - 1] = periodics [periodiccnt];
877 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1082 downheap ((WT *)periodics, periodiccnt, w->active - 1);
878 } 1083 }
879 1084
880 ev_stop ((W)w); 1085 ev_stop (EV_A_ (W)w);
881} 1086}
882 1087
1088#ifndef SA_RESTART
1089# define SA_RESTART 0
1090#endif
1091
883void 1092void
884ev_signal_start (struct ev_signal *w) 1093ev_signal_start (EV_P_ struct ev_signal *w)
885{ 1094{
886 if (ev_is_active (w)) 1095 if (ev_is_active (w))
887 return; 1096 return;
888 1097
889 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1098 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
890 1099
891 ev_start ((W)w, 1); 1100 ev_start (EV_A_ (W)w, 1);
892 array_needsize (signals, signalmax, w->signum, signals_init); 1101 array_needsize (signals, signalmax, w->signum, signals_init);
893 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1102 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
894 1103
895 if (!w->next) 1104 if (!w->next)
896 { 1105 {
897 struct sigaction sa; 1106 struct sigaction sa;
898 sa.sa_handler = sighandler; 1107 sa.sa_handler = sighandler;
899 sigfillset (&sa.sa_mask); 1108 sigfillset (&sa.sa_mask);
900 sa.sa_flags = 0; 1109 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
901 sigaction (w->signum, &sa, 0); 1110 sigaction (w->signum, &sa, 0);
902 } 1111 }
903} 1112}
904 1113
905void 1114void
906ev_signal_stop (struct ev_signal *w) 1115ev_signal_stop (EV_P_ struct ev_signal *w)
907{ 1116{
908 ev_clear_pending ((W)w); 1117 ev_clear_pending (EV_A_ (W)w);
909 if (!ev_is_active (w)) 1118 if (!ev_is_active (w))
910 return; 1119 return;
911 1120
912 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1121 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
913 ev_stop ((W)w); 1122 ev_stop (EV_A_ (W)w);
914 1123
915 if (!signals [w->signum - 1].head) 1124 if (!signals [w->signum - 1].head)
916 signal (w->signum, SIG_DFL); 1125 signal (w->signum, SIG_DFL);
917} 1126}
918 1127
919void 1128void
920ev_idle_start (struct ev_idle *w) 1129ev_idle_start (EV_P_ struct ev_idle *w)
921{ 1130{
922 if (ev_is_active (w)) 1131 if (ev_is_active (w))
923 return; 1132 return;
924 1133
925 ev_start ((W)w, ++idlecnt); 1134 ev_start (EV_A_ (W)w, ++idlecnt);
926 array_needsize (idles, idlemax, idlecnt, ); 1135 array_needsize (idles, idlemax, idlecnt, );
927 idles [idlecnt - 1] = w; 1136 idles [idlecnt - 1] = w;
928} 1137}
929 1138
930void 1139void
931ev_idle_stop (struct ev_idle *w) 1140ev_idle_stop (EV_P_ struct ev_idle *w)
932{ 1141{
933 ev_clear_pending ((W)w); 1142 ev_clear_pending (EV_A_ (W)w);
934 if (ev_is_active (w)) 1143 if (ev_is_active (w))
935 return; 1144 return;
936 1145
937 idles [w->active - 1] = idles [--idlecnt]; 1146 idles [w->active - 1] = idles [--idlecnt];
938 ev_stop ((W)w); 1147 ev_stop (EV_A_ (W)w);
939} 1148}
940 1149
941void 1150void
942ev_prepare_start (struct ev_prepare *w) 1151ev_prepare_start (EV_P_ struct ev_prepare *w)
943{ 1152{
944 if (ev_is_active (w)) 1153 if (ev_is_active (w))
945 return; 1154 return;
946 1155
947 ev_start ((W)w, ++preparecnt); 1156 ev_start (EV_A_ (W)w, ++preparecnt);
948 array_needsize (prepares, preparemax, preparecnt, ); 1157 array_needsize (prepares, preparemax, preparecnt, );
949 prepares [preparecnt - 1] = w; 1158 prepares [preparecnt - 1] = w;
950} 1159}
951 1160
952void 1161void
953ev_prepare_stop (struct ev_prepare *w) 1162ev_prepare_stop (EV_P_ struct ev_prepare *w)
954{ 1163{
955 ev_clear_pending ((W)w); 1164 ev_clear_pending (EV_A_ (W)w);
956 if (ev_is_active (w)) 1165 if (ev_is_active (w))
957 return; 1166 return;
958 1167
959 prepares [w->active - 1] = prepares [--preparecnt]; 1168 prepares [w->active - 1] = prepares [--preparecnt];
960 ev_stop ((W)w); 1169 ev_stop (EV_A_ (W)w);
961} 1170}
962 1171
963void 1172void
964ev_check_start (struct ev_check *w) 1173ev_check_start (EV_P_ struct ev_check *w)
965{ 1174{
966 if (ev_is_active (w)) 1175 if (ev_is_active (w))
967 return; 1176 return;
968 1177
969 ev_start ((W)w, ++checkcnt); 1178 ev_start (EV_A_ (W)w, ++checkcnt);
970 array_needsize (checks, checkmax, checkcnt, ); 1179 array_needsize (checks, checkmax, checkcnt, );
971 checks [checkcnt - 1] = w; 1180 checks [checkcnt - 1] = w;
972} 1181}
973 1182
974void 1183void
975ev_check_stop (struct ev_check *w) 1184ev_check_stop (EV_P_ struct ev_check *w)
976{ 1185{
977 ev_clear_pending ((W)w); 1186 ev_clear_pending (EV_A_ (W)w);
978 if (ev_is_active (w)) 1187 if (ev_is_active (w))
979 return; 1188 return;
980 1189
981 checks [w->active - 1] = checks [--checkcnt]; 1190 checks [w->active - 1] = checks [--checkcnt];
982 ev_stop ((W)w); 1191 ev_stop (EV_A_ (W)w);
983} 1192}
984 1193
985void 1194void
986ev_child_start (struct ev_child *w) 1195ev_child_start (EV_P_ struct ev_child *w)
987{ 1196{
988 if (ev_is_active (w)) 1197 if (ev_is_active (w))
989 return; 1198 return;
990 1199
991 ev_start ((W)w, 1); 1200 ev_start (EV_A_ (W)w, 1);
992 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1201 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
993} 1202}
994 1203
995void 1204void
996ev_child_stop (struct ev_child *w) 1205ev_child_stop (EV_P_ struct ev_child *w)
997{ 1206{
998 ev_clear_pending ((W)w); 1207 ev_clear_pending (EV_A_ (W)w);
999 if (ev_is_active (w)) 1208 if (ev_is_active (w))
1000 return; 1209 return;
1001 1210
1002 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1211 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1003 ev_stop ((W)w); 1212 ev_stop (EV_A_ (W)w);
1004} 1213}
1005 1214
1006/*****************************************************************************/ 1215/*****************************************************************************/
1007 1216
1008struct ev_once 1217struct ev_once
1012 void (*cb)(int revents, void *arg); 1221 void (*cb)(int revents, void *arg);
1013 void *arg; 1222 void *arg;
1014}; 1223};
1015 1224
1016static void 1225static void
1017once_cb (struct ev_once *once, int revents) 1226once_cb (EV_P_ struct ev_once *once, int revents)
1018{ 1227{
1019 void (*cb)(int revents, void *arg) = once->cb; 1228 void (*cb)(int revents, void *arg) = once->cb;
1020 void *arg = once->arg; 1229 void *arg = once->arg;
1021 1230
1022 ev_io_stop (&once->io); 1231 ev_io_stop (EV_A_ &once->io);
1023 ev_timer_stop (&once->to); 1232 ev_timer_stop (EV_A_ &once->to);
1024 free (once); 1233 free (once);
1025 1234
1026 cb (revents, arg); 1235 cb (revents, arg);
1027} 1236}
1028 1237
1029static void 1238static void
1030once_cb_io (struct ev_io *w, int revents) 1239once_cb_io (EV_P_ struct ev_io *w, int revents)
1031{ 1240{
1032 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1241 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1033} 1242}
1034 1243
1035static void 1244static void
1036once_cb_to (struct ev_timer *w, int revents) 1245once_cb_to (EV_P_ struct ev_timer *w, int revents)
1037{ 1246{
1038 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1247 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1039} 1248}
1040 1249
1041void 1250void
1042ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1251ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1043{ 1252{
1044 struct ev_once *once = malloc (sizeof (struct ev_once)); 1253 struct ev_once *once = malloc (sizeof (struct ev_once));
1045 1254
1046 if (!once) 1255 if (!once)
1047 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1256 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1052 1261
1053 ev_watcher_init (&once->io, once_cb_io); 1262 ev_watcher_init (&once->io, once_cb_io);
1054 if (fd >= 0) 1263 if (fd >= 0)
1055 { 1264 {
1056 ev_io_set (&once->io, fd, events); 1265 ev_io_set (&once->io, fd, events);
1057 ev_io_start (&once->io); 1266 ev_io_start (EV_A_ &once->io);
1058 } 1267 }
1059 1268
1060 ev_watcher_init (&once->to, once_cb_to); 1269 ev_watcher_init (&once->to, once_cb_to);
1061 if (timeout >= 0.) 1270 if (timeout >= 0.)
1062 { 1271 {
1063 ev_timer_set (&once->to, timeout, 0.); 1272 ev_timer_set (&once->to, timeout, 0.);
1064 ev_timer_start (&once->to); 1273 ev_timer_start (EV_A_ &once->to);
1065 } 1274 }
1066 } 1275 }
1067} 1276}
1068 1277
1069/*****************************************************************************/ 1278/*****************************************************************************/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines