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.32 by root, Wed Aug 29 01:32:50 2001 UTC vs.
Revision 1.54 by root, Fri Nov 30 06:03:48 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
11our @wait_time = (0); # used to calculcate avg. waiting time
12 12
13# at least on my machine, this thingy serves files 13# at least on my machine, this thingy serves files
14# quite a bit faster than apache, ;) 14# quite a bit faster than apache, ;)
15# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
16 16
… …
30 my $format = shift; 30 my $format = shift;
31 printf "---: $format\n", @_; 31 printf "---: $format\n", @_;
32} 32}
33 33
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $transfers = new Coro::Semaphore $MAX_TRANSFER || 50; 35our $httpevent = new Coro::Signal;
36
37our $wait_factor = 0.95;
38
39our $queue_small = new transferqueue $MAX_TRANSFERS_SMALL;
40our $queue_large = new transferqueue $MAX_TRANSFERS_LARGE;
41our $queue_index = new transferqueue 5;
36 42
37my @newcons; 43my @newcons;
38my @pool; 44my @pool;
39 45
40# one "execution thread" 46# one "execution thread"
41sub handler { 47sub handler {
42 while () { 48 while () {
43 my $new = pop @newcons;
44 if ($new) { 49 if (@newcons) {
45 eval { 50 eval {
46 conn->new(@$new)->handle; 51 conn->new(@{pop @newcons})->handle;
47 }; 52 };
48 slog 1, "$@" if $@ && !ref $@; 53 slog 1, "$@" if $@ && !ref $@;
49 $connections->up; 54 $connections->up;
50 } else { 55 } else {
51 last if @pool >= $MAX_POOL; 56 last if @pool >= $MAX_POOL;
… …
53 schedule; 58 schedule;
54 } 59 }
55 } 60 }
56} 61}
57 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
58my $http_port = new Coro::Socket 85my $http_port = new Coro::Socket
59 LocalAddr => $SERVER_HOST, 86 LocalAddr => $SERVER_HOST,
60 LocalPort => $SERVER_PORT, 87 LocalPort => $SERVER_PORT,
61 ReuseAddr => 1, 88 ReuseAddr => 1,
62 Listen => 50, 89 Listen => 50,
63 or die "unable to start server"; 90 or die "unable to start server";
64 91
65push @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}
66 104
67our $NOW; 105our $NOW;
68our $HTTP_NOW; 106our $HTTP_NOW;
69 107
70Event->timer(interval => 1, hard => 1, cb => sub { 108Event->timer(interval => 1, hard => 1, cb => sub {
71 $NOW = time; 109 $NOW = time;
72 $HTTP_NOW = time2str $NOW; 110 $HTTP_NOW = time2str $NOW;
73}); 111})->now;
74
75# the "main thread"
76async {
77 slog 1, "accepting connections";
78 while () {
79 $connections->down;
80 push @newcons, [$http_port->accept];
81 #slog 3, "accepted @$connections ".scalar(@pool);
82 if (@pool) {
83 (pop @pool)->ready;
84 } else {
85 async \&handler;
86 }
87
88 }
89};
90 112
91package conn; 113package conn;
92 114
93use Socket; 115use Socket;
94use HTTP::Date; 116use HTTP::Date;
95use Convert::Scalar 'weaken'; 117use Convert::Scalar 'weaken';
96use Linux::AIO; 118use Linux::AIO;
97 119
98Linux::AIO::min_parallel $::AIO_PARALLEL; 120Linux::AIO::min_parallel $::AIO_PARALLEL;
99
100my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
101 121
102Event->io(fd => Linux::AIO::poll_fileno, 122Event->io(fd => Linux::AIO::poll_fileno,
103 poll => 'r', async => 1, 123 poll => 'r', async => 1,
104 cb => \&Linux::AIO::poll_cb); 124 cb => \&Linux::AIO::poll_cb);
105 125
… …
123 143
124read_mimetypes; 144read_mimetypes;
125 145
126sub new { 146sub new {
127 my $class = shift; 147 my $class = shift;
148 my $fh = shift;
128 my $peername = shift; 149 my $peername = shift;
129 my $fh = shift;
130 my $self = bless { fh => $fh }, $class; 150 my $self = bless { fh => $fh }, $class;
131 my (undef, $iaddr) = unpack_sockaddr_in $peername 151 my (undef, $iaddr) = unpack_sockaddr_in $peername
132 or $self->err(500, "unable to decode peername"); 152 or $self->err(500, "unable to decode peername");
133 153
154 $self->{remote_addr} =
134 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_id} = inet_ntoa $iaddr;
135 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
136 157
137 # enter ourselves into various lists 158 weaken ($Coro::current->{conn} = $self);
138 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
139 159
140 $::conns++; 160 $::conns++;
161 $::maxconns = $::conns if $::conns > $::maxconns;
141 162
142 $self; 163 $self;
143} 164}
144 165
145sub DESTROY { 166sub DESTROY {
146 my $self = shift; 167 my $self = shift;
147
148 $::conns--; 168 $::conns--;
149
150 $self->eoconn; 169 $self->eoconn;
151 delete $conn{$self->{remote_addr}}{$self*1};
152} 170}
153 171
154# end of connection 172# end of connection
155sub eoconn { 173sub eoconn {
156 my $self = shift; 174 my $self = shift;
175
176 # clean up hints
177 delete $conn{$self->{remote_id}}{$self*1};
157 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 178 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
179
180 $httpevent->broadcast;
158} 181}
159 182
160sub slog { 183sub slog {
161 my $self = shift; 184 my $self = shift;
162 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 185 main::slog($_[0], "$self->{remote_id}> $_[1]");
163} 186}
164 187
165sub response { 188sub response {
166 my ($self, $code, $msg, $hdr, $content) = @_; 189 my ($self, $code, $msg, $hdr, $content) = @_;
167 my $res = "HTTP/1.1 $code $msg\015\012"; 190 my $res = "HTTP/1.1 $code $msg\015\012";
168 191
169 $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 }
170 205
171 $res .= "Date: $HTTP_NOW\015\012"; 206 $res .= "Date: $HTTP_NOW\015\012";
172 207
173 while (my ($h, $v) = each %$hdr) { 208 while (my ($h, $v) = each %$hdr) {
174 $res .= "$h: $v\015\012" 209 $res .= "$h: $v\015\012"
175 } 210 }
176 $res .= "\015\012"; 211 $res .= "\015\012";
177 212
178 $res .= $content if defined $content and $self->{method} ne "HEAD"; 213 $res .= $content if defined $content and $self->{method} ne "HEAD";
179 214
180 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";
181 218
182 print $accesslog $log if $accesslog; 219 print $accesslog $log if $accesslog;
183 print STDERR $log; 220 print STDERR $log;
184 221
185 $self->{written} += 222 $self->{written} +=
… …
189sub err { 226sub err {
190 my $self = shift; 227 my $self = shift;
191 my ($code, $msg, $hdr, $content) = @_; 228 my ($code, $msg, $hdr, $content) = @_;
192 229
193 unless (defined $content) { 230 unless (defined $content) {
194 $content = "$code $msg"; 231 $content = "$code $msg\n";
195 $hdr->{"Content-Type"} = "text/plain"; 232 $hdr->{"Content-Type"} = "text/plain";
196 $hdr->{"Content-Length"} = length $content; 233 $hdr->{"Content-Length"} = length $content;
197 } 234 }
198 $hdr->{"Connection"} = "close"; 235 $hdr->{"Connection"} = "close";
199 236
… …
224 } 261 }
225 262
226 $self->{h} = {}; 263 $self->{h} = {};
227 264
228 $fh->timeout($::RES_TIMEOUT); 265 $fh->timeout($::RES_TIMEOUT);
229 my $ip = $self->{remote_addr};
230
231 if ($blocked{$ip}) {
232 $self->err_blocked($blocked{$ip})
233 if $blocked{$ip} > $::NOW;
234
235 delete $blocked{$ip};
236 }
237
238 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
239 my $delay = 120;
240 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
241 if ($delay <= 0) {
242 $self->slog(2, "blocked ip $ip");
243 $self->err_blocked;
244 } else {
245 Coro::Event::do_timer(after => 3);
246 $delay -= 3;
247 }
248 }
249 }
250 266
251 $req =~ /^(?:\015\012)? 267 $req =~ /^(?:\015\012)?
252 (GET|HEAD) \040+ 268 (GET|HEAD) \040+
253 ([^\040]+) \040+ 269 ([^\040]+) \040+
254 HTTP\/([0-9]+\.[0-9]+) 270 HTTP\/([0-9]+\.[0-9]+)
… …
279 295
280 $self->{h}{$h} = substr $v, 1 296 $self->{h}{$h} = substr $v, 1
281 while ($h, $v) = each %hdr; 297 while ($h, $v) = each %hdr;
282 } 298 }
283 299
300 # remote id should be unique per user
301 my $id = $self->{remote_addr};
302
303 if (exists $self->{h}{"client-ip"}) {
304 $id .= "[".$self->{h}{"client-ip"}."]";
305 } elsif (exists $self->{h}{"x-forwarded-for"}) {
306 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
307 }
308
309 $self->{remote_id} = $id;
310
311 if ($blocked{$id}) {
312 $self->err_blocked($blocked{$id})
313 if $blocked{$id} > $::NOW;
314
315 delete $blocked{$id};
316 }
317
318 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
319 my $delay = $::PER_TIMEOUT + $::NOW + 15;
320 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
321 if ($delay < $::NOW) {
322 $self->slog(2, "blocked ip $id");
323 $self->err_blocked;
324 } else {
325 $httpevent->wait;
326 }
327 }
328 }
329
284 # find out server name and port 330 # find out server name and port
285 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 331 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
286 $host = $1; 332 $host = $1;
287 } else { 333 } else {
288 $host = $self->{h}{host}; 334 $host = $self->{h}{host};
… …
290 336
291 if (defined $host) { 337 if (defined $host) {
292 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 338 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
293 } else { 339 } else {
294 ($self->{server_port}, $host) 340 ($self->{server_port}, $host)
295 = unpack_sockaddr_in $self->{fh}->getsockname 341 = unpack_sockaddr_in $self->{fh}->sockname
296 or $self->err(500, "unable to get socket name"); 342 or $self->err(500, "unable to get socket name");
297 $host = inet_ntoa $host; 343 $host = inet_ntoa $host;
298 } 344 }
299 345
300 $self->{server_name} = $host; 346 $self->{server_name} = $host;
301 347
302 # remote id should be unique per user 348 # enter ourselves into various lists
303 $self->{remote_id} = $self->{remote_addr}; 349 weaken ($conn{$id}{$self*1} = $self);
304
305 if (exists $self->{h}{"client-ip"}) {
306 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
307 } elsif (exists $self->{h}{"x-forwarded-for"}) {
308 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
309 }
310
311 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 350 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
312 351
313 eval { 352 eval {
314 $self->map_uri; 353 $self->map_uri;
315 $self->respond; 354 $self->respond;
316 }; 355 };
317 356
318 $self->eoconn; 357 $self->eoconn;
319 358
320 die if $@ && !ref $@; 359 die if $@ && !ref $@;
321 360
322 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 361 last if $self->{h}{connection} =~ /close/;
362
363 $httpevent->broadcast;
323 364
324 $fh->timeout($::PER_TIMEOUT); 365 $fh->timeout($::PER_TIMEOUT);
325 } 366 }
326} 367}
327 368
… …
377 418
378sub respond { 419sub respond {
379 my $self = shift; 420 my $self = shift;
380 my $path = $self->{path}; 421 my $path = $self->{path};
381 422
382 stat $path 423 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
383 or $self->err(404, "not found"); 424 if ($::internal{$1}) {
384 425 $::internal{$1}->($self);
385 $self->{stat} = [stat _];
386
387 # idiotic netscape sends idiotic headers AGAIN
388 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
389 ? str2time $1 : 0;
390
391 if (-d _ && -r _) {
392 # directory
393 if ($path !~ /\/$/) {
394 # create a redirect to get the trailing "/"
395 # we don't try to avoid the :80
396 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
397 } else { 426 } else {
398 $ims < $self->{stat}[9] 427 $self->err(404, "not found");
428 }
429 } else {
430
431 stat $path
399 or $self->err(304, "not modified"); 432 or $self->err(404, "not found");
400 433
401 if (-r "$path/index.html") { 434 $self->{stat} = [stat _];
402 $self->{path} .= "/index.html"; 435
403 $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}/" });
404 } 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($queue_index);
454 } else {
405 $self->handle_dir; 455 $self->handle_dir;
406 } 456 }
407 } 457 }
408 } elsif (-f _ && -r _) { 458 } elsif (-f _ && -r _) {
409 -x _ and $self->err(403, "forbidden"); 459 -x _ and $self->err(403, "forbidden");
410 $self->handle_file; 460 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small);
411 } else { 461 } else {
412 $self->err(404, "not found"); 462 $self->err(404, "not found");
463 }
413 } 464 }
414} 465}
415 466
416sub handle_dir { 467sub handle_dir {
417 my $self = shift; 468 my $self = shift;
… …
419 470
420 $self->response(200, "ok", 471 $self->response(200, "ok",
421 { 472 {
422 "Content-Type" => "text/html", 473 "Content-Type" => "text/html",
423 "Content-Length" => length $idx, 474 "Content-Length" => length $idx,
475 "Last-Modified" => time2str ((stat _)[9]),
424 }, 476 },
425 $idx); 477 $idx);
426} 478}
427 479
428sub handle_file { 480sub handle_file {
429 my $self = shift; 481 my ($self, $queue) = @_;
430 my $length = -s _; 482 my $length = $self->{stat}[7];
431 my $hdr = { 483 my $hdr = {
432 "Last-Modified" => time2str ((stat _)[9]), 484 "Last-Modified" => time2str ((stat _)[9]),
433 }; 485 };
434 486
435 my @code = (200, "ok"); 487 my @code = (200, "ok");
… …
447 } 499 }
448 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 500 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
449 } 501 }
450 $hdr->{"Content-Range"} = "bytes */$length"; 502 $hdr->{"Content-Range"} = "bytes */$length";
451 $hdr->{"Content-Length"} = $length; 503 $hdr->{"Content-Length"} = $length;
452 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
453 $self->err(416, "not satisfiable", $hdr, ""); 504 $self->err(416, "not satisfiable", $hdr, "");
454 505
455satisfiable: 506satisfiable:
456 # check for segmented downloads 507 # check for segmented downloads
457 if ($l && $::NO_SEGMENTED) { 508 if ($l && $::NO_SEGMENTED) {
458 my $delay = 180; 509 my $delay = $::NOW + $::PER_TIMEOUT + 15;
459 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
460 if ($delay <= 0) { 511 if ($delay <= $::NOW) {
461 $self->err_segmented_download; 512 $self->err_segmented_download;
462 } else { 513 } else {
463 Coro::Event::do_timer(after => 3); $delay -= 3; 514 $httpevent->wait;
464 } 515 }
465 } 516 }
466 } 517 }
467 518
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 519 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
481 $self->response(@code, $hdr, ""); 532 $self->response(@code, $hdr, "");
482 533
483 if ($self->{method} eq "GET") { 534 if ($self->{method} eq "GET") {
484 $self->{time} = $::NOW; 535 $self->{time} = $::NOW;
485 536
486 my $transfer = $::transfers->guard; 537 my $current = $Coro::current;
487 $self->{fh}->writable or return;
488
489 push @::wait_time, $::NOW - $self->{time};
490 shift @::wait_time if @wait_time > 25;
491 $self->{time} = $::NOW;
492 538
493 my ($fh, $buf, $r); 539 my ($fh, $buf, $r);
494 my $current = $Coro::current; 540
495 open $fh, "<", $self->{path} 541 open $fh, "<", $self->{path}
496 or die "$self->{path}: late open failure ($!)"; 542 or die "$self->{path}: late open failure ($!)";
497 543
498 $h -= $l - 1; 544 $h -= $l - 1;
499 545
500 if (0) { 546 if (0) { # !AIO
501 if ($l) { 547 if ($l) {
502 sysseek $fh, $l, 0; 548 sysseek $fh, $l, 0;
503 } 549 }
504 } 550 }
551
552 my $transfer = $queue->start_transfer;
553 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
505 555
506 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
507 if (0) { 564 if (0) { # !AIO
508 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
509 or last; 566 or last;
510 } else { 567 } else {
511 undef $buf; 568 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
512 $aio_requests->down;
513 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
514 $buf, 0, sub { 569 $buf, 0, sub {
515 $r = $_[0]; 570 $r = $_[0];
516 $current->ready; 571 Coro::ready($current);
517 }); 572 });
518 &Coro::schedule; 573 &Coro::schedule;
519 $aio_requests->up;
520 last unless $r; 574 last unless $r;
521 } 575 }
522 my $w = $self->{fh}->syswrite($buf) 576 my $w = syswrite $self->{fh}, $buf
523 or last; 577 or last;
524 $::written += $w; 578 $::written += $w;
525 $self->{written} += $w; 579 $self->{written} += $w;
526 $l += $r; 580 $l += $r;
527 } 581 }

Diff Legend

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