[ViewVC] Diff of: cvs/Coro/myhttpd/httpd.pl

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.78 by root, Sun Dec 4 19:36:28 2005 UTC vs.
Revision 1.79 by root, Fri Dec 1 03:53:33 2006 UTC

 use Coro;
 use Coro::Semaphore;
 use Coro::Event;
 use Coro::Socket;
 use Coro::Signal;
+use Coro::AIO ();
 use HTTP::Date;
 use POSIX ();
 use Compress::Zlib ();
 use Convert::Scalar 'weaken';
 use IO::AIO;
 IO::AIO::min_parallel $::AIO_PARALLEL;
-Event->io(fd => IO::AIO::poll_fileno,
+Event->io (fd => IO::AIO::poll_fileno,
-          poll => 'r', async => 1,
+           poll => 'r', async => 1,
-          cb => \&IO::AIO::poll_cb);
+           cb => \&IO::AIO::poll_cb);
 our %conn; # $conn{ip}{self} => connobj
 our %uri;  # $uri{ip}{uri}{self}
 our %blocked;
 our %mimetype;
          if ($blocked{$self->{remote_id}}) {
             $self->{h}{connection} = "close";
             die bless {}, err::;
          }
-         if (0) { # !AIO
+         Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), $buf, 0
-            sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
-               or last;
+            or last;
-         } else {
-            aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
-                     $buf, 0, sub {
-                        $r = $_[0];
-                        Coro::ready($current);
-                     });
-            &Coro::schedule;
-            last unless $r;
-         }
-         $tbf->request(length $buf);
+         $tbf->request (length $buf);
          my $w = syswrite $self->{fh}, $buf
             or last;
          $::written += $w;
          $self->{written} += $w;
          $l += $r;
       close $fh;
    }
 }
 1

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