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.49 by root, Wed Nov 28 03:39:46 2001 UTC vs.
Revision 1.61 by root, Thu Jan 3 01:20:17 2002 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 slots => $MAX_TRANSFERS, maxsize => 256*1024*1024;
38 56our $queue_index = new transferqueue slots => 10;
39our @transfers = (
40 (new Coro::Semaphore $MAX_TRANSFERS_SMALL),
41 (new Coro::Semaphore $MAX_TRANSFERS_LARGE),
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;
166
156 $self->{time} = $::NOW; 167 $self->{time} = $::NOW;
157 168
158 weaken ($Coro::current->{conn} = $self); 169 weaken ($Coro::current->{conn} = $self);
159 170
160 $::conns++; 171 $::conns++;
172 $::maxconns = $::conns if $::conns > $::maxconns;
161 173
162 $self; 174 $self;
163} 175}
164 176
165sub DESTROY { 177sub DESTROY {
166 my $self = shift; 178 #my $self = shift;
167 $::conns--; 179 $::conns--;
168 $self->eoconn;
169}
170
171# end of connection
172sub eoconn {
173 my $self = shift;
174
175 # clean up hints
176 delete $conn{$self->{remote_id}}{$self*1};
177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
178
179 $httpevent->broadcast;
180} 180}
181 181
182sub slog { 182sub slog {
183 my $self = shift; 183 my $self = shift;
184 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
185} 185}
186 186
187sub response { 187sub response {
188 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
189 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
… …
210 $res .= "\015\012"; 210 $res .= "\015\012";
211 211
212 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
213 213
214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
215 " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
216 " \"$self->{h}{referer}\"\n";
216 217
217 print $accesslog $log if $accesslog; 218 print $accesslog $log if $accesslog;
218 print STDERR $log; 219 print STDERR $log;
219 220
220 $self->{written} += 221 $self->{written} +=
… …
304 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 305 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
305 } 306 }
306 307
307 $self->{remote_id} = $id; 308 $self->{remote_id} = $id;
308 309
310 weaken (local $conn{$id}{$self*1} = $self);
311
309 if ($blocked{$id}) { 312 if ($blocked{$id}) {
310 $self->err_blocked($blocked{$id}) 313 $self->err_blocked
311 if $blocked{$id} > $::NOW; 314 if $blocked{$id}[0] > $::NOW;
312 315
313 delete $blocked{$id}; 316 delete $blocked{$id};
314 }
315
316 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
317 my $delay = $::PER_TIMEOUT + $::NOW + 15;
318 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
319 if ($delay < $::NOW) {
320 $self->slog(2, "blocked ip $id");
321 $self->err_blocked;
322 } else {
323 $httpevent->wait;
324 }
325 }
326 } 317 }
327 318
328 # find out server name and port 319 # find out server name and port
329 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 320 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
330 $host = $1; 321 $host = $1;
… …
341 $host = inet_ntoa $host; 332 $host = inet_ntoa $host;
342 } 333 }
343 334
344 $self->{server_name} = $host; 335 $self->{server_name} = $host;
345 336
346 # enter ourselves into various lists
347 weaken ($conn{$id}{$self*1} = $self);
348 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 337 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
349 338
350 eval { 339 eval {
351 $self->map_uri; 340 $self->map_uri;
352 $self->respond; 341 $self->respond;
353 }; 342 };
354 343
355 $self->eoconn;
356
357 die if $@ && !ref $@; 344 die if $@ && !ref $@;
358 345
359 last if $self->{h}{connection} =~ /close/; 346 last if $self->{h}{connection} =~ /close/i;
360 347
361 $httpevent->broadcast; 348 $httpevent->broadcast;
362 349
363 $fh->timeout($::PER_TIMEOUT); 350 $fh->timeout($::PER_TIMEOUT);
364 } 351 }
352}
353
354sub block {
355 my $self = shift;
356
357 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
358 $self->slog(2, "blocked ip $self->{remote_id}");
359 $self->err_blocked;
365} 360}
366 361
367# uri => path mapping 362# uri => path mapping
368sub map_uri { 363sub map_uri {
369 my $self = shift; 364 my $self = shift;
… …
445 $ims < $self->{stat}[9] 440 $ims < $self->{stat}[9]
446 or $self->err(304, "not modified"); 441 or $self->err(304, "not modified");
447 442
448 if (-r "$path/index.html") { 443 if (-r "$path/index.html") {
449 # replace directory "size" by index.html filesize 444 # replace directory "size" by index.html filesize
450 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7]; 445 $self->{stat} = [stat ($self->{path} .= "/index.html")];
451 $self->handle_file; 446 $self->handle_file($queue_index);
452 } else { 447 } else {
453 $self->handle_dir; 448 $self->handle_dir;
454 } 449 }
455 } 450 }
456 } elsif (-f _ && -r _) { 451 } elsif (-f _ && -r _) {
457 -x _ and $self->err(403, "forbidden"); 452 -x _ and $self->err(403, "forbidden");
453
454 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
455 my $timeout = $::NOW + 10;
456 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
457 if ($timeout < $::NOW) {
458 $self->block($::BLOCKTIME, "too many connections");
459 } else {
460 $httpevent->wait;
461 }
462 }
463 }
464
458 $self->handle_file; 465 $self->handle_file($queue_file);
459 } else { 466 } else {
460 $self->err(404, "not found"); 467 $self->err(404, "not found");
461 } 468 }
462 } 469 }
463} 470}
… …
468 475
469 $self->response(200, "ok", 476 $self->response(200, "ok",
470 { 477 {
471 "Content-Type" => "text/html", 478 "Content-Type" => "text/html",
472 "Content-Length" => length $idx, 479 "Content-Length" => length $idx,
473 "Last-Modified" => time2str ((stat _)[9]), 480 "Last-Modified" => time2str ($self->{stat}[9]),
474 }, 481 },
475 $idx); 482 $idx);
476} 483}
477 484
478sub handle_file { 485sub handle_file {
479 my $self = shift; 486 my ($self, $queue) = @_;
480 my $length = $self->{stat}[7]; 487 my $length = $self->{stat}[7];
481 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
482 my $hdr = { 488 my $hdr = {
483 "Last-Modified" => time2str ((stat _)[9]), 489 "Last-Modified" => time2str ((stat _)[9]),
484 }; 490 };
485 491
486 my @code = (200, "ok"); 492 my @code = (200, "ok");
… …
503 $self->err(416, "not satisfiable", $hdr, ""); 509 $self->err(416, "not satisfiable", $hdr, "");
504 510
505satisfiable: 511satisfiable:
506 # check for segmented downloads 512 # check for segmented downloads
507 if ($l && $::NO_SEGMENTED) { 513 if ($l && $::NO_SEGMENTED) {
508 my $delay = $::NOW + $::PER_TIMEOUT + 15; 514 my $timeout = $::NOW + 15;
509 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 515 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
510 if ($delay <= $::NOW) { 516 if ($timeout <= $::NOW) {
517 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
511 $self->err_segmented_download; 518 #$self->err_segmented_download;
512 } else { 519 } else {
513 $httpevent->wait; 520 $httpevent->wait;
514 } 521 }
515 } 522 }
516 } 523 }
… …
546 if ($l) { 553 if ($l) {
547 sysseek $fh, $l, 0; 554 sysseek $fh, $l, 0;
548 } 555 }
549 } 556 }
550 557
551 my $transfer; # transfer guard 558 my $transfer = $queue->start_transfer($h);
559 my $locked;
552 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 560 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
553 561
554 $self->{time} = $::NOW;
555
556 while ($h > 0) { 562 while ($h > 0) {
557 unless ($transfer) { 563 unless ($locked) {
558 if ($transfer ||= $queue->timed_guard($::WAIT_INTERVAL)) { 564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE; 565 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW; 566 $self->{time} = $::NOW;
561 } 567 }
568 }
569
570 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close";
572 die bless {}, err::;
562 } 573 }
563 574
564 if (0) { # !AIO 575 if (0) { # !AIO
565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h 576 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
566 or last; 577 or last;

Diff Legend

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