ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.60 by root, Mon Dec 10 21:18:31 2001 UTC vs.
Revision 1.80 by root, Fri Dec 1 04:18:32 2006 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal; 5use Coro::Signal;
6use Coro::AIO ();
6 7
7use HTTP::Date; 8use HTTP::Date;
8use POSIX (); 9use POSIX ();
10
11use Compress::Zlib ();
9 12
10no utf8; 13no utf8;
11use bytes; 14use bytes;
12 15
13# at least on my machine, this thingy serves files 16# at least on my machine, this thingy serves files
19our $accesslog; 22our $accesslog;
20our $errorlog; 23our $errorlog;
21 24
22our $NOW; 25our $NOW;
23our $HTTP_NOW; 26our $HTTP_NOW;
27
28our $ERROR_LOG;
29our $ACCESS_LOG;
24 30
25Event->timer(interval => 1, hard => 1, cb => sub { 31Event->timer(interval => 1, hard => 1, cb => sub {
26 $NOW = time; 32 $NOW = time;
27 $HTTP_NOW = time2str $NOW; 33 $HTTP_NOW = time2str $NOW;
28})->now; 34})->now;
52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 58our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
53our $httpevent = new Coro::Signal; 59our $httpevent = new Coro::Signal;
54 60
55our $queue_file = new transferqueue $MAX_TRANSFERS; 61our $queue_file = new transferqueue $MAX_TRANSFERS;
56our $queue_index = new transferqueue 10; 62our $queue_index = new transferqueue 10;
63
64our $tbf_top = new tbf rate => $TBF_RATE || 100000;
65
66my $unused_bytes = 0;
67my $unused_last = time;
68
69sub unused_bandwidth {
70 $unused_bytes += $_[0];
71 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
72 $unused_last = $NOW;
73 $unused_bytes = 0;
74 $queue_file->force_wake_next;
75 slog 1, "forced filetransfer due to unused bandwidth";
76 }
77}
57 78
58my @newcons; 79my @newcons;
59my @pool; 80my @pool;
60 81
61# one "execution thread" 82# one "execution thread"
93 if (@pool) { 114 if (@pool) {
94 (pop @pool)->ready; 115 (pop @pool)->ready;
95 } else { 116 } else {
96 async \&handler; 117 async \&handler;
97 } 118 }
98
99 } 119 }
100 }; 120 };
101} 121}
102 122
103my $http_port = new Coro::Socket 123my $http_port = new Coro::Socket
120 listen_on $http_port; 140 listen_on $http_port;
121} 141}
122 142
123package conn; 143package conn;
124 144
145use strict;
146use bytes;
147
125use Socket; 148use Socket;
126use HTTP::Date; 149use HTTP::Date;
127use Convert::Scalar 'weaken'; 150use Convert::Scalar 'weaken';
128use Linux::AIO; 151use IO::AIO;
129 152
130Linux::AIO::min_parallel $::AIO_PARALLEL; 153IO::AIO::min_parallel $::AIO_PARALLEL;
131 154
132Event->io(fd => Linux::AIO::poll_fileno, 155Event->io (fd => IO::AIO::poll_fileno,
133 poll => 'r', async => 1, 156 poll => 'r', async => 1,
134 cb => \&Linux::AIO::poll_cb); 157 cb => \&IO::AIO::poll_cb);
135 158
136our %conn; # $conn{ip}{self} => connobj 159our %conn; # $conn{ip}{self} => connobj
137our %uri; # $uri{ip}{uri}{self} 160our %uri; # $uri{ip}{uri}{self}
138our %blocked; 161our %blocked;
139our %mimetype; 162our %mimetype;
177sub DESTROY { 200sub DESTROY {
178 #my $self = shift; 201 #my $self = shift;
179 $::conns--; 202 $::conns--;
180} 203}
181 204
205sub prune_cache {
206 my $hash = $_[0];
207
208 for (keys %$hash) {
209 if (ref $hash->{$_} eq HASH::) {
210 prune_cache($hash->{$_});
211 unless (scalar keys %{$hash->{$_}}) {
212 delete $hash->{$_};
213 }
214 }
215 }
216}
217
218sub prune_caches {
219 prune_cache \%conn;
220 prune_cache \%uri;
221
222 for (keys %blocked) {
223 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
224 }
225}
226
227Event->timer(interval => 60, cb => \&prune_caches);
228
182sub slog { 229sub slog {
183 my $self = shift; 230 my $self = shift;
184 main::slog($_[0], "$self->{remote_id}> $_[1]"); 231 main::slog($_[0], "$self->{remote_id}> $_[1]");
185} 232}
186 233
187sub response { 234sub response {
188 my ($self, $code, $msg, $hdr, $content) = @_; 235 my ($self, $code, $msg, $hdr, $content) = @_;
189 my $res = "HTTP/1.1 $code $msg\015\012"; 236 my $res = "HTTP/1.1 $code $msg\015\012";
237 my $GZ = "";
190 238
191 if (exists $hdr->{Connection}) { 239 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) { 240 if ($hdr->{Connection} =~ /close/) {
193 $self->{h}{connection} = "close" 241 $self->{h}{connection} = "close"
194 } 242 }
200 $self->{h}{connection} = "close" 248 $self->{h}{connection} = "close"
201 } 249 }
202 } 250 }
203 } 251 }
204 252
253 if ($self->{method} ne "HEAD"
254 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
255 && 400 < length $content
256 && $hdr->{"Content-Length"} == length $content
257 && !exists $hdr->{"Content-Encoding"}
258 ) {
259 my $orig = length $content;
260 $hdr->{"Content-Encoding"} = "gzip";
261 $content = Compress::Zlib::memGzip(\$content);
262 $hdr->{"Content-Length"} = length $content;
263 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
264 }
265
205 $res .= "Date: $HTTP_NOW\015\012"; 266 $res .= "Date: $HTTP_NOW\015\012";
267 $res .= "Server: $::NAME\015\012";
206 268
207 while (my ($h, $v) = each %$hdr) { 269 while (my ($h, $v) = each %$hdr) {
208 $res .= "$h: $v\015\012" 270 $res .= "$h: $v\015\012"
209 } 271 }
210 $res .= "\015\012"; 272 $res .= "\015\012";
211 273
212 $res .= $content if defined $content and $self->{method} ne "HEAD"; 274 $res .= $content if defined $content and $self->{method} ne "HEAD";
213 275
214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 276 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 277 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
216 " \"$self->{h}{referer}\"\n"; 278 " \"$self->{h}{referer}\"\n";
217 279
218 print $accesslog $log if $accesslog; 280 print $::accesslog $log if $::accesslog;
219 print STDERR $log; 281 print STDERR $log;
220 282
221 $self->{written} += 283 $tbf_top->request(length $res, 1e6);
222 print {$self->{fh}} $res; 284 $self->{written} += print {$self->{fh}} $res;
223} 285}
224 286
225sub err { 287sub err {
226 my $self = shift; 288 my $self = shift;
227 my ($code, $msg, $hdr, $content) = @_; 289 my ($code, $msg, $hdr, $content) = @_;
282 my (%hdr, $h, $v); 344 my (%hdr, $h, $v);
283 345
284 $hdr{lc $1} .= ",$2" 346 $hdr{lc $1} .= ",$2"
285 while $req =~ /\G 347 while $req =~ /\G
286 ([^:\000-\040]+): 348 ([^:\000-\040]+):
287 [\008\040]* 349 [\011\040]*
288 ((?: [^\015\012]+ | \015\012[\008\040] )*) 350 ((?: [^\015\012]+ | \015\012[\011\040] )*)
289 \015\012 351 \015\012
290 /gxc; 352 /gxc;
291 353
292 $req =~ /\G\015\012$/ 354 $req =~ /\G\015\012$/
293 or $self->err(400, "bad request"); 355 or $self->err(400, "bad request");
441 or $self->err(304, "not modified"); 503 or $self->err(304, "not modified");
442 504
443 if (-r "$path/index.html") { 505 if (-r "$path/index.html") {
444 # replace directory "size" by index.html filesize 506 # replace directory "size" by index.html filesize
445 $self->{stat} = [stat ($self->{path} .= "/index.html")]; 507 $self->{stat} = [stat ($self->{path} .= "/index.html")];
446 $self->handle_file($queue_index); 508 $self->handle_file($queue_index, $tbf_top);
447 } else { 509 } else {
448 $self->handle_dir; 510 $self->handle_dir;
449 } 511 }
450 } 512 }
451 } elsif (-f _ && -r _) { 513 } elsif (-f _ && -r _) {
460 $httpevent->wait; 522 $httpevent->wait;
461 } 523 }
462 } 524 }
463 } 525 }
464 526
465 $self->handle_file($queue_file); 527 $self->handle_file($queue_file, $tbf_top);
466 } else { 528 } else {
467 $self->err(404, "not found"); 529 $self->err(404, "not found");
468 } 530 }
469 } 531 }
470} 532}
473 my $self = shift; 535 my $self = shift;
474 my $idx = $self->diridx; 536 my $idx = $self->diridx;
475 537
476 $self->response(200, "ok", 538 $self->response(200, "ok",
477 { 539 {
478 "Content-Type" => "text/html", 540 "Content-Type" => "text/html; charset=utf-8",
479 "Content-Length" => length $idx, 541 "Content-Length" => length $idx,
480 "Last-Modified" => time2str ($self->{stat}[9]), 542 "Last-Modified" => time2str ($self->{stat}[9]),
481 }, 543 },
482 $idx); 544 $idx);
483} 545}
484 546
485sub handle_file { 547sub handle_file {
486 my ($self, $queue) = @_; 548 my ($self, $queue, $tbf) = @_;
487 my $length = $self->{stat}[7]; 549 my $length = $self->{stat}[7];
488 my $hdr = { 550 my $hdr = {
489 "Last-Modified" => time2str ((stat _)[9]), 551 "Last-Modified" => time2str ((stat _)[9]),
552 "Accept-Ranges" => "bytes",
490 }; 553 };
491 554
492 my @code = (200, "ok"); 555 my @code = (200, "ok");
493 my ($l, $h); 556 my ($l, $h);
494 557
537 600
538 $self->response(@code, $hdr, ""); 601 $self->response(@code, $hdr, "");
539 602
540 if ($self->{method} eq "GET") { 603 if ($self->{method} eq "GET") {
541 $self->{time} = $::NOW; 604 $self->{time} = $::NOW;
605 $self->{written} = 0;
542 606
543 my $current = $Coro::current; 607 my $fh;
544
545 my ($fh, $buf, $r);
546 608
547 open $fh, "<", $self->{path} 609 open $fh, "<", $self->{path}
548 or die "$self->{path}: late open failure ($!)"; 610 or die "$self->{path}: late open failure ($!)";
549 611
550 $h -= $l - 1; 612 $h -= $l - 1;
562 while ($h > 0) { 624 while ($h > 0) {
563 unless ($locked) { 625 unless ($locked) {
564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 626 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
565 $bufsize = $::BUFSIZE; 627 $bufsize = $::BUFSIZE;
566 $self->{time} = $::NOW; 628 $self->{time} = $::NOW;
629 $self->{written} = 0;
567 } 630 }
568 } 631 }
569 632
570 if ($blocked{$self->{remote_id}}) { 633 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close"; 634 $self->{h}{connection} = "close";
572 die bless {}, err::; 635 die bless {}, err::;
573 } 636 }
574 637
575 if (0) { # !AIO 638 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
576 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
577 or last; 639 or last;
578 } else { 640
579 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h), 641 $tbf->request (length $buf);
580 $buf, 0, sub {
581 $r = $_[0];
582 Coro::ready($current);
583 });
584 &Coro::schedule;
585 last unless $r;
586 }
587 my $w = syswrite $self->{fh}, $buf 642 my $w = syswrite $self->{fh}, $buf
588 or last; 643 or last;
589 $::written += $w; 644 $::written += $w;
590 $self->{written} += $w; 645 $self->{written} += $w;
591 $l += $r; 646 $l += $w;
592 } 647 }
593 648
594 close $fh; 649 close $fh;
595 } 650 }
596} 651}
597 652
5981; 6531
654

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines