--- EV/Makefile.PL	2007/11/06 17:20:42	1.16
+++ EV/Makefile.PL	2012/02/04 20:12:17	1.52
@@ -1,9 +1,9 @@
-use 5.006;
+use 5.008002;
 
+use strict qw(vars subs);
 use Config;
 use ExtUtils::MakeMaker;
 
-
 unless (-e "libev/ev_epoll.c") {
    print <<EOF;
 
@@ -19,9 +19,9 @@
 
 print <<EOF;
 
-
 *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
+
 Welcome to EV configuration. If you are in a hurry, just press return here
 and hope for the best. The defaults should usually do.
 
@@ -33,99 +33,242 @@
 
 print <<EOF;
 
-
 *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
+
 POSIX optionally offers support for a monotonic clock source. EV
-can take advantage of this clock source to detect time jumps
+can take advantage of this clock source to detect time jumps more
 reliably. Unfortunately, some systems are bound to be broken, so you can
 disable this here: you can completely disable the detection and use of
 the monotonic clock by answering 'n' here. Support for this clock type
-will otherwise be autodetected at both compile- and runtime.
+will otherwise be autodetected at both compile- and runtime. (this setting
+currently affects the use of nanosleep over select as well).
 
 EOF
 
-if (prompt ("Enable optional support for CLOCK_MONOTONIC (y/n)?", "y") =~ /[yY]/) {
-   $DEFINE .= " -DEV_USE_MONOTONIC";
-}
+my $DEFINE .= " -DEV_USE_MONOTONIC=" . (0 + (prompt ("Enable optional support for CLOCK_MONOTONIC (y/n)?", "y") =~ /[yY]/));
 
 print <<EOF;
 
-
 *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
+
 POSIX optionally offers support for a (potentially) high-resolution
 realtime clock interface. In a good implementation, using it is faster
 than the normal method of using gettimeofday. Unfortunately, this option
-is also bound to be broken on some systems, so you can disable use and
-probing of this feature altogether here. Otherwise support for this clock
-type will be autodetected at compiletime.
+is also bound to be broken on some systems, and current EV versions do not
+actually call gettimeofday very often, so it defaults to no.
 
 EOF
 
-if (prompt ("Prefer clock_gettime (CLOCK_REALTIME) over gettimeofday (y/n)?", "y") !~ /[yY]/) {
-   $DEFINE .= " -DEV_USE_REALTIME=0";
-}
+$DEFINE .= " -DEV_USE_REALTIME=" . (0 + (prompt ("Prefer clock_gettime (CLOCK_REALTIME) over gettimeofday (y/n)?", "n") =~ /[yY]/));
 
 print <<EOF;
 
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
+EV can use various backends with various portability issues. The select
+backend is the most portable and makes for a good fallback, but it can be
+limited to a low number of file descriptors and/or might not compile. If
+you have problems with compiling ev_select.c, you might try to play around
+with disabling it here, or forcing it to use the fd_set provided by your
+OS, via the next question. I highly recommend keeping it in.
+
+EOF
+
+if (prompt ("Enable select backend (y/n)?", "y") =~ /[yY]/) {
+   $DEFINE .= " -DEV_USE_SELECT=1";
+
+   print <<EOF;
 
 *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
-EV by default uses select, which makes it hard to write efficient servers,
-especially if the number of active conencitons is much lower than the open
-ones. GNU/Linux systems have a more scalable method called "epoll", which
-EV can use. For this to work, both your kernel and glibc have to support
-epoll, but if you can compile it, the detection will be done at runtime,
-and EV will safely fall back to using select when epoll isn't available.
-If unsure, accept the default.
+
+The select backend can operate in two modes. One uses the system-provided
+fd_set and is usually limited to 1024 file descriptors (64 on windows),
+the other requires your header files to define NFDBITS and declare a
+suitable fd_mask type. If you run into problems compiling ev_select.c, you
+can try forcing the use of the system fd_set here.
 
 EOF
 
-if (prompt ("Enable epoll backend (y/n)?", (-e "/usr/include/sys/epoll.h") ? "y" : "n") =~ /[yY]/) {
-   $DEFINE .= " -DEV_USE_EPOLL";
+   if (prompt ("Force use of system fd_set for select backend (y/n)?", "n") =~ /[yY]/) {
+      $DEFINE .= " -DEV_SELECT_USE_FD_SET";
+   } 
+} else {
+   $DEFINE .= " -DEV_USE_SELECT=0";
 } 
 
 print <<EOF;
 
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
+The second very portable backend is poll(2). It does not exist on windows
+and various versions of Mac OS X (and on the other versions it simply
+doesn't work), but works basically everywhere else. It is recommended to use
+the default here unless you run into compile problems in ev_poll.c.
+
+EOF
+
+$DEFINE .= " -DEV_USE_POLL=" . (0 + (prompt ("Enable poll backend (y/n)?", (-e "/usr/include/poll.h") ? "y" : "n") =~ /[yY]/));
+
+print <<EOF;
 
 *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
+
+Select and poll make it hard to write efficient servers, especially if the
+number of active connections is much lower than the watched ones. GNU/Linux
+systems have a more scalable method called "epoll", which EV can use. For
+this to work, both your kernel and glibc have to support epoll, but if you
+can compile it, the detection will be done at runtime, and EV will safely
+fall back to using select when epoll isn't available. If unsure, accept
+the default.
+
+EOF
+
+my $can_epoll = -e "/usr/include/sys/epoll.h";
+$can_epoll = $ENV{EV_EPOLL} if exists $ENV{EV_EPOLL};
+$DEFINE .= " -DEV_USE_EPOLL=" . (0 + (prompt ("Enable epoll backend (y/n)?", $can_epoll ? "y" : "n") =~ /[yY]/));
+
+print <<EOF;
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
 Similarly to the epoll backend above, EV can take advantage of kqueue on
-many BSD systems (it seems to be broken on Mac OS X though). The kqueue
-backend has not been tested, however, so it is disabled by default. Please
-test (and preferably fix) the kqueue backend when you have a machine
-supporting it.  Support for kqueue will be detected at runtime, with a
+many BSD systems. Support for kqueue will be detected at runtime, with a
 safe fallback to other methods when it cannot be used.
 
+Note that kqueue is broken on most operating systems, so by default it
+won't be used on many platforms, but you can still create your own event
+loop with kqueue backend if you ask specifically for it.
+
+Here is what we know:
+
+NetBSD:  partially working in at least 3.1 and later. Yeah! :)
+FreeBSD: broken on at least 6.2-STABLE, spotty in later versions,
+         sockets *likely* work, ptys definitely don't.
+OpenBSD: reports indicate that it likely doesn't work
+         (similar problems as on FreeBSD).
+OS X:    completely, utterly broken on at least <= 10.6.
+
 EOF
 
-if (prompt ("Enable kqueue backend (y/n)?", (-e "/usr/include/sys/event.h") ? "y" : "n") =~ /[yY]/) {
-   $DEFINE .= " -DEV_USE_KQUEUE";
-} 
+my $can_kqueue = -e "/usr/include/sys/event.h";
+$can_kqueue = $ENV{EV_KQUEUE} if exists $ENV{EV_KQUEUE};
+$DEFINE .= " -DEV_USE_KQUEUE=" . (0 + (prompt ("Enable kqueue backend (y/n)?", $can_kqueue ? "y" : "n") =~ /[yY]/));
 
 print <<EOF;
 
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
+Similarly to the kqueue backend above, EV can take advantage of the
+solaris 10 event port interface. Support for event ports will be detected
+at runtime, with a safe fallback to other methods when it cannot be used.
+
+EOF
+
+$DEFINE .= " -DEV_USE_PORT=" . (0 + (prompt ("Enable event port backend (y/n)?", (-e "/usr/include/sys/port.h") ? "y" : "n") =~ /[yY]/));
+
+print <<EOF;
 
 *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
+
 EV needs the functions pthread_atfork and clock_gettime. On most systems
 you need some special libraries for this (such as -lrt and -lpthread). You
-can specify additional libraries to provide these calls now, or accept the
-default.
+can specify additional libraries to provide these calls (and any other
+required by EV) now, or accept the default.
 
 EOF
 
-$LIBS = prompt "Extra libraries for pthread_atfork and clock_gettime?", "-lpthread -lrt";
+my $solaris_libs = $^O =~ /solaris/i ? "-lsocket -lnsl" : "";
+#my $librt = $^O =~ /linux/i ? "-lpthread" : "-lpthread -lrt";
+my $librt = "-lpthread -lrt";
+my $LIBS = prompt "Extra libraries for pthread_atfork and clock_gettime?", "$librt $solaris_libs";
 
 
 print <<EOF;
 
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
+A backend of a different kind is the Linux inotify(7) interface, which can
+be used to speed up (and reduce resource consumption) of stat watchers. If
+you have the include file and libc support for it, it is usually a good
+idea to enable it, as kernel availability is detected at runtime.
+
+EOF
+
+my $can_inotify = -e "/usr/include/sys/inotify.h";
+$can_inotify = $ENV{EV_INOTIFY} if exists $ENV{EV_INOTIFY};
+$DEFINE .= " -DEV_USE_INOTIFY=" . (0 + (prompt ("Enable inotify support (y/n)?", $can_inotify ? "y" : "n") =~ /[yY]/));
+
+print <<EOF;
 
 *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
 
+
+Another useful bit of functionality is the Linux eventfd, which is useful
+for faster signal handling (don't care) and intra-thread communications
+(more relevant). Kernel support for this will be probed at runtime, but
+your libc must contain the necessary wrapper. Glibc 2.7 and later should
+have this wrapper.
+
 EOF
 
+my $can_eventfd = -e "/usr/include/sys/eventfd.h";
+$can_eventfd = $ENV{EV_EVENTFD} if exists $ENV{EV_EVENTFD};
+$DEFINE .= " -DEV_USE_EVENTFD=" . (0 + (prompt ("Enable linux eventfd support (y/n)?", $can_eventfd ? "y" : "n") =~ /[yY]/));
+
+print <<EOF;
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
+Another sometimes useful bit of functionality is the Linux signalfd, which
+is useful for faster signal handling (don't care). Kernel support for
+this will be probed at runtime, but your libc must contain the necessary
+wrapper. Glibc 2.7 and later should have this wrapper.
+
+EOF
+
+my $can_signalfd = -e "/usr/include/sys/signalfd.h";
+$can_signalfd = $ENV{EV_SIGNALFD} if exists $ENV{EV_SIGNALFD};
+$DEFINE .= " -DEV_USE_SIGNALFD=" . (0 + (prompt ("Enable linux signalfd support (y/n)?", $can_signalfd ? "y" : "n") =~ /[yY]/));
+
+print <<EOF;
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
+Very rarely, people want to tweak EV even more, e.g. to exclude
+or include certain watcher types or backends. This can be done by adding
+extra -D options here, or via the EV_EXTRA_DEFS environment variable.
+
+For example, if you run into compile problems because of missing memory
+fences (or you just want extra performance), you can tell EV to not support
+smp and threads via -DEV_NO_THREADS.
+
+Normal persons just press enter.
+
+EOF
+
+$DEFINE .= " " . prompt "Any extra -D options?", "$ENV{EV_EXTRA_DEFS}";
+
+print <<EOF;
+
+*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***
+
+
+EOF
+
+my @anyevent = eval { require AnyEvent; $AnyEvent::VERSION < 5.29 } ? (AnyEvent => 5.29) : ();
+
 WriteMakefile(
     dist	=> {
 	            PREOP	=> 'pod2text EV.pm | tee README >$(DISTVNAME)/README; chmod -R u=rwX,go=rX . ;',
@@ -134,22 +277,30 @@
 	           },
     depend => {
        "EV.c" => "EV/EVAPI.h "
-               . "libev/ev.c libev/ev.h libev/ev_epoll.c libev/ev_select.c "
-               . "libev/event.h libev/event.c libev/evdns.h libev/evdns.c",
+               . "libev/ev.c libev/ev.h libev/ev_epoll.c libev/ev_select.c libev/ev_kqueue.c libev/ev_poll.c "
+               . "libev/ev_vars.h libev/ev_wrap.h",
     },
     INC       => "-Ilibev",
     DEFINE    => "$DEFINE",
     NAME => "EV",
     LIBS => [$LIBS],
+    PREREQ_PM => {
+       @anyevent,
+       "common::sense" => 0,
+    },
     VERSION_FROM => "EV.pm",
     PM           => {
     		    'EV.pm'		=> '$(INST_LIBDIR)/EV.pm',
-    		    'EV/AnyEvent.pm'	=> '$(INST_LIBDIR)/EV/AnyEvent.pm',
-                    'EV/DNS.pm'		=> '$(INST_LIBDIR)/EV/DNS.pm',
     		    'EV/EVAPI.h'	=> '$(INST_LIBDIR)/EV/EVAPI.h',
     		    'EV/MakeMaker.pm'	=> '$(INST_LIBDIR)/EV/MakeMaker.pm',
     		    'libev/ev.h'	=> '$(INST_LIBDIR)/EV/ev.h',
+    		    'libev/ev.pod'	=> '$(INST_LIBDIR)/EV/libev.pod',
                  },
+    MAN3PODS => {
+                    'EV.pm'           => '$(INST_MAN3DIR)/EV.$(MAN3EXT)',
+                    'EV/MakeMaker.pm' => '$(INST_MAN3DIR)/EV::MakeMaker.$(MAN3EXT)',
+                    'libev/ev.pod'    => '$(INST_MAN3DIR)/EV::libev.$(MAN3EXT)',
+                },
 );