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.47 by root, Tue Nov 20 01:56:21 2001 UTC vs.
Revision 1.56 by root, Mon Dec 3 04:57:22 2001 UTC

… …
15# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
16 16
17$SIG{PIPE} = 'IGNORE'; 17$SIG{PIPE} = 'IGNORE';
18 18
19our $accesslog; 19our $accesslog;
20our $errorlog;
21
22our $NOW;
23our $HTTP_NOW;
24
25Event->timer(interval => 1, hard => 1, cb => sub {
26 $NOW = time;
27 $HTTP_NOW = time2str $NOW;
28})->now;
29
30if ($ERROR_LOG) {
31 use IO::Handle;
32 open $errorlog, ">>$ERROR_LOG"
33 or die "$ERROR_LOG: $!";
34 $errorlog->autoflush(1);
35}
20 36
21if ($ACCESS_LOG) { 37if ($ACCESS_LOG) {
22 use IO::Handle; 38 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG" 39 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!"; 40 or die "$ACCESS_LOG: $!";
… …
26} 42}
27 43
28sub slog { 44sub slog {
29 my $level = shift; 45 my $level = shift;
30 my $format = shift; 46 my $format = shift;
47 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
31 printf "---: $format\n", @_; 48 printf "$NOW: $format\n", @_;
49 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
32} 50}
33 51
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal; 53our $httpevent = new Coro::Signal;
36 54
37our $wait_factor = 0.95; 55our $queue_file = new transferqueue $MAX_TRANSFERS;
38 56our $queue_index = new transferqueue 10;
39our @transfers = (
40 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
42);
43 57
44my @newcons; 58my @newcons;
45my @pool; 59my @pool;
46 60
47# one "execution thread" 61# one "execution thread"
… …
50 if (@newcons) { 64 if (@newcons) {
51 eval { 65 eval {
52 conn->new(@{pop @newcons})->handle; 66 conn->new(@{pop @newcons})->handle;
53 }; 67 };
54 slog 1, "$@" if $@ && !ref $@; 68 slog 1, "$@" if $@ && !ref $@;
69
70 $httpevent->broadcast; # only for testing, but doesn't matter much
71
55 $connections->up; 72 $connections->up;
56 } else { 73 } else {
57 last if @pool >= $MAX_POOL; 74 last if @pool >= $MAX_POOL;
58 push @pool, $Coro::current; 75 push @pool, $Coro::current;
59 schedule; 76 schedule;
… …
101 or die "unable to start server"; 118 or die "unable to start server";
102 119
103 listen_on $http_port; 120 listen_on $http_port;
104} 121}
105 122
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; 123package conn;
115 124
116use Socket; 125use Socket;
117use HTTP::Date; 126use HTTP::Date;
118use Convert::Scalar 'weaken'; 127use Convert::Scalar 'weaken';
… …
150 my $peername = shift; 159 my $peername = shift;
151 my $self = bless { fh => $fh }, $class; 160 my $self = bless { fh => $fh }, $class;
152 my (undef, $iaddr) = unpack_sockaddr_in $peername 161 my (undef, $iaddr) = unpack_sockaddr_in $peername
153 or $self->err(500, "unable to decode peername"); 162 or $self->err(500, "unable to decode peername");
154 163
164 $self->{remote_addr} =
155 $self->{remote_addr} = inet_ntoa $iaddr; 165 $self->{remote_id} = inet_ntoa $iaddr;
156 $self->{time} = $::NOW; 166 $self->{time} = $::NOW;
157 167
168 weaken ($Coro::current->{conn} = $self);
169
158 $::conns++; 170 $::conns++;
171 $::maxconns = $::conns if $::conns > $::maxconns;
159 172
160 $self; 173 $self;
161} 174}
162 175
163sub DESTROY { 176sub DESTROY {
164 my $self = shift; 177 #my $self = shift;
165 $::conns--; 178 $::conns--;
166 $self->eoconn;
167}
168
169# end of connection
170sub eoconn {
171 my $self = shift;
172
173 # clean up hints
174 delete $conn{$self->{remote_id}}{$self*1};
175 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
176
177 $httpevent->broadcast;
178} 179}
179 180
180sub slog { 181sub slog {
181 my $self = shift; 182 my $self = shift;
182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 183 main::slog($_[0], "$self->{remote_id}> $_[1]");
183} 184}
184 185
185sub response { 186sub response {
186 my ($self, $code, $msg, $hdr, $content) = @_; 187 my ($self, $code, $msg, $hdr, $content) = @_;
187 my $res = "HTTP/1.1 $code $msg\015\012"; 188 my $res = "HTTP/1.1 $code $msg\015\012";
… …
208 $res .= "\015\012"; 209 $res .= "\015\012";
209 210
210 $res .= $content if defined $content and $self->{method} ne "HEAD"; 211 $res .= $content if defined $content and $self->{method} ne "HEAD";
211 212
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 213 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
213 " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 214 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
215 " \"$self->{h}{referer}\"\n";
214 216
215 print $accesslog $log if $accesslog; 217 print $accesslog $log if $accesslog;
216 print STDERR $log; 218 print STDERR $log;
217 219
218 $self->{written} += 220 $self->{written} +=
… …
302 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 304 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
303 } 305 }
304 306
305 $self->{remote_id} = $id; 307 $self->{remote_id} = $id;
306 308
309 weaken (local $conn{$id}{$self*1} = $self);
310
307 if ($blocked{$id}) { 311 if ($blocked{$id}) {
308 $self->err_blocked($blocked{$id}) 312 $self->err_blocked
309 if $blocked{$id} > $::NOW; 313 if $blocked{$id}[0] > $::NOW;
310 314
311 delete $blocked{$id}; 315 delete $blocked{$id};
312 }
313
314 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
315 my $delay = $::PER_TIMEOUT + $::NOW + 15;
316 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
317 if ($delay < $::NOW) {
318 $self->slog(2, "blocked ip $id");
319 $self->err_blocked;
320 } else {
321 $httpevent->wait;
322 }
323 }
324 } 316 }
325 317
326 # find out server name and port 318 # find out server name and port
327 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 319 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
328 $host = $1; 320 $host = $1;
… …
339 $host = inet_ntoa $host; 331 $host = inet_ntoa $host;
340 } 332 }
341 333
342 $self->{server_name} = $host; 334 $self->{server_name} = $host;
343 335
344 # enter ourselves into various lists
345 weaken ($conn{$id}{$self*1} = $self);
346 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 336 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
347 337
348 eval { 338 eval {
349 $self->map_uri; 339 $self->map_uri;
350 $self->respond; 340 $self->respond;
351 }; 341 };
352 342
353 $self->eoconn;
354
355 die if $@ && !ref $@; 343 die if $@ && !ref $@;
356 344
357 last if $self->{h}{connection} =~ /close/; 345 last if $self->{h}{connection} =~ /close/i;
358 346
359 $httpevent->broadcast; 347 $httpevent->broadcast;
360 348
361 $fh->timeout($::PER_TIMEOUT); 349 $fh->timeout($::PER_TIMEOUT);
362 } 350 }
351}
352
353sub block {
354 my $self = shift;
355
356 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
357 $self->slog(2, "blocked ip $self->{remote_id}");
358 $self->err_blocked;
363} 359}
364 360
365# uri => path mapping 361# uri => path mapping
366sub map_uri { 362sub map_uri {
367 my $self = shift; 363 my $self = shift;
… …
414 410
415sub respond { 411sub respond {
416 my $self = shift; 412 my $self = shift;
417 my $path = $self->{path}; 413 my $path = $self->{path};
418 414
419 stat $path 415 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
420 or $self->err(404, "not found"); 416 if ($::internal{$1}) {
421 417 $::internal{$1}->($self);
422 $self->{stat} = [stat _];
423
424 # idiotic netscape sends idiotic headers AGAIN
425 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
426 ? str2time $1 : 0;
427
428 if (-d _ && -r _) {
429 # directory
430 if ($path !~ /\/$/) {
431 # create a redirect to get the trailing "/"
432 # we don't try to avoid the :80
433 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
434 } else { 418 } else {
435 $ims < $self->{stat}[9] 419 $self->err(404, "not found");
420 }
421 } else {
422
423 stat $path
436 or $self->err(304, "not modified"); 424 or $self->err(404, "not found");
437 425
438 if (-r "$path/index.html") { 426 $self->{stat} = [stat _];
439 # replace directory "size" by index.html filesize 427
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 428 # idiotic netscape sends idiotic headers AGAIN
441 $self->handle_file; 429 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
430 ? str2time $1 : 0;
431
432 if (-d _ && -r _) {
433 # directory
434 if ($path !~ /\/$/) {
435 # create a redirect to get the trailing "/"
436 # we don't try to avoid the :80
437 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
442 } else { 438 } else {
439 $ims < $self->{stat}[9]
440 or $self->err(304, "not modified");
441
442 if (-r "$path/index.html") {
443 # replace directory "size" by index.html filesize
444 $self->{stat} = [stat ($self->{path} .= "/index.html")];
445 $self->handle_file($queue_index);
446 } else {
443 $self->handle_dir; 447 $self->handle_dir;
444 } 448 }
445 } 449 }
446 } elsif (-f _ && -r _) { 450 } elsif (-f _ && -r _) {
447 -x _ and $self->err(403, "forbidden"); 451 -x _ and $self->err(403, "forbidden");
452
453 if (%{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
454 my $timeout = $::NOW + 10;
455 while (%{$conn{$self->{remote_id}}} >= $::MAX_TRANSFERS_IP) {
456 if ($timeout < $::NOW) {
457 $self->block($::BLOCKTIME, "too many connections");
458 } else {
459 $httpevent->wait;
460 }
461 }
462 }
463
448 $self->handle_file; 464 $self->handle_file($queue_file);
449 } else { 465 } else {
450 $self->err(404, "not found"); 466 $self->err(404, "not found");
467 }
451 } 468 }
452} 469}
453 470
454sub handle_dir { 471sub handle_dir {
455 my $self = shift; 472 my $self = shift;
… …
457 474
458 $self->response(200, "ok", 475 $self->response(200, "ok",
459 { 476 {
460 "Content-Type" => "text/html", 477 "Content-Type" => "text/html",
461 "Content-Length" => length $idx, 478 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]), 479 "Last-Modified" => time2str ($self->{stat}[9]),
463 }, 480 },
464 $idx); 481 $idx);
465} 482}
466 483
467sub handle_file { 484sub handle_file {
468 my $self = shift; 485 my ($self, $queue) = @_;
469 my $length = $self->{stat}[7]; 486 my $length = $self->{stat}[7];
470 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
471 my $hdr = { 487 my $hdr = {
472 "Last-Modified" => time2str ((stat _)[9]), 488 "Last-Modified" => time2str ((stat _)[9]),
473 }; 489 };
474 490
475 my @code = (200, "ok"); 491 my @code = (200, "ok");
… …
492 $self->err(416, "not satisfiable", $hdr, ""); 508 $self->err(416, "not satisfiable", $hdr, "");
493 509
494satisfiable: 510satisfiable:
495 # check for segmented downloads 511 # check for segmented downloads
496 if ($l && $::NO_SEGMENTED) { 512 if ($l && $::NO_SEGMENTED) {
497 my $delay = $::NOW + $::PER_TIMEOUT + 15; 513 my $timeout = $::NOW + 15;
498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 514 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
499 if ($delay <= $::NOW) { 515 if ($timeout <= $::NOW) {
516 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
500 $self->err_segmented_download; 517 #$self->err_segmented_download;
501 } else { 518 } else {
502 $httpevent->wait; 519 $httpevent->wait;
503 } 520 }
504 } 521 }
505 } 522 }
… …
520 $self->response(@code, $hdr, ""); 537 $self->response(@code, $hdr, "");
521 538
522 if ($self->{method} eq "GET") { 539 if ($self->{method} eq "GET") {
523 $self->{time} = $::NOW; 540 $self->{time} = $::NOW;
524 541
525 my $fudge = $queue->[0]->waiters; 542 my $current = $Coro::current;
526 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
527
528 $queue->[1] *= $fudge;
529 my $transfer = $queue->[0]->guard;
530
531 if ($fudge != 1) {
532 $queue->[1] /= $fudge;
533 $queue->[1] = $queue->[1] * $::wait_factor
534 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
535 }
536 $self->{time} = $::NOW;
537
538 $self->{fh}->writable or return;
539 543
540 my ($fh, $buf, $r); 544 my ($fh, $buf, $r);
541 my $current = $Coro::current; 545
542 open $fh, "<", $self->{path} 546 open $fh, "<", $self->{path}
543 or die "$self->{path}: late open failure ($!)"; 547 or die "$self->{path}: late open failure ($!)";
544 548
545 $h -= $l - 1; 549 $h -= $l - 1;
546 550
547 if (0) { 551 if (0) { # !AIO
548 if ($l) { 552 if ($l) {
549 sysseek $fh, $l, 0; 553 sysseek $fh, $l, 0;
550 } 554 }
551 } 555 }
556
557 my $transfer = $queue->start_transfer($h);
558 my $locked;
559 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
552 560
553 while ($h > 0) { 561 while ($h > 0) {
562 unless ($locked) {
563 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
564 $bufsize = $::BUFSIZE;
565 $self->{time} = $::NOW;
566 }
567 }
568
569 if ($blocked{$self->{remote_id}}) {
570 $self->{h}{connection} = "close";
571 die bless {}, err::
572 }
573
554 if (0) { 574 if (0) { # !AIO
555 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 575 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
556 or last; 576 or last;
557 } else { 577 } else {
558 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 578 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
559 $buf, 0, sub { 579 $buf, 0, sub {
560 $r = $_[0]; 580 $r = $_[0];
561 Coro::ready($current); 581 Coro::ready($current);
562 }); 582 });
563 &Coro::schedule; 583 &Coro::schedule;

Diff Legend

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