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

Comparing libev/ev.c (file contents):
Revision 1.324 by root, Sat Jan 23 20:15:57 2010 UTC vs.
Revision 1.335 by root, Tue Mar 9 09:02:03 2010 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
… …
163 163
164#include <assert.h> 164#include <assert.h>
165#include <errno.h> 165#include <errno.h>
166#include <sys/types.h> 166#include <sys/types.h>
167#include <time.h> 167#include <time.h>
168#include <limits.h>
168 169
169#include <signal.h> 170#include <signal.h>
170 171
171#ifdef EV_H 172#ifdef EV_H
172# include EV_H 173# include EV_H
… …
183# define WIN32_LEAN_AND_MEAN 184# define WIN32_LEAN_AND_MEAN
184# include <windows.h> 185# include <windows.h>
185# ifndef EV_SELECT_IS_WINSOCKET 186# ifndef EV_SELECT_IS_WINSOCKET
186# define EV_SELECT_IS_WINSOCKET 1 187# define EV_SELECT_IS_WINSOCKET 1
187# endif 188# endif
189# undef EV_AVOID_STDIO
188#endif 190#endif
189 191
190/* this block tries to deduce configuration from header-defined symbols and defaults */ 192/* this block tries to deduce configuration from header-defined symbols and defaults */
191 193
192/* try to deduce the maximum number of signals on this platform */ 194/* try to deduce the maximum number of signals on this platform */
… …
344# endif 346# endif
345#endif 347#endif
346 348
347/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 349/* this block fixes any misconfiguration where we know we run into trouble otherwise */
348 350
351#ifdef _AIX
352/* AIX has a completely broken poll.h header */
353# undef EV_USE_POLL
354# define EV_USE_POLL 0
355#endif
356
349#ifndef CLOCK_MONOTONIC 357#ifndef CLOCK_MONOTONIC
350# undef EV_USE_MONOTONIC 358# undef EV_USE_MONOTONIC
351# define EV_USE_MONOTONIC 0 359# define EV_USE_MONOTONIC 0
352#endif 360#endif
353 361
… …
396# endif 404# endif
397# endif 405# endif
398# ifdef __cplusplus 406# ifdef __cplusplus
399extern "C" { 407extern "C" {
400# endif 408# endif
401int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
402# ifdef __cplusplus 410# ifdef __cplusplus
403} 411}
404# endif 412# endif
405#endif 413#endif
406 414
… …
517# include "ev_win32.c" 525# include "ev_win32.c"
518#endif 526#endif
519 527
520/*****************************************************************************/ 528/*****************************************************************************/
521 529
530#if EV_AVOID_STDIO
531static void noinline
532ev_printerr (const char *msg)
533{
534 write (STDERR_FILENO, msg, strlen (msg));
535}
536#endif
537
522static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
523 539
524void 540void
525ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
526{ 542{
… …
535 551
536 if (syserr_cb) 552 if (syserr_cb)
537 syserr_cb (msg); 553 syserr_cb (msg);
538 else 554 else
539 { 555 {
556#if EV_AVOID_STDIO
557 const char *err = strerror (errno);
558
559 ev_printerr (msg);
560 ev_printerr (": ");
561 ev_printerr (err);
562 ev_printerr ("\n");
563#else
540 perror (msg); 564 perror (msg);
565#endif
541 abort (); 566 abort ();
542 } 567 }
543} 568}
544 569
545static void * 570static void *
546ev_realloc_emul (void *ptr, long size) 571ev_realloc_emul (void *ptr, long size)
547{ 572{
573#if __GLIBC__
574 return realloc (ptr, size);
575#else
548 /* some systems, notably openbsd and darwin, fail to properly 576 /* some systems, notably openbsd and darwin, fail to properly
549 * implement realloc (x, 0) (as required by both ansi c-98 and 577 * implement realloc (x, 0) (as required by both ansi c-89 and
550 * the single unix specification, so work around them here. 578 * the single unix specification, so work around them here.
551 */ 579 */
552 580
553 if (size) 581 if (size)
554 return realloc (ptr, size); 582 return realloc (ptr, size);
555 583
556 free (ptr); 584 free (ptr);
557 return 0; 585 return 0;
586#endif
558} 587}
559 588
560static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 589static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
561 590
562void 591void
… …
570{ 599{
571 ptr = alloc (ptr, size); 600 ptr = alloc (ptr, size);
572 601
573 if (!ptr && size) 602 if (!ptr && size)
574 { 603 {
604#if EV_AVOID_STDIO
605 ev_printerr ("libev: memory allocation failed, aborting.\n");
606#else
575 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 607 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
608#endif
576 abort (); 609 abort ();
577 } 610 }
578 611
579 return ptr; 612 return ptr;
580} 613}
… …
2501 2534
2502 if (expect_false (ev_is_active (w))) 2535 if (expect_false (ev_is_active (w)))
2503 return; 2536 return;
2504 2537
2505 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2538 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2506 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2539 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2507 2540
2508 EV_FREQUENT_CHECK; 2541 EV_FREQUENT_CHECK;
2509 2542
2510 ev_start (EV_A_ (W)w, 1); 2543 ev_start (EV_A_ (W)w, 1);
2511 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2544 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2581 timers [active] = timers [timercnt + HEAP0]; 2614 timers [active] = timers [timercnt + HEAP0];
2582 adjustheap (timers, timercnt, active); 2615 adjustheap (timers, timercnt, active);
2583 } 2616 }
2584 } 2617 }
2585 2618
2586 EV_FREQUENT_CHECK;
2587
2588 ev_at (w) -= mn_now; 2619 ev_at (w) -= mn_now;
2589 2620
2590 ev_stop (EV_A_ (W)w); 2621 ev_stop (EV_A_ (W)w);
2622
2623 EV_FREQUENT_CHECK;
2591} 2624}
2592 2625
2593void noinline 2626void noinline
2594ev_timer_again (EV_P_ ev_timer *w) 2627ev_timer_again (EV_P_ ev_timer *w)
2595{ 2628{
… …
2674 periodics [active] = periodics [periodiccnt + HEAP0]; 2707 periodics [active] = periodics [periodiccnt + HEAP0];
2675 adjustheap (periodics, periodiccnt, active); 2708 adjustheap (periodics, periodiccnt, active);
2676 } 2709 }
2677 } 2710 }
2678 2711
2679 EV_FREQUENT_CHECK;
2680
2681 ev_stop (EV_A_ (W)w); 2712 ev_stop (EV_A_ (W)w);
2713
2714 EV_FREQUENT_CHECK;
2682} 2715}
2683 2716
2684void noinline 2717void noinline
2685ev_periodic_again (EV_P_ ev_periodic *w) 2718ev_periodic_again (EV_P_ ev_periodic *w)
2686{ 2719{
… …
2853#define MIN_STAT_INTERVAL 0.1074891 2886#define MIN_STAT_INTERVAL 0.1074891
2854 2887
2855static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2888static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2856 2889
2857#if EV_USE_INOTIFY 2890#if EV_USE_INOTIFY
2858# define EV_INOTIFY_BUFSIZE 8192 2891
2892/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2893# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2859 2894
2860static void noinline 2895static void noinline
2861infy_add (EV_P_ ev_stat *w) 2896infy_add (EV_P_ ev_stat *w)
2862{ 2897{
2863 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2898 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
… …
2972 3007
2973static void 3008static void
2974infy_cb (EV_P_ ev_io *w, int revents) 3009infy_cb (EV_P_ ev_io *w, int revents)
2975{ 3010{
2976 char buf [EV_INOTIFY_BUFSIZE]; 3011 char buf [EV_INOTIFY_BUFSIZE];
2977 struct inotify_event *ev = (struct inotify_event *)buf;
2978 int ofs; 3012 int ofs;
2979 int len = read (fs_fd, buf, sizeof (buf)); 3013 int len = read (fs_fd, buf, sizeof (buf));
2980 3014
2981 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3015 for (ofs = 0; ofs < len; )
3016 {
3017 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2982 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3018 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3019 ofs += sizeof (struct inotify_event) + ev->len;
3020 }
3021}
3022
3023inline_size unsigned int
3024ev_linux_version (void)
3025{
3026 struct utsname buf;
3027 unsigned int v;
3028 int i;
3029 char *p = buf.release;
3030
3031 if (uname (&buf))
3032 return 0;
3033
3034 for (i = 3+1; --i; )
3035 {
3036 unsigned int c = 0;
3037
3038 for (;;)
3039 {
3040 if (*p >= '0' && *p <= '9')
3041 c = c * 10 + *p++ - '0';
3042 else
3043 {
3044 p += *p == '.';
3045 break;
3046 }
3047 }
3048
3049 v = (v << 8) | c;
3050 }
3051
3052 return v;
2983} 3053}
2984 3054
2985inline_size void 3055inline_size void
2986check_2625 (EV_P) 3056ev_check_2625 (EV_P)
2987{ 3057{
2988 /* kernels < 2.6.25 are borked 3058 /* kernels < 2.6.25 are borked
2989 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3059 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2990 */ 3060 */
2991 struct utsname buf; 3061 if (ev_linux_version () < 0x020619)
2992 int major, minor, micro;
2993
2994 if (uname (&buf))
2995 return;
2996
2997 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2998 return;
2999
3000 if (major < 2
3001 || (major == 2 && minor < 6)
3002 || (major == 2 && minor == 6 && micro < 25))
3003 return; 3062 return;
3004 3063
3005 fs_2625 = 1; 3064 fs_2625 = 1;
3006} 3065}
3007 3066
… …
3022 if (fs_fd != -2) 3081 if (fs_fd != -2)
3023 return; 3082 return;
3024 3083
3025 fs_fd = -1; 3084 fs_fd = -1;
3026 3085
3027 check_2625 (EV_A); 3086 ev_check_2625 (EV_A);
3028 3087
3029 fs_fd = infy_newfd (); 3088 fs_fd = infy_newfd ();
3030 3089
3031 if (fs_fd >= 0) 3090 if (fs_fd >= 0)
3032 { 3091 {
… …
3417 3476
3418 ev_io_stop (EV_A_ &w->io); 3477 ev_io_stop (EV_A_ &w->io);
3419 ev_prepare_stop (EV_A_ &w->prepare); 3478 ev_prepare_stop (EV_A_ &w->prepare);
3420 ev_fork_stop (EV_A_ &w->fork); 3479 ev_fork_stop (EV_A_ &w->fork);
3421 3480
3481 ev_stop (EV_A_ (W)w);
3482
3422 EV_FREQUENT_CHECK; 3483 EV_FREQUENT_CHECK;
3423} 3484}
3424#endif 3485#endif
3425 3486
3426#if EV_FORK_ENABLE 3487#if EV_FORK_ENABLE

Diff Legend

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