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.77 by root, Sat Sep 17 20:21:11 2005 UTC

… …
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal; 5use Coro::Signal;
6 6
7use HTTP::Date; 7use HTTP::Date;
8use POSIX (); 8use POSIX ();
9
10use Compress::Zlib ();
9 11
10no utf8; 12no utf8;
11use bytes; 13use bytes;
12 14
13# at least on my machine, this thingy serves files 15# at least on my machine, this thingy serves files
… …
52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
53our $httpevent = new Coro::Signal; 55our $httpevent = new Coro::Signal;
54 56
55our $queue_file = new transferqueue $MAX_TRANSFERS; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
56our $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}
57 74
58my @newcons; 75my @newcons;
59my @pool; 76my @pool;
60 77
61# one "execution thread" 78# one "execution thread"
… …
93 if (@pool) { 110 if (@pool) {
94 (pop @pool)->ready; 111 (pop @pool)->ready;
95 } else { 112 } else {
96 async \&handler; 113 async \&handler;
97 } 114 }
98
99 } 115 }
100 }; 116 };
101} 117}
102 118
103my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
… …
123package conn; 139package conn;
124 140
125use Socket; 141use Socket;
126use HTTP::Date; 142use HTTP::Date;
127use Convert::Scalar 'weaken'; 143use Convert::Scalar 'weaken';
128use Linux::AIO; 144use IO::AIO;
129 145
130Linux::AIO::min_parallel $::AIO_PARALLEL; 146IO::AIO::min_parallel $::AIO_PARALLEL;
131 147
132Event->io(fd => Linux::AIO::poll_fileno, 148Event->io(fd => IO::AIO::poll_fileno,
133 poll => 'r', async => 1, 149 poll => 'r', async => 1,
134 cb => \&Linux::AIO::poll_cb); 150 cb => \&IO::AIO::poll_cb);
135 151
136our %conn; # $conn{ip}{self} => connobj 152our %conn; # $conn{ip}{self} => connobj
137our %uri; # $uri{ip}{uri}{self} 153our %uri; # $uri{ip}{uri}{self}
138our %blocked; 154our %blocked;
139our %mimetype; 155our %mimetype;
… …
177sub DESTROY { 193sub DESTROY {
178 #my $self = shift; 194 #my $self = shift;
179 $::conns--; 195 $::conns--;
180} 196}
181 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
182sub slog { 223sub slog {
183 my $self = shift; 224 my $self = shift;
184 main::slog($_[0], "$self->{remote_id}> $_[1]"); 225 main::slog($_[0], "$self->{remote_id}> $_[1]");
185} 226}
186 227
187sub response { 228sub response {
188 my ($self, $code, $msg, $hdr, $content) = @_; 229 my ($self, $code, $msg, $hdr, $content) = @_;
189 my $res = "HTTP/1.1 $code $msg\015\012"; 230 my $res = "HTTP/1.1 $code $msg\015\012";
231 my $GZ = "";
190 232
191 if (exists $hdr->{Connection}) { 233 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) { 234 if ($hdr->{Connection} =~ /close/) {
193 $self->{h}{connection} = "close" 235 $self->{h}{connection} = "close"
194 } 236 }
… …
200 $self->{h}{connection} = "close" 242 $self->{h}{connection} = "close"
201 } 243 }
202 } 244 }
203 } 245 }
204 246
247 if ($self->{method} ne "HEAD"
248 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
249 && 400 < length $content
250 && $hdr->{"Content-Length"} == length $content
251 && !exists $hdr->{"Content-Encoding"}
252 ) {
253 my $orig = length $content;
254 $hdr->{"Content-Encoding"} = "gzip";
255 $content = Compress::Zlib::memGzip(\$content);
256 $hdr->{"Content-Length"} = length $content;
257 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
258 }
259
205 $res .= "Date: $HTTP_NOW\015\012"; 260 $res .= "Date: $HTTP_NOW\015\012";
261 $res .= "Server: $::NAME\015\012";
206 262
207 while (my ($h, $v) = each %$hdr) { 263 while (my ($h, $v) = each %$hdr) {
208 $res .= "$h: $v\015\012" 264 $res .= "$h: $v\015\012"
209 } 265 }
210 $res .= "\015\012"; 266 $res .= "\015\012";
211 267
212 $res .= $content if defined $content and $self->{method} ne "HEAD"; 268 $res .= $content if defined $content and $self->{method} ne "HEAD";
213 269
214 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).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 271 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
216 " \"$self->{h}{referer}\"\n"; 272 " \"$self->{h}{referer}\"\n";
217 273
218 print $accesslog $log if $accesslog; 274 print $::accesslog $log if $::accesslog;
219 print STDERR $log; 275 print STDERR $log;
220 276
221 $self->{written} += 277 $tbf_top->request(length $res, 1e6);
222 print {$self->{fh}} $res; 278 $self->{written} += print {$self->{fh}} $res;
223} 279}
224 280
225sub err { 281sub err {
226 my $self = shift; 282 my $self = shift;
227 my ($code, $msg, $hdr, $content) = @_; 283 my ($code, $msg, $hdr, $content) = @_;
… …
282 my (%hdr, $h, $v); 338 my (%hdr, $h, $v);
283 339
284 $hdr{lc $1} .= ",$2" 340 $hdr{lc $1} .= ",$2"
285 while $req =~ /\G 341 while $req =~ /\G
286 ([^:\000-\040]+): 342 ([^:\000-\040]+):
287 [\008\040]* 343 [\011\040]*
288 ((?: [^\015\012]+ | \015\012[\008\040] )*) 344 ((?: [^\015\012]+ | \015\012[\011\040] )*)
289 \015\012 345 \015\012
290 /gxc; 346 /gxc;
291 347
292 $req =~ /\G\015\012$/ 348 $req =~ /\G\015\012$/
293 or $self->err(400, "bad request"); 349 or $self->err(400, "bad request");
… …
441 or $self->err(304, "not modified"); 497 or $self->err(304, "not modified");
442 498
443 if (-r "$path/index.html") { 499 if (-r "$path/index.html") {
444 # replace directory "size" by index.html filesize 500 # replace directory "size" by index.html filesize
445 $self->{stat} = [stat ($self->{path} .= "/index.html")]; 501 $self->{stat} = [stat ($self->{path} .= "/index.html")];
446 $self->handle_file($queue_index); 502 $self->handle_file($queue_index, $tbf_top);
447 } else { 503 } else {
448 $self->handle_dir; 504 $self->handle_dir;
449 } 505 }
450 } 506 }
451 } elsif (-f _ && -r _) { 507 } elsif (-f _ && -r _) {
… …
460 $httpevent->wait; 516 $httpevent->wait;
461 } 517 }
462 } 518 }
463 } 519 }
464 520
465 $self->handle_file($queue_file); 521 $self->handle_file($queue_file, $tbf_top);
466 } else { 522 } else {
467 $self->err(404, "not found"); 523 $self->err(404, "not found");
468 } 524 }
469 } 525 }
470} 526}
… …
473 my $self = shift; 529 my $self = shift;
474 my $idx = $self->diridx; 530 my $idx = $self->diridx;
475 531
476 $self->response(200, "ok", 532 $self->response(200, "ok",
477 { 533 {
478 "Content-Type" => "text/html", 534 "Content-Type" => "text/html; charset=utf-8",
479 "Content-Length" => length $idx, 535 "Content-Length" => length $idx,
480 "Last-Modified" => time2str ($self->{stat}[9]), 536 "Last-Modified" => time2str ($self->{stat}[9]),
481 }, 537 },
482 $idx); 538 $idx);
483} 539}
484 540
485sub handle_file { 541sub handle_file {
486 my ($self, $queue) = @_; 542 my ($self, $queue, $tbf) = @_;
487 my $length = $self->{stat}[7]; 543 my $length = $self->{stat}[7];
488 my $hdr = { 544 my $hdr = {
489 "Last-Modified" => time2str ((stat _)[9]), 545 "Last-Modified" => time2str ((stat _)[9]),
546 "Accept-Ranges" => "bytes",
490 }; 547 };
491 548
492 my @code = (200, "ok"); 549 my @code = (200, "ok");
493 my ($l, $h); 550 my ($l, $h);
494 551
… …
537 594
538 $self->response(@code, $hdr, ""); 595 $self->response(@code, $hdr, "");
539 596
540 if ($self->{method} eq "GET") { 597 if ($self->{method} eq "GET") {
541 $self->{time} = $::NOW; 598 $self->{time} = $::NOW;
599 $self->{written} = 0;
542 600
543 my $current = $Coro::current; 601 my $current = $Coro::current;
544 602
545 my ($fh, $buf, $r); 603 my ($fh, $buf, $r);
546 604
… …
562 while ($h > 0) { 620 while ($h > 0) {
563 unless ($locked) { 621 unless ($locked) {
564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 622 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
565 $bufsize = $::BUFSIZE; 623 $bufsize = $::BUFSIZE;
566 $self->{time} = $::NOW; 624 $self->{time} = $::NOW;
625 $self->{written} = 0;
567 } 626 }
568 } 627 }
569 628
570 if ($blocked{$self->{remote_id}}) { 629 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close"; 630 $self->{h}{connection} = "close";
… …
582 Coro::ready($current); 641 Coro::ready($current);
583 }); 642 });
584 &Coro::schedule; 643 &Coro::schedule;
585 last unless $r; 644 last unless $r;
586 } 645 }
646
647 $tbf->request(length $buf);
587 my $w = syswrite $self->{fh}, $buf 648 my $w = syswrite $self->{fh}, $buf
588 or last; 649 or last;
589 $::written += $w; 650 $::written += $w;
590 $self->{written} += $w; 651 $self->{written} += $w;
591 $l += $r; 652 $l += $r;

Diff Legend

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