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

Comparing libev/ev.c (file contents):
Revision 1.325 by root, Sun Jan 24 12:31:55 2010 UTC vs.
Revision 1.330 by root, Tue Mar 9 08:46:17 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
… …
402# endif 403# endif
403# endif 404# endif
404# ifdef __cplusplus 405# ifdef __cplusplus
405extern "C" { 406extern "C" {
406# endif 407# endif
407int eventfd (unsigned int initval, int flags); 408int (eventfd) (unsigned int initval, int flags);
408# ifdef __cplusplus 409# ifdef __cplusplus
409} 410}
410# endif 411# endif
411#endif 412#endif
412 413
… …
541 542
542 if (syserr_cb) 543 if (syserr_cb)
543 syserr_cb (msg); 544 syserr_cb (msg);
544 else 545 else
545 { 546 {
547#if EV_AVOID_STDIO
548 write (STDERR_FILENO, msg, strlen (msg));
549 write (STDERR_FILENO, ": ", 2);
550 msg = strerror (errno);
551 write (STDERR_FILENO, msg, strlen (msg));
552 write (STDERR_FILENO, "\n", 1);
553#else
546 perror (msg); 554 perror (msg);
555#endif
547 abort (); 556 abort ();
548 } 557 }
549} 558}
550 559
551static void * 560static void *
… …
576{ 585{
577 ptr = alloc (ptr, size); 586 ptr = alloc (ptr, size);
578 587
579 if (!ptr && size) 588 if (!ptr && size)
580 { 589 {
590#if EV_AVOID_STDIO
591 write (STDERR_FILENO, "libev: memory allocation failed, aborting.",
592 sizeof ("libev: memory allocation failed, aborting.") - 1);
593#else
581 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 594 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
595#endif
582 abort (); 596 abort ();
583 } 597 }
584 598
585 return ptr; 599 return ptr;
586} 600}
… …
2507 2521
2508 if (expect_false (ev_is_active (w))) 2522 if (expect_false (ev_is_active (w)))
2509 return; 2523 return;
2510 2524
2511 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2525 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2512 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE)))); 2526 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2513 2527
2514 EV_FREQUENT_CHECK; 2528 EV_FREQUENT_CHECK;
2515 2529
2516 ev_start (EV_A_ (W)w, 1); 2530 ev_start (EV_A_ (W)w, 1);
2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2531 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2587 timers [active] = timers [timercnt + HEAP0]; 2601 timers [active] = timers [timercnt + HEAP0];
2588 adjustheap (timers, timercnt, active); 2602 adjustheap (timers, timercnt, active);
2589 } 2603 }
2590 } 2604 }
2591 2605
2592 EV_FREQUENT_CHECK;
2593
2594 ev_at (w) -= mn_now; 2606 ev_at (w) -= mn_now;
2595 2607
2596 ev_stop (EV_A_ (W)w); 2608 ev_stop (EV_A_ (W)w);
2609
2610 EV_FREQUENT_CHECK;
2597} 2611}
2598 2612
2599void noinline 2613void noinline
2600ev_timer_again (EV_P_ ev_timer *w) 2614ev_timer_again (EV_P_ ev_timer *w)
2601{ 2615{
… …
2680 periodics [active] = periodics [periodiccnt + HEAP0]; 2694 periodics [active] = periodics [periodiccnt + HEAP0];
2681 adjustheap (periodics, periodiccnt, active); 2695 adjustheap (periodics, periodiccnt, active);
2682 } 2696 }
2683 } 2697 }
2684 2698
2685 EV_FREQUENT_CHECK;
2686
2687 ev_stop (EV_A_ (W)w); 2699 ev_stop (EV_A_ (W)w);
2700
2701 EV_FREQUENT_CHECK;
2688} 2702}
2689 2703
2690void noinline 2704void noinline
2691ev_periodic_again (EV_P_ ev_periodic *w) 2705ev_periodic_again (EV_P_ ev_periodic *w)
2692{ 2706{
… …
2859#define MIN_STAT_INTERVAL 0.1074891 2873#define MIN_STAT_INTERVAL 0.1074891
2860 2874
2861static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2875static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2862 2876
2863#if EV_USE_INOTIFY 2877#if EV_USE_INOTIFY
2864# define EV_INOTIFY_BUFSIZE 8192 2878
2879/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2880# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2865 2881
2866static void noinline 2882static void noinline
2867infy_add (EV_P_ ev_stat *w) 2883infy_add (EV_P_ ev_stat *w)
2868{ 2884{
2869 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); 2885 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);
… …
2978 2994
2979static void 2995static void
2980infy_cb (EV_P_ ev_io *w, int revents) 2996infy_cb (EV_P_ ev_io *w, int revents)
2981{ 2997{
2982 char buf [EV_INOTIFY_BUFSIZE]; 2998 char buf [EV_INOTIFY_BUFSIZE];
2983 struct inotify_event *ev = (struct inotify_event *)buf;
2984 int ofs; 2999 int ofs;
2985 int len = read (fs_fd, buf, sizeof (buf)); 3000 int len = read (fs_fd, buf, sizeof (buf));
2986 3001
2987 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3002 for (ofs = 0; ofs < len; )
3003 {
3004 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2988 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3005 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3006 ofs += sizeof (struct inotify_event) + ev->len;
3007 }
3008}
3009
3010inline_size unsigned int
3011ev_linux_version (void)
3012{
3013 struct utsname buf;
3014 unsigned int v;
3015 int i;
3016 char *p = buf.release;
3017
3018 if (uname (&buf))
3019 return 0;
3020
3021 for (i = 3+1; --i; )
3022 {
3023 unsigned int c = 0;
3024
3025 for (;;)
3026 {
3027 if (*p >= '0' && *p <= '9')
3028 c = c * 10 + *p++ - '0';
3029 else
3030 {
3031 p += *p == '.';
3032 break;
3033 }
3034 }
3035
3036 v = (v << 8) | c;
3037 }
3038
3039 return v;
2989} 3040}
2990 3041
2991inline_size void 3042inline_size void
2992check_2625 (EV_P) 3043ev_check_2625 (EV_P)
2993{ 3044{
2994 /* kernels < 2.6.25 are borked 3045 /* kernels < 2.6.25 are borked
2995 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3046 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2996 */ 3047 */
2997 struct utsname buf; 3048 if (ev_linux_version () < 0x020619)
2998 int major, minor, micro;
2999
3000 if (uname (&buf))
3001 return;
3002
3003 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
3004 return;
3005
3006 if (major < 2
3007 || (major == 2 && minor < 6)
3008 || (major == 2 && minor == 6 && micro < 25))
3009 return; 3049 return;
3010 3050
3011 fs_2625 = 1; 3051 fs_2625 = 1;
3012} 3052}
3013 3053
… …
3028 if (fs_fd != -2) 3068 if (fs_fd != -2)
3029 return; 3069 return;
3030 3070
3031 fs_fd = -1; 3071 fs_fd = -1;
3032 3072
3033 check_2625 (EV_A); 3073 ev_check_2625 (EV_A);
3034 3074
3035 fs_fd = infy_newfd (); 3075 fs_fd = infy_newfd ();
3036 3076
3037 if (fs_fd >= 0) 3077 if (fs_fd >= 0)
3038 { 3078 {
… …
3423 3463
3424 ev_io_stop (EV_A_ &w->io); 3464 ev_io_stop (EV_A_ &w->io);
3425 ev_prepare_stop (EV_A_ &w->prepare); 3465 ev_prepare_stop (EV_A_ &w->prepare);
3426 ev_fork_stop (EV_A_ &w->fork); 3466 ev_fork_stop (EV_A_ &w->fork);
3427 3467
3468 ev_stop (EV_A_ (W)w);
3469
3428 EV_FREQUENT_CHECK; 3470 EV_FREQUENT_CHECK;
3429} 3471}
3430#endif 3472#endif
3431 3473
3432#if EV_FORK_ENABLE 3474#if EV_FORK_ENABLE

Diff Legend

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