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.52 by root, Fri Nov 30 05:11:23 2001 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
… …
28 my $format = shift; 30 my $format = shift;
29 printf "---: $format\n", @_; 31 printf "---: $format\n", @_;
30} 32}
31 33
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal;
33 36
34our $wait_factor = 0.95; 37our $wait_factor = 0.95;
35 38
36our @transfers = ( 39our $queue_small = new transferqueue $MAX_TRANSFERS_SMALL;
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 40our $queue_large = new transferqueue $MAX_TRANSFERS_LARGE;
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 41our $queue_index = new transferqueue 5;
39);
40 42
41my @newcons; 43my @newcons;
42my @pool; 44my @pool;
43 45
44# one "execution thread" 46# one "execution thread"
45sub handler { 47sub handler {
46 while () { 48 while () {
47 my $new = pop @newcons;
48 if ($new) { 49 if (@newcons) {
49 eval { 50 eval {
50 conn->new(@$new)->handle; 51 conn->new(@{pop @newcons})->handle;
51 }; 52 };
52 slog 1, "$@" if $@ && !ref $@; 53 slog 1, "$@" if $@ && !ref $@;
53 $connections->up; 54 $connections->up;
54 } else { 55 } else {
55 last if @pool >= $MAX_POOL; 56 last if @pool >= $MAX_POOL;
… …
57 schedule; 58 schedule;
58 } 59 }
59 } 60 }
60} 61}
61 62
63sub listen_on {
64 my $listen = $_[0];
65
66 push @listen_sockets, $listen;
67
68 # the "main thread"
69 async {
70 slog 1, "accepting connections";
71 while () {
72 $connections->down;
73 push @newcons, [$listen->accept];
74 #slog 3, "accepted @$connections ".scalar(@pool);
75 if (@pool) {
76 (pop @pool)->ready;
77 } else {
78 async \&handler;
79 }
80
81 }
82 };
83}
84
62my $http_port = new Coro::Socket 85my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 86 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 87 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 88 ReuseAddr => 1,
66 Listen => 50, 89 Listen => 50,
67 or die "unable to start server"; 90 or die "unable to start server";
68 91
69push @listen_sockets, $http_port; 92listen_on $http_port;
93
94if ($SERVER_PORT2) {
95 my $http_port = new Coro::Socket
96 LocalAddr => $SERVER_HOST,
97 LocalPort => $SERVER_PORT2,
98 ReuseAddr => 1,
99 Listen => 50,
100 or die "unable to start server";
101
102 listen_on $http_port;
103}
70 104
71our $NOW; 105our $NOW;
72our $HTTP_NOW; 106our $HTTP_NOW;
73 107
74Event->timer(interval => 1, hard => 1, cb => sub { 108Event->timer(interval => 1, hard => 1, cb => sub {
75 $NOW = time; 109 $NOW = time;
76 $HTTP_NOW = time2str $NOW; 110 $HTTP_NOW = time2str $NOW;
77})->now; 111})->now;
78 112
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
95package conn; 113package conn;
96 114
97use Socket; 115use Socket;
98use HTTP::Date; 116use HTTP::Date;
99use Convert::Scalar 'weaken'; 117use Convert::Scalar 'weaken';
100use Linux::AIO; 118use Linux::AIO;
101 119
102Linux::AIO::min_parallel $::AIO_PARALLEL; 120Linux::AIO::min_parallel $::AIO_PARALLEL;
103
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105 121
106Event->io(fd => Linux::AIO::poll_fileno, 122Event->io(fd => Linux::AIO::poll_fileno,
107 poll => 'r', async => 1, 123 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb); 124 cb => \&Linux::AIO::poll_cb);
109 125
… …
127 143
128read_mimetypes; 144read_mimetypes;
129 145
130sub new { 146sub new {
131 my $class = shift; 147 my $class = shift;
148 my $fh = shift;
132 my $peername = shift; 149 my $peername = shift;
133 my $fh = shift;
134 my $self = bless { fh => $fh }, $class; 150 my $self = bless { fh => $fh }, $class;
135 my (undef, $iaddr) = unpack_sockaddr_in $peername 151 my (undef, $iaddr) = unpack_sockaddr_in $peername
136 or $self->err(500, "unable to decode peername"); 152 or $self->err(500, "unable to decode peername");
137 153
154 $self->{remote_addr} =
138 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_id} = inet_ntoa $iaddr;
139 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
140 157
158 weaken ($Coro::current->{conn} = $self);
159
141 $::conns++; 160 $::conns++;
142 161
143 $self; 162 $self;
144} 163}
145 164
146sub DESTROY { 165sub DESTROY {
147 my $self = shift; 166 my $self = shift;
148
149 $::conns--; 167 $::conns--;
150
151 $self->eoconn; 168 $self->eoconn;
152} 169}
153 170
154# end of connection 171# end of connection
155sub eoconn { 172sub eoconn {
156 my $self = shift; 173 my $self = shift;
157 174
158 # clean up hints 175 # clean up hints
159 delete $conn{$self->{remote_id}}{$self*1}; 176 delete $conn{$self->{remote_id}}{$self*1};
160 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
178
179 $httpevent->broadcast;
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} +=
… …
280 313
281 delete $blocked{$id}; 314 delete $blocked{$id};
282 } 315 }
283 316
284 if (%{$conn{$id}} >= $::MAX_CONN_IP) { 317 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
285 my $delay = $::PER_TIMEOUT + 15; 318 my $delay = $::PER_TIMEOUT + $::NOW + 15;
286 while (%{$conn{$id}} >= $::MAX_CONN_IP) { 319 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
287 if ($delay <= 0) { 320 if ($delay < $::NOW) {
288 $self->slog(2, "blocked ip $id"); 321 $self->slog(2, "blocked ip $id");
289 $self->err_blocked; 322 $self->err_blocked;
290 } else { 323 } else {
291 Coro::Event::do_timer(after => 4); $delay -= 4; 324 $httpevent->wait;
292 } 325 }
293 } 326 }
294 } 327 }
295 328
296 # find out server name and port 329 # find out server name and port
… …
302 335
303 if (defined $host) { 336 if (defined $host) {
304 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 337 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
305 } else { 338 } else {
306 ($self->{server_port}, $host) 339 ($self->{server_port}, $host)
307 = unpack_sockaddr_in $self->{fh}->getsockname 340 = unpack_sockaddr_in $self->{fh}->sockname
308 or $self->err(500, "unable to get socket name"); 341 or $self->err(500, "unable to get socket name");
309 $host = inet_ntoa $host; 342 $host = inet_ntoa $host;
310 } 343 }
311 344
312 $self->{server_name} = $host; 345 $self->{server_name} = $host;
… …
322 355
323 $self->eoconn; 356 $self->eoconn;
324 357
325 die if $@ && !ref $@; 358 die if $@ && !ref $@;
326 359
327 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 360 last if $self->{h}{connection} =~ /close/;
361
362 $httpevent->broadcast;
328 363
329 $fh->timeout($::PER_TIMEOUT); 364 $fh->timeout($::PER_TIMEOUT);
330 } 365 }
331} 366}
332 367
… …
382 417
383sub respond { 418sub respond {
384 my $self = shift; 419 my $self = shift;
385 my $path = $self->{path}; 420 my $path = $self->{path};
386 421
387 stat $path 422 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
388 or $self->err(404, "not found"); 423 if ($::internal{$1}) {
389 424 $::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 { 425 } else {
403 $ims < $self->{stat}[9] 426 $self->err(404, "not found");
427 }
428 } else {
429
430 stat $path
404 or $self->err(304, "not modified"); 431 or $self->err(404, "not found");
405 432
406 if (-r "$path/index.html") { 433 $self->{stat} = [stat _];
407 $self->{path} .= "/index.html"; 434
408 $self->handle_file; 435 # idiotic netscape sends idiotic headers AGAIN
436 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
437 ? str2time $1 : 0;
438
439 if (-d _ && -r _) {
440 # directory
441 if ($path !~ /\/$/) {
442 # create a redirect to get the trailing "/"
443 # we don't try to avoid the :80
444 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
409 } else { 445 } else {
446 $ims < $self->{stat}[9]
447 or $self->err(304, "not modified");
448
449 if (-r "$path/index.html") {
450 # replace directory "size" by index.html filesize
451 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
452 $self->handle_file($queue_index);
453 } else {
410 $self->handle_dir; 454 $self->handle_dir;
411 } 455 }
412 } 456 }
413 } elsif (-f _ && -r _) { 457 } elsif (-f _ && -r _) {
414 -x _ and $self->err(403, "forbidden"); 458 -x _ and $self->err(403, "forbidden");
415 $self->handle_file; 459 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small);
416 } else { 460 } else {
417 $self->err(404, "not found"); 461 $self->err(404, "not found");
462 }
418 } 463 }
419} 464}
420 465
421sub handle_dir { 466sub handle_dir {
422 my $self = shift; 467 my $self = shift;
… …
424 469
425 $self->response(200, "ok", 470 $self->response(200, "ok",
426 { 471 {
427 "Content-Type" => "text/html", 472 "Content-Type" => "text/html",
428 "Content-Length" => length $idx, 473 "Content-Length" => length $idx,
474 #d# directories change all the time, so X-
475 "X-Last-Modified" => time2str ((stat _)[9]),
429 }, 476 },
430 $idx); 477 $idx);
431} 478}
432 479
433sub handle_file { 480sub handle_file {
434 my $self = shift; 481 my ($self, $queue) = @_;
435 my $length = $self->{stat}[7]; 482 my $length = $self->{stat}[7];
436 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
437 my $hdr = { 483 my $hdr = {
438 "Last-Modified" => time2str ((stat _)[9]), 484 "Last-Modified" => time2str ((stat _)[9]),
439 }; 485 };
440 486
441 my @code = (200, "ok"); 487 my @code = (200, "ok");
… …
458 $self->err(416, "not satisfiable", $hdr, ""); 504 $self->err(416, "not satisfiable", $hdr, "");
459 505
460satisfiable: 506satisfiable:
461 # check for segmented downloads 507 # check for segmented downloads
462 if ($l && $::NO_SEGMENTED) { 508 if ($l && $::NO_SEGMENTED) {
463 my $delay = $::PER_TIMEOUT + 15; 509 my $delay = $::NOW + $::PER_TIMEOUT + 15;
464 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
465 if ($delay <= 0) { 511 if ($delay <= $::NOW) {
466 $self->err_segmented_download; 512 $self->err_segmented_download;
467 } else { 513 } else {
468 Coro::Event::do_timer(after => 4); $delay -= 4; 514 $httpevent->wait;
469 } 515 }
470 } 516 }
471 } 517 }
472 518
473 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 519 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
486 $self->response(@code, $hdr, ""); 532 $self->response(@code, $hdr, "");
487 533
488 if ($self->{method} eq "GET") { 534 if ($self->{method} eq "GET") {
489 $self->{time} = $::NOW; 535 $self->{time} = $::NOW;
490 536
491 my $fudge = $queue->[0]->waiters; 537 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 538
506 my ($fh, $buf, $r); 539 my ($fh, $buf, $r);
507 my $current = $Coro::current; 540
508 open $fh, "<", $self->{path} 541 open $fh, "<", $self->{path}
509 or die "$self->{path}: late open failure ($!)"; 542 or die "$self->{path}: late open failure ($!)";
510 543
511 $h -= $l - 1; 544 $h -= $l - 1;
512 545
513 if (0) { 546 if (0) { # !AIO
514 if ($l) { 547 if ($l) {
515 sysseek $fh, $l, 0; 548 sysseek $fh, $l, 0;
516 } 549 }
517 } 550 }
551
552 my $transfer = $queue->start_transfer;
553 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
518 555
519 while ($h > 0) { 556 while ($h > 0) {
557 unless ($locked) {
558 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW;
561 }
562 }
563
520 if (0) { 564 if (0) { # !AIO
521 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
522 or last; 566 or last;
523 } else { 567 } else {
524 undef $buf; 568 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 { 569 $buf, 0, sub {
528 $r = $_[0]; 570 $r = $_[0];
529 $current->ready; 571 Coro::ready($current);
530 }); 572 });
531 &Coro::schedule; 573 &Coro::schedule;
532 $aio_requests->up;
533 last unless $r; 574 last unless $r;
534 } 575 }
535 my $w = $self->{fh}->syswrite($buf) 576 my $w = syswrite $self->{fh}, $buf
536 or last; 577 or last;
537 $::written += $w; 578 $::written += $w;
538 $self->{written} += $w; 579 $self->{written} += $w;
539 $l += $r; 580 $l += $r;
540 } 581 }

Diff Legend

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