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.331 by root, Tue Mar 9 08:55: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 */
… …
402# endif 404# endif
403# endif 405# endif
404# ifdef __cplusplus 406# ifdef __cplusplus
405extern "C" { 407extern "C" {
406# endif 408# endif
407int eventfd (unsigned int initval, int flags); 409int (eventfd) (unsigned int initval, int flags);
408# ifdef __cplusplus 410# ifdef __cplusplus
409} 411}
410# endif 412# endif
411#endif 413#endif
412 414
… …
523# include "ev_win32.c" 525# include "ev_win32.c"
524#endif 526#endif
525 527
526/*****************************************************************************/ 528/*****************************************************************************/
527 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
528static void (*syserr_cb)(const char *msg); 538static void (*syserr_cb)(const char *msg);
529 539
530void 540void
531ev_set_syserr_cb (void (*cb)(const char *msg)) 541ev_set_syserr_cb (void (*cb)(const char *msg))
532{ 542{
… …
541 551
542 if (syserr_cb) 552 if (syserr_cb)
543 syserr_cb (msg); 553 syserr_cb (msg);
544 else 554 else
545 { 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
546 perror (msg); 564 perror (msg);
565#endif
547 abort (); 566 abort ();
548 } 567 }
549} 568}
550 569
551static void * 570static void *
… …
576{ 595{
577 ptr = alloc (ptr, size); 596 ptr = alloc (ptr, size);
578 597
579 if (!ptr && size) 598 if (!ptr && size)
580 { 599 {
600#if EV_AVOID_STDIO
601 ev_printerr ("libev: memory allocation failed, aborting.\n");
602#else
581 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 603 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
604#endif
582 abort (); 605 abort ();
583 } 606 }
584 607
585 return ptr; 608 return ptr;
586} 609}
… …
2507 2530
2508 if (expect_false (ev_is_active (w))) 2531 if (expect_false (ev_is_active (w)))
2509 return; 2532 return;
2510 2533
2511 assert (("libev: ev_io_start called with negative fd", fd >= 0)); 2534 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)))); 2535 assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2513 2536
2514 EV_FREQUENT_CHECK; 2537 EV_FREQUENT_CHECK;
2515 2538
2516 ev_start (EV_A_ (W)w, 1); 2539 ev_start (EV_A_ (W)w, 1);
2517 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2540 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
… …
2587 timers [active] = timers [timercnt + HEAP0]; 2610 timers [active] = timers [timercnt + HEAP0];
2588 adjustheap (timers, timercnt, active); 2611 adjustheap (timers, timercnt, active);
2589 } 2612 }
2590 } 2613 }
2591 2614
2592 EV_FREQUENT_CHECK;
2593
2594 ev_at (w) -= mn_now; 2615 ev_at (w) -= mn_now;
2595 2616
2596 ev_stop (EV_A_ (W)w); 2617 ev_stop (EV_A_ (W)w);
2618
2619 EV_FREQUENT_CHECK;
2597} 2620}
2598 2621
2599void noinline 2622void noinline
2600ev_timer_again (EV_P_ ev_timer *w) 2623ev_timer_again (EV_P_ ev_timer *w)
2601{ 2624{
… …
2680 periodics [active] = periodics [periodiccnt + HEAP0]; 2703 periodics [active] = periodics [periodiccnt + HEAP0];
2681 adjustheap (periodics, periodiccnt, active); 2704 adjustheap (periodics, periodiccnt, active);
2682 } 2705 }
2683 } 2706 }
2684 2707
2685 EV_FREQUENT_CHECK;
2686
2687 ev_stop (EV_A_ (W)w); 2708 ev_stop (EV_A_ (W)w);
2709
2710 EV_FREQUENT_CHECK;
2688} 2711}
2689 2712
2690void noinline 2713void noinline
2691ev_periodic_again (EV_P_ ev_periodic *w) 2714ev_periodic_again (EV_P_ ev_periodic *w)
2692{ 2715{
… …
2859#define MIN_STAT_INTERVAL 0.1074891 2882#define MIN_STAT_INTERVAL 0.1074891
2860 2883
2861static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2884static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2862 2885
2863#if EV_USE_INOTIFY 2886#if EV_USE_INOTIFY
2864# define EV_INOTIFY_BUFSIZE 8192 2887
2888/* the * 2 is to allow for alignment padding, which for some reason is >> 8 */
2889# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
2865 2890
2866static void noinline 2891static void noinline
2867infy_add (EV_P_ ev_stat *w) 2892infy_add (EV_P_ ev_stat *w)
2868{ 2893{
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); 2894 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 3003
2979static void 3004static void
2980infy_cb (EV_P_ ev_io *w, int revents) 3005infy_cb (EV_P_ ev_io *w, int revents)
2981{ 3006{
2982 char buf [EV_INOTIFY_BUFSIZE]; 3007 char buf [EV_INOTIFY_BUFSIZE];
2983 struct inotify_event *ev = (struct inotify_event *)buf;
2984 int ofs; 3008 int ofs;
2985 int len = read (fs_fd, buf, sizeof (buf)); 3009 int len = read (fs_fd, buf, sizeof (buf));
2986 3010
2987 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 3011 for (ofs = 0; ofs < len; )
3012 {
3013 struct inotify_event *ev = (struct inotify_event *)(buf + ofs);
2988 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3014 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3015 ofs += sizeof (struct inotify_event) + ev->len;
3016 }
3017}
3018
3019inline_size unsigned int
3020ev_linux_version (void)
3021{
3022 struct utsname buf;
3023 unsigned int v;
3024 int i;
3025 char *p = buf.release;
3026
3027 if (uname (&buf))
3028 return 0;
3029
3030 for (i = 3+1; --i; )
3031 {
3032 unsigned int c = 0;
3033
3034 for (;;)
3035 {
3036 if (*p >= '0' && *p <= '9')
3037 c = c * 10 + *p++ - '0';
3038 else
3039 {
3040 p += *p == '.';
3041 break;
3042 }
3043 }
3044
3045 v = (v << 8) | c;
3046 }
3047
3048 return v;
2989} 3049}
2990 3050
2991inline_size void 3051inline_size void
2992check_2625 (EV_P) 3052ev_check_2625 (EV_P)
2993{ 3053{
2994 /* kernels < 2.6.25 are borked 3054 /* kernels < 2.6.25 are borked
2995 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3055 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2996 */ 3056 */
2997 struct utsname buf; 3057 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; 3058 return;
3010 3059
3011 fs_2625 = 1; 3060 fs_2625 = 1;
3012} 3061}
3013 3062
… …
3028 if (fs_fd != -2) 3077 if (fs_fd != -2)
3029 return; 3078 return;
3030 3079
3031 fs_fd = -1; 3080 fs_fd = -1;
3032 3081
3033 check_2625 (EV_A); 3082 ev_check_2625 (EV_A);
3034 3083
3035 fs_fd = infy_newfd (); 3084 fs_fd = infy_newfd ();
3036 3085
3037 if (fs_fd >= 0) 3086 if (fs_fd >= 0)
3038 { 3087 {
… …
3423 3472
3424 ev_io_stop (EV_A_ &w->io); 3473 ev_io_stop (EV_A_ &w->io);
3425 ev_prepare_stop (EV_A_ &w->prepare); 3474 ev_prepare_stop (EV_A_ &w->prepare);
3426 ev_fork_stop (EV_A_ &w->fork); 3475 ev_fork_stop (EV_A_ &w->fork);
3427 3476
3477 ev_stop (EV_A_ (W)w);
3478
3428 EV_FREQUENT_CHECK; 3479 EV_FREQUENT_CHECK;
3429} 3480}
3430#endif 3481#endif
3431 3482
3432#if EV_FORK_ENABLE 3483#if EV_FORK_ENABLE

Diff Legend

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