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.36 by root, Sun Sep 2 00:54:00 2001 UTC vs.
Revision 1.67 by root, Sun May 19 21:00:47 2002 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;
5 6
6use HTTP::Date; 7use HTTP::Date;
8use POSIX ();
9
10use Compress::Zlib ();
7 11
8no utf8; 12no utf8;
9use bytes; 13use bytes;
10 14
11# at least on my machine, this thingy serves files 15# at least on my machine, this thingy serves files
… …
13# and quite a bit slower than thttpd :( 17# and quite a bit slower than thttpd :(
14 18
15$SIG{PIPE} = 'IGNORE'; 19$SIG{PIPE} = 'IGNORE';
16 20
17our $accesslog; 21our $accesslog;
22our $errorlog;
23
24our $NOW;
25our $HTTP_NOW;
26
27Event->timer(interval => 1, hard => 1, cb => sub {
28 $NOW = time;
29 $HTTP_NOW = time2str $NOW;
30})->now;
31
32if ($ERROR_LOG) {
33 use IO::Handle;
34 open $errorlog, ">>$ERROR_LOG"
35 or die "$ERROR_LOG: $!";
36 $errorlog->autoflush(1);
37}
18 38
19if ($ACCESS_LOG) { 39if ($ACCESS_LOG) {
20 use IO::Handle; 40 use IO::Handle;
21 open $accesslog, ">>$ACCESS_LOG" 41 open $accesslog, ">>$ACCESS_LOG"
22 or die "$ACCESS_LOG: $!"; 42 or die "$ACCESS_LOG: $!";
… …
24} 44}
25 45
26sub slog { 46sub slog {
27 my $level = shift; 47 my $level = shift;
28 my $format = shift; 48 my $format = shift;
49 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
29 printf "---: $format\n", @_; 50 printf "$NOW: $format\n", @_;
51 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
30} 52}
31 53
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
55our $httpevent = new Coro::Signal;
33 56
34our $wait_factor = 0.95; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10;
35 59
36our @transfers = ( 60our $tbf_top = new tbf rate => 200000;
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
39);
40 61
41my @newcons; 62my @newcons;
42my @pool; 63my @pool;
43 64
44# one "execution thread" 65# one "execution thread"
45sub handler { 66sub handler {
46 while () { 67 while () {
47 my $new = pop @newcons;
48 if ($new) { 68 if (@newcons) {
49 eval { 69 eval {
50 conn->new(@$new)->handle; 70 conn->new(@{pop @newcons})->handle;
51 }; 71 };
52 slog 1, "$@" if $@ && !ref $@; 72 slog 1, "$@" if $@ && !ref $@;
73
74 $httpevent->broadcast; # only for testing, but doesn't matter much
75
53 $connections->up; 76 $connections->up;
54 } else { 77 } else {
55 last if @pool >= $MAX_POOL; 78 last if @pool >= $MAX_POOL;
56 push @pool, $Coro::current; 79 push @pool, $Coro::current;
57 schedule; 80 schedule;
58 } 81 }
59 } 82 }
83}
84
85sub listen_on {
86 my $listen = $_[0];
87
88 push @listen_sockets, $listen;
89
90 # the "main thread"
91 async {
92 slog 1, "accepting connections";
93 while () {
94 $connections->down;
95 push @newcons, [$listen->accept];
96 #slog 3, "accepted @$connections ".scalar(@pool);
97 if (@pool) {
98 (pop @pool)->ready;
99 } else {
100 async \&handler;
101 }
102
103 }
104 };
60} 105}
61 106
62my $http_port = new Coro::Socket 107my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 108 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 109 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 110 ReuseAddr => 1,
66 Listen => 50, 111 Listen => 50,
67 or die "unable to start server"; 112 or die "unable to start server";
68 113
69push @listen_sockets, $http_port; 114listen_on $http_port;
70 115
71our $NOW; 116if ($SERVER_PORT2) {
72our $HTTP_NOW; 117 my $http_port = new Coro::Socket
118 LocalAddr => $SERVER_HOST,
119 LocalPort => $SERVER_PORT2,
120 ReuseAddr => 1,
121 Listen => 50,
122 or die "unable to start server";
73 123
74Event->timer(interval => 1, hard => 1, cb => sub { 124 listen_on $http_port;
75 $NOW = time; 125}
76 $HTTP_NOW = time2str $NOW;
77})->now;
78
79# the "main thread"
80async {
81 slog 1, "accepting connections";
82 while () {
83 $connections->down;
84 push @newcons, [$http_port->accept];
85 #slog 3, "accepted @$connections ".scalar(@pool);
86 if (@pool) {
87 (pop @pool)->ready;
88 } else {
89 async \&handler;
90 }
91
92 }
93};
94 126
95package conn; 127package conn;
96 128
97use Socket; 129use Socket;
98use HTTP::Date; 130use HTTP::Date;
99use Convert::Scalar 'weaken'; 131use Convert::Scalar 'weaken';
100use Linux::AIO; 132use Linux::AIO;
101 133
102Linux::AIO::min_parallel $::AIO_PARALLEL; 134Linux::AIO::min_parallel $::AIO_PARALLEL;
103
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105 135
106Event->io(fd => Linux::AIO::poll_fileno, 136Event->io(fd => Linux::AIO::poll_fileno,
107 poll => 'r', async => 1, 137 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb); 138 cb => \&Linux::AIO::poll_cb);
109 139
… …
127 157
128read_mimetypes; 158read_mimetypes;
129 159
130sub new { 160sub new {
131 my $class = shift; 161 my $class = shift;
162 my $fh = shift;
132 my $peername = shift; 163 my $peername = shift;
133 my $fh = shift;
134 my $self = bless { fh => $fh }, $class; 164 my $self = bless { fh => $fh }, $class;
135 my (undef, $iaddr) = unpack_sockaddr_in $peername 165 my (undef, $iaddr) = unpack_sockaddr_in $peername
136 or $self->err(500, "unable to decode peername"); 166 or $self->err(500, "unable to decode peername");
137 167
168 $self->{remote_addr} =
138 $self->{remote_addr} = inet_ntoa $iaddr; 169 $self->{remote_id} = inet_ntoa $iaddr;
170
139 $self->{time} = $::NOW; 171 $self->{time} = $::NOW;
140 172
173 weaken ($Coro::current->{conn} = $self);
174
141 $::conns++; 175 $::conns++;
176 $::maxconns = $::conns if $::conns > $::maxconns;
142 177
143 $self; 178 $self;
144} 179}
145 180
146sub DESTROY { 181sub DESTROY {
147 my $self = shift; 182 #my $self = shift;
148
149 $::conns--; 183 $::conns--;
150
151 $self->eoconn;
152}
153
154# end of connection
155sub eoconn {
156 my $self = shift;
157
158 # clean up hints
159 delete $conn{$self->{remote_id}}{$self*1};
160 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
161} 184}
162 185
163sub slog { 186sub slog {
164 my $self = shift; 187 my $self = shift;
165 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 188 main::slog($_[0], "$self->{remote_id}> $_[1]");
166} 189}
167 190
168sub response { 191sub response {
169 my ($self, $code, $msg, $hdr, $content) = @_; 192 my ($self, $code, $msg, $hdr, $content) = @_;
170 my $res = "HTTP/1.1 $code $msg\015\012"; 193 my $res = "HTTP/1.1 $code $msg\015\012";
194 my $GZ = "";
171 195
172 $self->{h}{connection} ||= $hdr->{Connection}; 196 if (exists $hdr->{Connection}) {
197 if ($hdr->{Connection} =~ /close/) {
198 $self->{h}{connection} = "close"
199 }
200 } else {
201 if ($self->{version} < 1.1) {
202 if ($self->{h}{connection} =~ /keep-alive/i) {
203 $hdr->{Connection} = "Keep-Alive";
204 } else {
205 $self->{h}{connection} = "close"
206 }
207 }
208 }
209
210 if ($self->{method} ne "HEAD"
211 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
212 && 400 < length $content
213 && $hdr->{"Content-Length"} == length $content
214 && !exists $hdr->{"Content-Encoding"}
215 ) {
216 my $orig = length $content;
217 $hdr->{"Content-Encoding"} = "gzip";
218 $content = Compress::Zlib::memGzip(\$content);
219 $hdr->{"Content-Length"} = length $content;
220 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
221 }
173 222
174 $res .= "Date: $HTTP_NOW\015\012"; 223 $res .= "Date: $HTTP_NOW\015\012";
175 224
176 while (my ($h, $v) = each %$hdr) { 225 while (my ($h, $v) = each %$hdr) {
177 $res .= "$h: $v\015\012" 226 $res .= "$h: $v\015\012"
178 } 227 }
179 $res .= "\015\012"; 228 $res .= "\015\012";
180 229
181 $res .= $content if defined $content and $self->{method} ne "HEAD"; 230 $res .= $content if defined $content and $self->{method} ne "HEAD";
182 231
183 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 232 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
233 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
234 " \"$self->{h}{referer}\"\n";
184 235
185 print $accesslog $log if $accesslog; 236 print $::accesslog $log if $::accesslog;
186 print STDERR $log; 237 print STDERR $log;
187 238
188 $self->{written} += 239 $tbf_top->request(length $res, 1e6);
189 print {$self->{fh}} $res; 240 $self->{written} += print {$self->{fh}} $res;
190} 241}
191 242
192sub err { 243sub err {
193 my $self = shift; 244 my $self = shift;
194 my ($code, $msg, $hdr, $content) = @_; 245 my ($code, $msg, $hdr, $content) = @_;
… …
249 my (%hdr, $h, $v); 300 my (%hdr, $h, $v);
250 301
251 $hdr{lc $1} .= ",$2" 302 $hdr{lc $1} .= ",$2"
252 while $req =~ /\G 303 while $req =~ /\G
253 ([^:\000-\040]+): 304 ([^:\000-\040]+):
254 [\008\040]* 305 [\011\040]*
255 ((?: [^\015\012]+ | \015\012[\008\040] )*) 306 ((?: [^\015\012]+ | \015\012[\011\040] )*)
256 \015\012 307 \015\012
257 /gxc; 308 /gxc;
258 309
259 $req =~ /\G\015\012$/ 310 $req =~ /\G\015\012$/
260 or $self->err(400, "bad request"); 311 or $self->err(400, "bad request");
… …
272 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 323 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
273 } 324 }
274 325
275 $self->{remote_id} = $id; 326 $self->{remote_id} = $id;
276 327
328 weaken (local $conn{$id}{$self*1} = $self);
329
277 if ($blocked{$id}) { 330 if ($blocked{$id}) {
278 $self->err_blocked($blocked{$id}) 331 $self->err_blocked
279 if $blocked{$id} > $::NOW; 332 if $blocked{$id}[0] > $::NOW;
280 333
281 delete $blocked{$id}; 334 delete $blocked{$id};
282 }
283
284 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
285 my $delay = $::PER_TIMEOUT + 15;
286 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
287 if ($delay <= 0) {
288 $self->slog(2, "blocked ip $id");
289 $self->err_blocked;
290 } else {
291 Coro::Event::do_timer(after => 4); $delay -= 4;
292 }
293 }
294 } 335 }
295 336
296 # find out server name and port 337 # find out server name and port
297 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 338 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
298 $host = $1; 339 $host = $1;
… …
302 343
303 if (defined $host) { 344 if (defined $host) {
304 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 345 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
305 } else { 346 } else {
306 ($self->{server_port}, $host) 347 ($self->{server_port}, $host)
307 = unpack_sockaddr_in $self->{fh}->getsockname 348 = unpack_sockaddr_in $self->{fh}->sockname
308 or $self->err(500, "unable to get socket name"); 349 or $self->err(500, "unable to get socket name");
309 $host = inet_ntoa $host; 350 $host = inet_ntoa $host;
310 } 351 }
311 352
312 $self->{server_name} = $host; 353 $self->{server_name} = $host;
313 354
314 # enter ourselves into various lists
315 weaken ($conn{$id}{$self*1} = $self);
316 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 355 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
317 356
318 eval { 357 eval {
319 $self->map_uri; 358 $self->map_uri;
320 $self->respond; 359 $self->respond;
321 }; 360 };
322 361
323 $self->eoconn;
324
325 die if $@ && !ref $@; 362 die if $@ && !ref $@;
326 363
327 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 364 last if $self->{h}{connection} =~ /close/i;
365
366 $httpevent->broadcast;
328 367
329 $fh->timeout($::PER_TIMEOUT); 368 $fh->timeout($::PER_TIMEOUT);
330 } 369 }
370}
371
372sub block {
373 my $self = shift;
374
375 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
376 $self->slog(2, "blocked ip $self->{remote_id}");
377 $self->err_blocked;
331} 378}
332 379
333# uri => path mapping 380# uri => path mapping
334sub map_uri { 381sub map_uri {
335 my $self = shift; 382 my $self = shift;
… …
382 429
383sub respond { 430sub respond {
384 my $self = shift; 431 my $self = shift;
385 my $path = $self->{path}; 432 my $path = $self->{path};
386 433
387 stat $path 434 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
388 or $self->err(404, "not found"); 435 if ($::internal{$1}) {
389 436 $::internal{$1}->($self);
390 $self->{stat} = [stat _];
391
392 # idiotic netscape sends idiotic headers AGAIN
393 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
394 ? str2time $1 : 0;
395
396 if (-d _ && -r _) {
397 # directory
398 if ($path !~ /\/$/) {
399 # create a redirect to get the trailing "/"
400 # we don't try to avoid the :80
401 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
402 } else { 437 } else {
403 $ims < $self->{stat}[9] 438 $self->err(404, "not found");
439 }
440 } else {
441
442 stat $path
404 or $self->err(304, "not modified"); 443 or $self->err(404, "not found");
405 444
406 if (-r "$path/index.html") { 445 $self->{stat} = [stat _];
407 $self->{path} .= "/index.html"; 446
408 $self->handle_file; 447 # idiotic netscape sends idiotic headers AGAIN
448 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
449 ? str2time $1 : 0;
450
451 if (-d _ && -r _) {
452 # directory
453 if ($path !~ /\/$/) {
454 # create a redirect to get the trailing "/"
455 # we don't try to avoid the :80
456 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
409 } else { 457 } else {
458 $ims < $self->{stat}[9]
459 or $self->err(304, "not modified");
460
461 if (-r "$path/index.html") {
462 # replace directory "size" by index.html filesize
463 $self->{stat} = [stat ($self->{path} .= "/index.html")];
464 $self->handle_file($queue_index, $tbf_top);
465 } else {
410 $self->handle_dir; 466 $self->handle_dir;
411 } 467 }
412 } 468 }
413 } elsif (-f _ && -r _) { 469 } elsif (-f _ && -r _) {
414 -x _ and $self->err(403, "forbidden"); 470 -x _ and $self->err(403, "forbidden");
415 $self->handle_file; 471
472 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
473 my $timeout = $::NOW + 10;
474 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
475 if ($timeout < $::NOW) {
476 $self->block($::BLOCKTIME, "too many connections");
477 } else {
478 $httpevent->wait;
479 }
480 }
481 }
482
483 $self->handle_file($queue_file, $tbf_top);
416 } else { 484 } else {
417 $self->err(404, "not found"); 485 $self->err(404, "not found");
486 }
418 } 487 }
419} 488}
420 489
421sub handle_dir { 490sub handle_dir {
422 my $self = shift; 491 my $self = shift;
… …
424 493
425 $self->response(200, "ok", 494 $self->response(200, "ok",
426 { 495 {
427 "Content-Type" => "text/html", 496 "Content-Type" => "text/html",
428 "Content-Length" => length $idx, 497 "Content-Length" => length $idx,
498 "Last-Modified" => time2str ($self->{stat}[9]),
429 }, 499 },
430 $idx); 500 $idx);
431} 501}
432 502
433sub handle_file { 503sub handle_file {
434 my $self = shift; 504 my ($self, $queue, $tbf) = @_;
435 my $length = $self->{stat}[7]; 505 my $length = $self->{stat}[7];
436 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
437 my $hdr = { 506 my $hdr = {
438 "Last-Modified" => time2str ((stat _)[9]), 507 "Last-Modified" => time2str ((stat _)[9]),
439 }; 508 };
440 509
441 my @code = (200, "ok"); 510 my @code = (200, "ok");
… …
458 $self->err(416, "not satisfiable", $hdr, ""); 527 $self->err(416, "not satisfiable", $hdr, "");
459 528
460satisfiable: 529satisfiable:
461 # check for segmented downloads 530 # check for segmented downloads
462 if ($l && $::NO_SEGMENTED) { 531 if ($l && $::NO_SEGMENTED) {
463 my $delay = $::PER_TIMEOUT + 15; 532 my $timeout = $::NOW + 15;
464 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 533 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
465 if ($delay <= 0) { 534 if ($timeout <= $::NOW) {
535 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
466 $self->err_segmented_download; 536 #$self->err_segmented_download;
467 } else { 537 } else {
468 Coro::Event::do_timer(after => 4); $delay -= 4; 538 $httpevent->wait;
469 } 539 }
470 } 540 }
471 } 541 }
472 542
473 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 543 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
486 $self->response(@code, $hdr, ""); 556 $self->response(@code, $hdr, "");
487 557
488 if ($self->{method} eq "GET") { 558 if ($self->{method} eq "GET") {
489 $self->{time} = $::NOW; 559 $self->{time} = $::NOW;
490 560
491 my $fudge = $queue->[0]->waiters; 561 my $current = $Coro::current;
492 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
493
494 $queue->[1] *= $fudge;
495 my $transfer = $queue->[0]->guard;
496
497 if ($fudge != 1) {
498 $queue->[1] /= $fudge;
499 $queue->[1] = $queue->[1] * $::wait_factor
500 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
501 }
502 $self->{time} = $::NOW;
503
504 $self->{fh}->writable or return;
505 562
506 my ($fh, $buf, $r); 563 my ($fh, $buf, $r);
507 my $current = $Coro::current; 564
508 open $fh, "<", $self->{path} 565 open $fh, "<", $self->{path}
509 or die "$self->{path}: late open failure ($!)"; 566 or die "$self->{path}: late open failure ($!)";
510 567
511 $h -= $l - 1; 568 $h -= $l - 1;
512 569
513 if (0) { 570 if (0) { # !AIO
514 if ($l) { 571 if ($l) {
515 sysseek $fh, $l, 0; 572 sysseek $fh, $l, 0;
516 } 573 }
517 } 574 }
575
576 my $transfer = $queue->start_transfer($h);
577 my $locked;
578 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
518 579
519 while ($h > 0) { 580 while ($h > 0) {
581 unless ($locked) {
582 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
583 $bufsize = $::BUFSIZE;
584 $self->{time} = $::NOW;
585 }
586 }
587
588 if ($blocked{$self->{remote_id}}) {
589 $self->{h}{connection} = "close";
590 die bless {}, err::;
591 }
592
520 if (0) { 593 if (0) { # !AIO
521 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 594 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
522 or last; 595 or last;
523 } else { 596 } else {
524 undef $buf; 597 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
525 $aio_requests->down;
526 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
527 $buf, 0, sub { 598 $buf, 0, sub {
528 $r = $_[0]; 599 $r = $_[0];
529 $current->ready; 600 Coro::ready($current);
530 }); 601 });
531 &Coro::schedule; 602 &Coro::schedule;
532 $aio_requests->up;
533 last unless $r; 603 last unless $r;
534 } 604 }
535 my $w = $self->{fh}->syswrite($buf) 605
606 $tbf->request(length $buf);
607 my $w = syswrite $self->{fh}, $buf
536 or last; 608 or last;
537 $::written += $w; 609 $::written += $w;
538 $self->{written} += $w; 610 $self->{written} += $w;
539 $l += $r; 611 $l += $r;
540 } 612 }

Diff Legend

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