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

Diff Legend

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