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.61 by root, Thu Jan 3 01:20:17 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 ();
7 9
8no utf8; 10no utf8;
9use bytes; 11use bytes;
10 12
11# at least on my machine, this thingy serves files 13# at least on my machine, this thingy serves files
… …
13# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
14 16
15$SIG{PIPE} = 'IGNORE'; 17$SIG{PIPE} = 'IGNORE';
16 18
17our $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}
18 36
19if ($ACCESS_LOG) { 37if ($ACCESS_LOG) {
20 use IO::Handle; 38 use IO::Handle;
21 open $accesslog, ">>$ACCESS_LOG" 39 open $accesslog, ">>$ACCESS_LOG"
22 or die "$ACCESS_LOG: $!"; 40 or die "$ACCESS_LOG: $!";
… …
24} 42}
25 43
26sub slog { 44sub slog {
27 my $level = shift; 45 my $level = shift;
28 my $format = shift; 46 my $format = shift;
47 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
29 printf "---: $format\n", @_; 48 printf "$NOW: $format\n", @_;
49 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
30} 50}
31 51
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
53our $httpevent = new Coro::Signal;
33 54
34our $wait_factor = 0.95; 55our $queue_file = new transferqueue slots => $MAX_TRANSFERS, maxsize => 256*1024*1024;
35 56our $queue_index = new transferqueue slots => 10;
36our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
39);
40 57
41my @newcons; 58my @newcons;
42my @pool; 59my @pool;
43 60
44# one "execution thread" 61# one "execution thread"
45sub handler { 62sub handler {
46 while () { 63 while () {
47 my $new = pop @newcons;
48 if ($new) { 64 if (@newcons) {
49 eval { 65 eval {
50 conn->new(@$new)->handle; 66 conn->new(@{pop @newcons})->handle;
51 }; 67 };
52 slog 1, "$@" if $@ && !ref $@; 68 slog 1, "$@" if $@ && !ref $@;
69
70 $httpevent->broadcast; # only for testing, but doesn't matter much
71
53 $connections->up; 72 $connections->up;
54 } else { 73 } else {
55 last if @pool >= $MAX_POOL; 74 last if @pool >= $MAX_POOL;
56 push @pool, $Coro::current; 75 push @pool, $Coro::current;
57 schedule; 76 schedule;
58 } 77 }
59 } 78 }
79}
80
81sub listen_on {
82 my $listen = $_[0];
83
84 push @listen_sockets, $listen;
85
86 # the "main thread"
87 async {
88 slog 1, "accepting connections";
89 while () {
90 $connections->down;
91 push @newcons, [$listen->accept];
92 #slog 3, "accepted @$connections ".scalar(@pool);
93 if (@pool) {
94 (pop @pool)->ready;
95 } else {
96 async \&handler;
97 }
98
99 }
100 };
60} 101}
61 102
62my $http_port = new Coro::Socket 103my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 104 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 105 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 106 ReuseAddr => 1,
66 Listen => 50, 107 Listen => 50,
67 or die "unable to start server"; 108 or die "unable to start server";
68 109
69push @listen_sockets, $http_port; 110listen_on $http_port;
70 111
71our $NOW; 112if ($SERVER_PORT2) {
72our $HTTP_NOW; 113 my $http_port = new Coro::Socket
114 LocalAddr => $SERVER_HOST,
115 LocalPort => $SERVER_PORT2,
116 ReuseAddr => 1,
117 Listen => 50,
118 or die "unable to start server";
73 119
74Event->timer(interval => 1, hard => 1, cb => sub { 120 listen_on $http_port;
75 $NOW = time; 121}
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 122
95package conn; 123package conn;
96 124
97use Socket; 125use Socket;
98use HTTP::Date; 126use HTTP::Date;
99use Convert::Scalar 'weaken'; 127use Convert::Scalar 'weaken';
100use Linux::AIO; 128use Linux::AIO;
101 129
102Linux::AIO::min_parallel $::AIO_PARALLEL; 130Linux::AIO::min_parallel $::AIO_PARALLEL;
103
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105 131
106Event->io(fd => Linux::AIO::poll_fileno, 132Event->io(fd => Linux::AIO::poll_fileno,
107 poll => 'r', async => 1, 133 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb); 134 cb => \&Linux::AIO::poll_cb);
109 135
… …
127 153
128read_mimetypes; 154read_mimetypes;
129 155
130sub new { 156sub new {
131 my $class = shift; 157 my $class = shift;
158 my $fh = shift;
132 my $peername = shift; 159 my $peername = shift;
133 my $fh = shift;
134 my $self = bless { fh => $fh }, $class; 160 my $self = bless { fh => $fh }, $class;
135 my (undef, $iaddr) = unpack_sockaddr_in $peername 161 my (undef, $iaddr) = unpack_sockaddr_in $peername
136 or $self->err(500, "unable to decode peername"); 162 or $self->err(500, "unable to decode peername");
137 163
164 $self->{remote_addr} =
138 $self->{remote_addr} = inet_ntoa $iaddr; 165 $self->{remote_id} = inet_ntoa $iaddr;
166
139 $self->{time} = $::NOW; 167 $self->{time} = $::NOW;
140 168
169 weaken ($Coro::current->{conn} = $self);
170
141 $::conns++; 171 $::conns++;
172 $::maxconns = $::conns if $::conns > $::maxconns;
142 173
143 $self; 174 $self;
144} 175}
145 176
146sub DESTROY { 177sub DESTROY {
147 my $self = shift; 178 #my $self = shift;
148
149 $::conns--; 179 $::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} 180}
162 181
163sub slog { 182sub slog {
164 my $self = shift; 183 my $self = shift;
165 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
166} 185}
167 186
168sub response { 187sub response {
169 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
170 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
171 190
172 $self->{h}{connection} ||= $hdr->{Connection}; 191 if (exists $hdr->{Connection}) {
192 if ($hdr->{Connection} =~ /close/) {
193 $self->{h}{connection} = "close"
194 }
195 } else {
196 if ($self->{version} < 1.1) {
197 if ($self->{h}{connection} =~ /keep-alive/i) {
198 $hdr->{Connection} = "Keep-Alive";
199 } else {
200 $self->{h}{connection} = "close"
201 }
202 }
203 }
173 204
174 $res .= "Date: $HTTP_NOW\015\012"; 205 $res .= "Date: $HTTP_NOW\015\012";
175 206
176 while (my ($h, $v) = each %$hdr) { 207 while (my ($h, $v) = each %$hdr) {
177 $res .= "$h: $v\015\012" 208 $res .= "$h: $v\015\012"
178 } 209 }
179 $res .= "\015\012"; 210 $res .= "\015\012";
180 211
181 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
182 213
183 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 214 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
215 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
216 " \"$self->{h}{referer}\"\n";
184 217
185 print $accesslog $log if $accesslog; 218 print $accesslog $log if $accesslog;
186 print STDERR $log; 219 print STDERR $log;
187 220
188 $self->{written} += 221 $self->{written} +=
… …
272 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 305 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
273 } 306 }
274 307
275 $self->{remote_id} = $id; 308 $self->{remote_id} = $id;
276 309
310 weaken (local $conn{$id}{$self*1} = $self);
311
277 if ($blocked{$id}) { 312 if ($blocked{$id}) {
278 $self->err_blocked($blocked{$id}) 313 $self->err_blocked
279 if $blocked{$id} > $::NOW; 314 if $blocked{$id}[0] > $::NOW;
280 315
281 delete $blocked{$id}; 316 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 } 317 }
295 318
296 # find out server name and port 319 # find out server name and port
297 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 320 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
298 $host = $1; 321 $host = $1;
… …
302 325
303 if (defined $host) { 326 if (defined $host) {
304 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 327 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
305 } else { 328 } else {
306 ($self->{server_port}, $host) 329 ($self->{server_port}, $host)
307 = unpack_sockaddr_in $self->{fh}->getsockname 330 = unpack_sockaddr_in $self->{fh}->sockname
308 or $self->err(500, "unable to get socket name"); 331 or $self->err(500, "unable to get socket name");
309 $host = inet_ntoa $host; 332 $host = inet_ntoa $host;
310 } 333 }
311 334
312 $self->{server_name} = $host; 335 $self->{server_name} = $host;
313 336
314 # enter ourselves into various lists
315 weaken ($conn{$id}{$self*1} = $self);
316 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 337 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
317 338
318 eval { 339 eval {
319 $self->map_uri; 340 $self->map_uri;
320 $self->respond; 341 $self->respond;
321 }; 342 };
322 343
323 $self->eoconn;
324
325 die if $@ && !ref $@; 344 die if $@ && !ref $@;
326 345
327 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 346 last if $self->{h}{connection} =~ /close/i;
347
348 $httpevent->broadcast;
328 349
329 $fh->timeout($::PER_TIMEOUT); 350 $fh->timeout($::PER_TIMEOUT);
330 } 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;
331} 360}
332 361
333# uri => path mapping 362# uri => path mapping
334sub map_uri { 363sub map_uri {
335 my $self = shift; 364 my $self = shift;
… …
382 411
383sub respond { 412sub respond {
384 my $self = shift; 413 my $self = shift;
385 my $path = $self->{path}; 414 my $path = $self->{path};
386 415
387 stat $path 416 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
388 or $self->err(404, "not found"); 417 if ($::internal{$1}) {
389 418 $::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 { 419 } else {
403 $ims < $self->{stat}[9] 420 $self->err(404, "not found");
421 }
422 } else {
423
424 stat $path
404 or $self->err(304, "not modified"); 425 or $self->err(404, "not found");
405 426
406 if (-r "$path/index.html") { 427 $self->{stat} = [stat _];
407 $self->{path} .= "/index.html"; 428
408 $self->handle_file; 429 # idiotic netscape sends idiotic headers AGAIN
430 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
431 ? str2time $1 : 0;
432
433 if (-d _ && -r _) {
434 # directory
435 if ($path !~ /\/$/) {
436 # create a redirect to get the trailing "/"
437 # we don't try to avoid the :80
438 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
409 } else { 439 } else {
440 $ims < $self->{stat}[9]
441 or $self->err(304, "not modified");
442
443 if (-r "$path/index.html") {
444 # replace directory "size" by index.html filesize
445 $self->{stat} = [stat ($self->{path} .= "/index.html")];
446 $self->handle_file($queue_index);
447 } else {
410 $self->handle_dir; 448 $self->handle_dir;
411 } 449 }
412 } 450 }
413 } elsif (-f _ && -r _) { 451 } elsif (-f _ && -r _) {
414 -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
415 $self->handle_file; 465 $self->handle_file($queue_file);
416 } else { 466 } else {
417 $self->err(404, "not found"); 467 $self->err(404, "not found");
468 }
418 } 469 }
419} 470}
420 471
421sub handle_dir { 472sub handle_dir {
422 my $self = shift; 473 my $self = shift;
… …
424 475
425 $self->response(200, "ok", 476 $self->response(200, "ok",
426 { 477 {
427 "Content-Type" => "text/html", 478 "Content-Type" => "text/html",
428 "Content-Length" => length $idx, 479 "Content-Length" => length $idx,
480 "Last-Modified" => time2str ($self->{stat}[9]),
429 }, 481 },
430 $idx); 482 $idx);
431} 483}
432 484
433sub handle_file { 485sub handle_file {
434 my $self = shift; 486 my ($self, $queue) = @_;
435 my $length = $self->{stat}[7]; 487 my $length = $self->{stat}[7];
436 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
437 my $hdr = { 488 my $hdr = {
438 "Last-Modified" => time2str ((stat _)[9]), 489 "Last-Modified" => time2str ((stat _)[9]),
439 }; 490 };
440 491
441 my @code = (200, "ok"); 492 my @code = (200, "ok");
… …
458 $self->err(416, "not satisfiable", $hdr, ""); 509 $self->err(416, "not satisfiable", $hdr, "");
459 510
460satisfiable: 511satisfiable:
461 # check for segmented downloads 512 # check for segmented downloads
462 if ($l && $::NO_SEGMENTED) { 513 if ($l && $::NO_SEGMENTED) {
463 my $delay = $::PER_TIMEOUT + 15; 514 my $timeout = $::NOW + 15;
464 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 515 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
465 if ($delay <= 0) { 516 if ($timeout <= $::NOW) {
517 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
466 $self->err_segmented_download; 518 #$self->err_segmented_download;
467 } else { 519 } else {
468 Coro::Event::do_timer(after => 4); $delay -= 4; 520 $httpevent->wait;
469 } 521 }
470 } 522 }
471 } 523 }
472 524
473 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 525 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
486 $self->response(@code, $hdr, ""); 538 $self->response(@code, $hdr, "");
487 539
488 if ($self->{method} eq "GET") { 540 if ($self->{method} eq "GET") {
489 $self->{time} = $::NOW; 541 $self->{time} = $::NOW;
490 542
491 my $fudge = $queue->[0]->waiters; 543 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 544
506 my ($fh, $buf, $r); 545 my ($fh, $buf, $r);
507 my $current = $Coro::current; 546
508 open $fh, "<", $self->{path} 547 open $fh, "<", $self->{path}
509 or die "$self->{path}: late open failure ($!)"; 548 or die "$self->{path}: late open failure ($!)";
510 549
511 $h -= $l - 1; 550 $h -= $l - 1;
512 551
513 if (0) { 552 if (0) { # !AIO
514 if ($l) { 553 if ($l) {
515 sysseek $fh, $l, 0; 554 sysseek $fh, $l, 0;
516 } 555 }
517 } 556 }
557
558 my $transfer = $queue->start_transfer($h);
559 my $locked;
560 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
518 561
519 while ($h > 0) { 562 while ($h > 0) {
563 unless ($locked) {
564 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
565 $bufsize = $::BUFSIZE;
566 $self->{time} = $::NOW;
567 }
568 }
569
570 if ($blocked{$self->{remote_id}}) {
571 $self->{h}{connection} = "close";
572 die bless {}, err::;
573 }
574
520 if (0) { 575 if (0) { # !AIO
521 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 576 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
522 or last; 577 or last;
523 } else { 578 } else {
524 undef $buf; 579 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 { 580 $buf, 0, sub {
528 $r = $_[0]; 581 $r = $_[0];
529 $current->ready; 582 Coro::ready($current);
530 }); 583 });
531 &Coro::schedule; 584 &Coro::schedule;
532 $aio_requests->up;
533 last unless $r; 585 last unless $r;
534 } 586 }
535 my $w = $self->{fh}->syswrite($buf) 587 my $w = syswrite $self->{fh}, $buf
536 or last; 588 or last;
537 $::written += $w; 589 $::written += $w;
538 $self->{written} += $w; 590 $self->{written} += $w;
539 $l += $r; 591 $l += $r;
540 } 592 }

Diff Legend

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