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

Diff Legend

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