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.63 by root, Wed Jan 23 03:07:05 2002 UTC vs.
Revision 1.77 by root, Sat Sep 17 20:21:11 2005 UTC

… …
54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
55our $httpevent = new Coro::Signal; 55our $httpevent = new Coro::Signal;
56 56
57our $queue_file = new transferqueue $MAX_TRANSFERS; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10; 58our $queue_index = new transferqueue 10;
59
60our $tbf_top = new tbf rate => $TBF_RATE || 100000;
61
62my $unused_bytes = 0;
63my $unused_last = time;
64
65sub unused_bandwidth {
66 $unused_bytes += $_[0];
67 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
68 $unused_last = $NOW;
69 $unused_bytes = 0;
70 $queue_file->force_wake_next;
71 slog 1, "forced filetransfer due to unused bandwidth";
72 }
73}
59 74
60my @newcons; 75my @newcons;
61my @pool; 76my @pool;
62 77
63# one "execution thread" 78# one "execution thread"
… …
95 if (@pool) { 110 if (@pool) {
96 (pop @pool)->ready; 111 (pop @pool)->ready;
97 } else { 112 } else {
98 async \&handler; 113 async \&handler;
99 } 114 }
100
101 } 115 }
102 }; 116 };
103} 117}
104 118
105my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
… …
125package conn; 139package conn;
126 140
127use Socket; 141use Socket;
128use HTTP::Date; 142use HTTP::Date;
129use Convert::Scalar 'weaken'; 143use Convert::Scalar 'weaken';
130use Linux::AIO; 144use IO::AIO;
131 145
132Linux::AIO::min_parallel $::AIO_PARALLEL; 146IO::AIO::min_parallel $::AIO_PARALLEL;
133 147
134Event->io(fd => Linux::AIO::poll_fileno, 148Event->io(fd => IO::AIO::poll_fileno,
135 poll => 'r', async => 1, 149 poll => 'r', async => 1,
136 cb => \&Linux::AIO::poll_cb); 150 cb => \&IO::AIO::poll_cb);
137 151
138our %conn; # $conn{ip}{self} => connobj 152our %conn; # $conn{ip}{self} => connobj
139our %uri; # $uri{ip}{uri}{self} 153our %uri; # $uri{ip}{uri}{self}
140our %blocked; 154our %blocked;
141our %mimetype; 155our %mimetype;
… …
179sub DESTROY { 193sub DESTROY {
180 #my $self = shift; 194 #my $self = shift;
181 $::conns--; 195 $::conns--;
182} 196}
183 197
198sub prune_cache {
199 my $hash = $_[0];
200
201 for (keys %$hash) {
202 if (ref $hash->{$_} eq HASH::) {
203 prune_cache($hash->{$_});
204 unless (scalar keys %{$hash->{$_}}) {
205 delete $hash->{$_};
206 $d2++;
207 }
208 }
209 }
210}
211
212sub prune_caches {
213 prune_cache \%conn;
214 prune_cache \%uri;
215
216 for (keys %blocked) {
217 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
218 }
219}
220
221Event->timer(interval => 60, cb => \&prune_caches);
222
184sub slog { 223sub slog {
185 my $self = shift; 224 my $self = shift;
186 main::slog($_[0], "$self->{remote_id}> $_[1]"); 225 main::slog($_[0], "$self->{remote_id}> $_[1]");
187} 226}
188 227
… …
205 } 244 }
206 } 245 }
207 246
208 if ($self->{method} ne "HEAD" 247 if ($self->{method} ne "HEAD"
209 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/ 248 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
249 && 400 < length $content
210 && $hdr->{"Content-Length"} == length $content 250 && $hdr->{"Content-Length"} == length $content
211 && !exists $hdr->{"Content-Encoding"} 251 && !exists $hdr->{"Content-Encoding"}
212 ) { 252 ) {
213 my $orig = length $content; 253 my $orig = length $content;
214 $hdr->{"Content-Encoding"} = "gzip"; 254 $hdr->{"Content-Encoding"} = "gzip";
… …
216 $hdr->{"Content-Length"} = length $content; 256 $hdr->{"Content-Length"} = length $content;
217 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig); 257 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
218 } 258 }
219 259
220 $res .= "Date: $HTTP_NOW\015\012"; 260 $res .= "Date: $HTTP_NOW\015\012";
261 $res .= "Server: $::NAME\015\012";
221 262
222 while (my ($h, $v) = each %$hdr) { 263 while (my ($h, $v) = each %$hdr) {
223 $res .= "$h: $v\015\012" 264 $res .= "$h: $v\015\012"
224 } 265 }
225 $res .= "\015\012"; 266 $res .= "\015\012";
226 267
227 $res .= $content if defined $content and $self->{method} ne "HEAD"; 268 $res .= $content if defined $content and $self->{method} ne "HEAD";
228 269
229 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 270 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
230 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ. 271 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
231 " \"$self->{h}{referer}\"\n"; 272 " \"$self->{h}{referer}\"\n";
232 273
233 print $accesslog $log if $accesslog; 274 print $::accesslog $log if $::accesslog;
234 print STDERR $log; 275 print STDERR $log;
235 276
236 $self->{written} += 277 $tbf_top->request(length $res, 1e6);
237 print {$self->{fh}} $res; 278 $self->{written} += print {$self->{fh}} $res;
238} 279}
239 280
240sub err { 281sub err {
241 my $self = shift; 282 my $self = shift;
242 my ($code, $msg, $hdr, $content) = @_; 283 my ($code, $msg, $hdr, $content) = @_;
… …
297 my (%hdr, $h, $v); 338 my (%hdr, $h, $v);
298 339
299 $hdr{lc $1} .= ",$2" 340 $hdr{lc $1} .= ",$2"
300 while $req =~ /\G 341 while $req =~ /\G
301 ([^:\000-\040]+): 342 ([^:\000-\040]+):
302 [\010\040]* 343 [\011\040]*
303 ((?: [^\015\012]+ | \015\012[\010\040] )*) 344 ((?: [^\015\012]+ | \015\012[\011\040] )*)
304 \015\012 345 \015\012
305 /gxc; 346 /gxc;
306 347
307 $req =~ /\G\015\012$/ 348 $req =~ /\G\015\012$/
308 or $self->err(400, "bad request"); 349 or $self->err(400, "bad request");
… …
456 or $self->err(304, "not modified"); 497 or $self->err(304, "not modified");
457 498
458 if (-r "$path/index.html") { 499 if (-r "$path/index.html") {
459 # replace directory "size" by index.html filesize 500 # replace directory "size" by index.html filesize
460 $self->{stat} = [stat ($self->{path} .= "/index.html")]; 501 $self->{stat} = [stat ($self->{path} .= "/index.html")];
461 $self->handle_file($queue_index); 502 $self->handle_file($queue_index, $tbf_top);
462 } else { 503 } else {
463 $self->handle_dir; 504 $self->handle_dir;
464 } 505 }
465 } 506 }
466 } elsif (-f _ && -r _) { 507 } elsif (-f _ && -r _) {
… …
475 $httpevent->wait; 516 $httpevent->wait;
476 } 517 }
477 } 518 }
478 } 519 }
479 520
480 $self->handle_file($queue_file); 521 $self->handle_file($queue_file, $tbf_top);
481 } else { 522 } else {
482 $self->err(404, "not found"); 523 $self->err(404, "not found");
483 } 524 }
484 } 525 }
485} 526}
… …
488 my $self = shift; 529 my $self = shift;
489 my $idx = $self->diridx; 530 my $idx = $self->diridx;
490 531
491 $self->response(200, "ok", 532 $self->response(200, "ok",
492 { 533 {
493 "Content-Type" => "text/html", 534 "Content-Type" => "text/html; charset=utf-8",
494 "Content-Length" => length $idx, 535 "Content-Length" => length $idx,
495 "Last-Modified" => time2str ($self->{stat}[9]), 536 "Last-Modified" => time2str ($self->{stat}[9]),
496 }, 537 },
497 $idx); 538 $idx);
498} 539}
499 540
500sub handle_file { 541sub handle_file {
501 my ($self, $queue) = @_; 542 my ($self, $queue, $tbf) = @_;
502 my $length = $self->{stat}[7]; 543 my $length = $self->{stat}[7];
503 my $hdr = { 544 my $hdr = {
504 "Last-Modified" => time2str ((stat _)[9]), 545 "Last-Modified" => time2str ((stat _)[9]),
546 "Accept-Ranges" => "bytes",
505 }; 547 };
506 548
507 my @code = (200, "ok"); 549 my @code = (200, "ok");
508 my ($l, $h); 550 my ($l, $h);
509 551
… …
552 594
553 $self->response(@code, $hdr, ""); 595 $self->response(@code, $hdr, "");
554 596
555 if ($self->{method} eq "GET") { 597 if ($self->{method} eq "GET") {
556 $self->{time} = $::NOW; 598 $self->{time} = $::NOW;
599 $self->{written} = 0;
557 600
558 my $current = $Coro::current; 601 my $current = $Coro::current;
559 602
560 my ($fh, $buf, $r); 603 my ($fh, $buf, $r);
561 604
… …
577 while ($h > 0) { 620 while ($h > 0) {
578 unless ($locked) { 621 unless ($locked) {
579 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 622 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
580 $bufsize = $::BUFSIZE; 623 $bufsize = $::BUFSIZE;
581 $self->{time} = $::NOW; 624 $self->{time} = $::NOW;
625 $self->{written} = 0;
582 } 626 }
583 } 627 }
584 628
585 if ($blocked{$self->{remote_id}}) { 629 if ($blocked{$self->{remote_id}}) {
586 $self->{h}{connection} = "close"; 630 $self->{h}{connection} = "close";
… …
597 Coro::ready($current); 641 Coro::ready($current);
598 }); 642 });
599 &Coro::schedule; 643 &Coro::schedule;
600 last unless $r; 644 last unless $r;
601 } 645 }
646
647 $tbf->request(length $buf);
602 my $w = syswrite $self->{fh}, $buf 648 my $w = syswrite $self->{fh}, $buf
603 or last; 649 or last;
604 $::written += $w; 650 $::written += $w;
605 $self->{written} += $w; 651 $self->{written} += $w;
606 $l += $r; 652 $l += $r;

Diff Legend

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