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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.52 by root, Fri Nov 30 05:11:23 2001 UTC vs.
Revision 1.79 by root, Fri Dec 1 03:53:33 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
… …
15# and quite a bit slower than thttpd :( 18# and quite a bit slower than thttpd :(
16 19
17$SIG{PIPE} = 'IGNORE'; 20$SIG{PIPE} = 'IGNORE';
18 21
19our $accesslog; 22our $accesslog;
23our $errorlog;
24
25our $NOW;
26our $HTTP_NOW;
27
28Event->timer(interval => 1, hard => 1, cb => sub {
29 $NOW = time;
30 $HTTP_NOW = time2str $NOW;
31})->now;
32
33if ($ERROR_LOG) {
34 use IO::Handle;
35 open $errorlog, ">>$ERROR_LOG"
36 or die "$ERROR_LOG: $!";
37 $errorlog->autoflush(1);
38}
20 39
21if ($ACCESS_LOG) { 40if ($ACCESS_LOG) {
22 use IO::Handle; 41 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG" 42 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!"; 43 or die "$ACCESS_LOG: $!";
… …
26} 45}
27 46
28sub slog { 47sub slog {
29 my $level = shift; 48 my $level = shift;
30 my $format = shift; 49 my $format = shift;
50 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
31 printf "---: $format\n", @_; 51 printf "$NOW: $format\n", @_;
52 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
32} 53}
33 54
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 55our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal; 56our $httpevent = new Coro::Signal;
36 57
37our $wait_factor = 0.95;
38
39our $queue_small = new transferqueue $MAX_TRANSFERS_SMALL;
40our $queue_large = new transferqueue $MAX_TRANSFERS_LARGE; 58our $queue_file = new transferqueue $MAX_TRANSFERS;
41our $queue_index = new transferqueue 5; 59our $queue_index = new transferqueue 10;
60
61our $tbf_top = new tbf rate => $TBF_RATE || 100000;
62
63my $unused_bytes = 0;
64my $unused_last = time;
65
66sub unused_bandwidth {
67 $unused_bytes += $_[0];
68 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
69 $unused_last = $NOW;
70 $unused_bytes = 0;
71 $queue_file->force_wake_next;
72 slog 1, "forced filetransfer due to unused bandwidth";
73 }
74}
42 75
43my @newcons; 76my @newcons;
44my @pool; 77my @pool;
45 78
46# one "execution thread" 79# one "execution thread"
… …
49 if (@newcons) { 82 if (@newcons) {
50 eval { 83 eval {
51 conn->new(@{pop @newcons})->handle; 84 conn->new(@{pop @newcons})->handle;
52 }; 85 };
53 slog 1, "$@" if $@ && !ref $@; 86 slog 1, "$@" if $@ && !ref $@;
87
88 $httpevent->broadcast; # only for testing, but doesn't matter much
89
54 $connections->up; 90 $connections->up;
55 } else { 91 } else {
56 last if @pool >= $MAX_POOL; 92 last if @pool >= $MAX_POOL;
57 push @pool, $Coro::current; 93 push @pool, $Coro::current;
58 schedule; 94 schedule;
… …
75 if (@pool) { 111 if (@pool) {
76 (pop @pool)->ready; 112 (pop @pool)->ready;
77 } else { 113 } else {
78 async \&handler; 114 async \&handler;
79 } 115 }
80
81 } 116 }
82 }; 117 };
83} 118}
84 119
85my $http_port = new Coro::Socket 120my $http_port = new Coro::Socket
… …
100 or die "unable to start server"; 135 or die "unable to start server";
101 136
102 listen_on $http_port; 137 listen_on $http_port;
103} 138}
104 139
105our $NOW;
106our $HTTP_NOW;
107
108Event->timer(interval => 1, hard => 1, cb => sub {
109 $NOW = time;
110 $HTTP_NOW = time2str $NOW;
111})->now;
112
113package conn; 140package conn;
114 141
115use Socket; 142use Socket;
116use HTTP::Date; 143use HTTP::Date;
117use Convert::Scalar 'weaken'; 144use Convert::Scalar 'weaken';
118use Linux::AIO; 145use IO::AIO;
119 146
120Linux::AIO::min_parallel $::AIO_PARALLEL; 147IO::AIO::min_parallel $::AIO_PARALLEL;
121 148
122Event->io(fd => Linux::AIO::poll_fileno, 149Event->io (fd => IO::AIO::poll_fileno,
123 poll => 'r', async => 1, 150 poll => 'r', async => 1,
124 cb => \&Linux::AIO::poll_cb); 151 cb => \&IO::AIO::poll_cb);
125 152
126our %conn; # $conn{ip}{self} => connobj 153our %conn; # $conn{ip}{self} => connobj
127our %uri; # $uri{ip}{uri}{self} 154our %uri; # $uri{ip}{uri}{self}
128our %blocked; 155our %blocked;
129our %mimetype; 156our %mimetype;
… …
151 my (undef, $iaddr) = unpack_sockaddr_in $peername 178 my (undef, $iaddr) = unpack_sockaddr_in $peername
152 or $self->err(500, "unable to decode peername"); 179 or $self->err(500, "unable to decode peername");
153 180
154 $self->{remote_addr} = 181 $self->{remote_addr} =
155 $self->{remote_id} = inet_ntoa $iaddr; 182 $self->{remote_id} = inet_ntoa $iaddr;
183
156 $self->{time} = $::NOW; 184 $self->{time} = $::NOW;
157 185
158 weaken ($Coro::current->{conn} = $self); 186 weaken ($Coro::current->{conn} = $self);
159 187
160 $::conns++; 188 $::conns++;
189 $::maxconns = $::conns if $::conns > $::maxconns;
161 190
162 $self; 191 $self;
163} 192}
164 193
165sub DESTROY { 194sub DESTROY {
166 my $self = shift; 195 #my $self = shift;
167 $::conns--; 196 $::conns--;
168 $self->eoconn;
169} 197}
170 198
171# end of connection 199sub prune_cache {
172sub eoconn { 200 my $hash = $_[0];
173 my $self = shift;
174 201
175 # clean up hints 202 for (keys %$hash) {
176 delete $conn{$self->{remote_id}}{$self*1}; 203 if (ref $hash->{$_} eq HASH::) {
177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 204 prune_cache($hash->{$_});
178 205 unless (scalar keys %{$hash->{$_}}) {
179 $httpevent->broadcast; 206 delete $hash->{$_};
207 $d2++;
208 }
209 }
210 }
180} 211}
212
213sub prune_caches {
214 prune_cache \%conn;
215 prune_cache \%uri;
216
217 for (keys %blocked) {
218 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
219 }
220}
221
222Event->timer(interval => 60, cb => \&prune_caches);
181 223
182sub slog { 224sub slog {
183 my $self = shift; 225 my $self = shift;
184 main::slog($_[0], "$self->{remote_id}> $_[1]"); 226 main::slog($_[0], "$self->{remote_id}> $_[1]");
185} 227}
186 228
187sub response { 229sub response {
188 my ($self, $code, $msg, $hdr, $content) = @_; 230 my ($self, $code, $msg, $hdr, $content) = @_;
189 my $res = "HTTP/1.1 $code $msg\015\012"; 231 my $res = "HTTP/1.1 $code $msg\015\012";
232 my $GZ = "";
190 233
191 if (exists $hdr->{Connection}) { 234 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) { 235 if ($hdr->{Connection} =~ /close/) {
193 $self->{h}{connection} = "close" 236 $self->{h}{connection} = "close"
194 } 237 }
… …
200 $self->{h}{connection} = "close" 243 $self->{h}{connection} = "close"
201 } 244 }
202 } 245 }
203 } 246 }
204 247
248 if ($self->{method} ne "HEAD"
249 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
250 && 400 < length $content
251 && $hdr->{"Content-Length"} == length $content
252 && !exists $hdr->{"Content-Encoding"}
253 ) {
254 my $orig = length $content;
255 $hdr->{"Content-Encoding"} = "gzip";
256 $content = Compress::Zlib::memGzip(\$content);
257 $hdr->{"Content-Length"} = length $content;
258 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
259 }
260
205 $res .= "Date: $HTTP_NOW\015\012"; 261 $res .= "Date: $HTTP_NOW\015\012";
262 $res .= "Server: $::NAME\015\012";
206 263
207 while (my ($h, $v) = each %$hdr) { 264 while (my ($h, $v) = each %$hdr) {
208 $res .= "$h: $v\015\012" 265 $res .= "$h: $v\015\012"
209 } 266 }
210 $res .= "\015\012"; 267 $res .= "\015\012";
211 268
212 $res .= $content if defined $content and $self->{method} ne "HEAD"; 269 $res .= $content if defined $content and $self->{method} ne "HEAD";
213 270
214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 271 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 272 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
216 " \"$self->{h}{referer}\"\n"; 273 " \"$self->{h}{referer}\"\n";
217 274
218 print $accesslog $log if $accesslog; 275 print $::accesslog $log if $::accesslog;
219 print STDERR $log; 276 print STDERR $log;
220 277
221 $self->{written} += 278 $tbf_top->request(length $res, 1e6);
222 print {$self->{fh}} $res; 279 $self->{written} += print {$self->{fh}} $res;
223} 280}
224 281
225sub err { 282sub err {
226 my $self = shift; 283 my $self = shift;
227 my ($code, $msg, $hdr, $content) = @_; 284 my ($code, $msg, $hdr, $content) = @_;
… …
282 my (%hdr, $h, $v); 339 my (%hdr, $h, $v);
283 340
284 $hdr{lc $1} .= ",$2" 341 $hdr{lc $1} .= ",$2"
285 while $req =~ /\G 342 while $req =~ /\G
286 ([^:\000-\040]+): 343 ([^:\000-\040]+):
287 [\008\040]* 344 [\011\040]*
288 ((?: [^\015\012]+ | \015\012[\008\040] )*) 345 ((?: [^\015\012]+ | \015\012[\011\040] )*)
289 \015\012 346 \015\012
290 /gxc; 347 /gxc;
291 348
292 $req =~ /\G\015\012$/ 349 $req =~ /\G\015\012$/
293 or $self->err(400, "bad request"); 350 or $self->err(400, "bad request");
… …
305 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 362 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
306 } 363 }
307 364
308 $self->{remote_id} = $id; 365 $self->{remote_id} = $id;
309 366
367 weaken (local $conn{$id}{$self*1} = $self);
368
310 if ($blocked{$id}) { 369 if ($blocked{$id}) {
311 $self->err_blocked($blocked{$id}) 370 $self->err_blocked
312 if $blocked{$id} > $::NOW; 371 if $blocked{$id}[0] > $::NOW;
313 372
314 delete $blocked{$id}; 373 delete $blocked{$id};
315 }
316
317 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
318 my $delay = $::PER_TIMEOUT + $::NOW + 15;
319 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
320 if ($delay < $::NOW) {
321 $self->slog(2, "blocked ip $id");
322 $self->err_blocked;
323 } else {
324 $httpevent->wait;
325 }
326 }
327 } 374 }
328 375
329 # find out server name and port 376 # find out server name and port
330 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 377 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
331 $host = $1; 378 $host = $1;
… …
342 $host = inet_ntoa $host; 389 $host = inet_ntoa $host;
343 } 390 }
344 391
345 $self->{server_name} = $host; 392 $self->{server_name} = $host;
346 393
347 # enter ourselves into various lists
348 weaken ($conn{$id}{$self*1} = $self);
349 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 394 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
350 395
351 eval { 396 eval {
352 $self->map_uri; 397 $self->map_uri;
353 $self->respond; 398 $self->respond;
354 }; 399 };
355 400
356 $self->eoconn;
357
358 die if $@ && !ref $@; 401 die if $@ && !ref $@;
359 402
360 last if $self->{h}{connection} =~ /close/; 403 last if $self->{h}{connection} =~ /close/i;
361 404
362 $httpevent->broadcast; 405 $httpevent->broadcast;
363 406
364 $fh->timeout($::PER_TIMEOUT); 407 $fh->timeout($::PER_TIMEOUT);
365 } 408 }
409}
410
411sub block {
412 my $self = shift;
413
414 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
415 $self->slog(2, "blocked ip $self->{remote_id}");
416 $self->err_blocked;
366} 417}
367 418
368# uri => path mapping 419# uri => path mapping
369sub map_uri { 420sub map_uri {
370 my $self = shift; 421 my $self = shift;
… …
446 $ims < $self->{stat}[9] 497 $ims < $self->{stat}[9]
447 or $self->err(304, "not modified"); 498 or $self->err(304, "not modified");
448 499
449 if (-r "$path/index.html") { 500 if (-r "$path/index.html") {
450 # replace directory "size" by index.html filesize 501 # replace directory "size" by index.html filesize
451 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 502 $self->{stat} = [stat ($self->{path} .= "/index.html")];
452 $self->handle_file($queue_index); 503 $self->handle_file($queue_index, $tbf_top);
453 } else { 504 } else {
454 $self->handle_dir; 505 $self->handle_dir;
455 } 506 }
456 } 507 }
457 } elsif (-f _ && -r _) { 508 } elsif (-f _ && -r _) {
458 -x _ and $self->err(403, "forbidden"); 509 -x _ and $self->err(403, "forbidden");
459 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small); 510
511 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
512 my $timeout = $::NOW + 10;
513 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
514 if ($timeout < $::NOW) {
515 $self->block($::BLOCKTIME, "too many connections");
516 } else {
517 $httpevent->wait;
518 }
519 }
520 }
521
522 $self->handle_file($queue_file, $tbf_top);
460 } else { 523 } else {
461 $self->err(404, "not found"); 524 $self->err(404, "not found");
462 } 525 }
463 } 526 }
464} 527}
… …
467 my $self = shift; 530 my $self = shift;
468 my $idx = $self->diridx; 531 my $idx = $self->diridx;
469 532
470 $self->response(200, "ok", 533 $self->response(200, "ok",
471 { 534 {
472 "Content-Type" => "text/html", 535 "Content-Type" => "text/html; charset=utf-8",
473 "Content-Length" => length $idx, 536 "Content-Length" => length $idx,
474 #d# directories change all the time, so X-
475 "X-Last-Modified" => time2str ((stat _)[9]), 537 "Last-Modified" => time2str ($self->{stat}[9]),
476 }, 538 },
477 $idx); 539 $idx);
478} 540}
479 541
480sub handle_file { 542sub handle_file {
481 my ($self, $queue) = @_; 543 my ($self, $queue, $tbf) = @_;
482 my $length = $self->{stat}[7]; 544 my $length = $self->{stat}[7];
483 my $hdr = { 545 my $hdr = {
484 "Last-Modified" => time2str ((stat _)[9]), 546 "Last-Modified" => time2str ((stat _)[9]),
547 "Accept-Ranges" => "bytes",
485 }; 548 };
486 549
487 my @code = (200, "ok"); 550 my @code = (200, "ok");
488 my ($l, $h); 551 my ($l, $h);
489 552
… …
504 $self->err(416, "not satisfiable", $hdr, ""); 567 $self->err(416, "not satisfiable", $hdr, "");
505 568
506satisfiable: 569satisfiable:
507 # check for segmented downloads 570 # check for segmented downloads
508 if ($l && $::NO_SEGMENTED) { 571 if ($l && $::NO_SEGMENTED) {
509 my $delay = $::NOW + $::PER_TIMEOUT + 15; 572 my $timeout = $::NOW + 15;
510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 573 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
511 if ($delay <= $::NOW) { 574 if ($timeout <= $::NOW) {
575 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
512 $self->err_segmented_download; 576 #$self->err_segmented_download;
513 } else { 577 } else {
514 $httpevent->wait; 578 $httpevent->wait;
515 } 579 }
516 } 580 }
517 } 581 }
… …
531 595
532 $self->response(@code, $hdr, ""); 596 $self->response(@code, $hdr, "");
533 597
534 if ($self->{method} eq "GET") { 598 if ($self->{method} eq "GET") {
535 $self->{time} = $::NOW; 599 $self->{time} = $::NOW;
600 $self->{written} = 0;
536 601
537 my $current = $Coro::current; 602 my $current = $Coro::current;
538 603
539 my ($fh, $buf, $r); 604 my ($fh, $buf, $r);
540 605
… …
547 if ($l) { 612 if ($l) {
548 sysseek $fh, $l, 0; 613 sysseek $fh, $l, 0;
549 } 614 }
550 } 615 }
551 616
552 my $transfer = $queue->start_transfer; 617 my $transfer = $queue->start_transfer($h);
553 my $locked; 618 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 619 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
555 620
556 while ($h > 0) { 621 while ($h > 0) {
557 unless ($locked) { 622 unless ($locked) {
558 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 623 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE; 624 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW; 625 $self->{time} = $::NOW;
626 $self->{written} = 0;
561 } 627 }
562 } 628 }
563 629
564 if (0) { # !AIO 630 if ($blocked{$self->{remote_id}}) {
565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 631 $self->{h}{connection} = "close";
632 die bless {}, err::;
633 }
634
635 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), $buf, 0
566 or last; 636 or last;
567 } else { 637
568 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h), 638 $tbf->request (length $buf);
569 $buf, 0, sub {
570 $r = $_[0];
571 Coro::ready($current);
572 });
573 &Coro::schedule;
574 last unless $r;
575 }
576 my $w = syswrite $self->{fh}, $buf 639 my $w = syswrite $self->{fh}, $buf
577 or last; 640 or last;
578 $::written += $w; 641 $::written += $w;
579 $self->{written} += $w; 642 $self->{written} += $w;
580 $l += $r; 643 $l += $r;
… …
582 645
583 close $fh; 646 close $fh;
584 } 647 }
585} 648}
586 649
5871; 6501
651

Diff Legend

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