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

Diff Legend

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