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

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.72 by root, Tue Sep 10 03:08:03 2002 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 ();
 package conn;
 use Socket;
 use HTTP::Date;
 use Convert::Scalar 'weaken';
-use Linux::AIO;
+use IO::AIO;
-Linux::AIO::min_parallel $::AIO_PARALLEL;
+IO::AIO::min_parallel $::AIO_PARALLEL;
-Event->io(fd => Linux::AIO::poll_fileno,
+Event->io (fd => IO::AIO::poll_fileno,
-          poll => 'r', async => 1,
+           poll => 'r', async => 1,
-          cb => \&Linux::AIO::poll_cb);
+           cb => \&IO::AIO::poll_cb);
 our %conn; # $conn{ip}{self} => connobj
 our %uri;  # $uri{ip}{uri}{self}
 our %blocked;
 our %mimetype;
 sub DESTROY {
    #my $self = shift;
    $::conns--;
 }
+sub prune_cache {
+   my $hash = $_[0];
+   for (keys %$hash) {
+      if (ref $hash->{$_} eq HASH::) {
+         prune_cache($hash->{$_});
+         unless (scalar keys %{$hash->{$_}}) {
+            delete $hash->{$_};
+            $d2++;
+         }
+      }
+   }
+}
+sub prune_caches {
+   prune_cache \%conn;
+   prune_cache \%uri;
+   for (keys %blocked) {
+      delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
+   }
+}
+Event->timer(interval => 60, cb => \&prune_caches);
 sub slog {
    my $self = shift;
    main::slog($_[0], "$self->{remote_id}> $_[1]");
 }
    my $self = shift;
    my $idx = $self->diridx;
    $self->response(200, "ok",
          {
-            "Content-Type"   => "text/html",
+            "Content-Type"   => "text/html; charset=utf-8",
             "Content-Length" => length $idx,
             "Last-Modified"  => time2str ($self->{stat}[9]),
          },
          $idx);
 }
 sub handle_file {
    my ($self, $queue, $tbf) = @_;
    my $length = $self->{stat}[7];
    my $hdr = {
-      "Last-Modified"  => time2str ((stat _)[9]),
+      "Last-Modified" => time2str ((stat _)[9]),
+      "Accept-Ranges" => "bytes",
    };
    my @code = (200, "ok");
    my ($l, $h);
          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;
+1

Diff Legend

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

Comparing Coro/myhttpd/httpd.pl (file contents): Revision 1.72 by root, Tue Sep 10 03:08:03 2002 UTC vs. Revision 1.79 by root, Fri Dec 1 03:53:33 2006 UTC

Diff Legend

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.72 by root, Tue Sep 10 03:08:03 2002 UTC vs.
Revision 1.79 by root, Fri Dec 1 03:53:33 2006 UTC