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.32 by root, Wed Aug 29 01:32:50 2001 UTC vs.
Revision 1.48 by root, Tue Nov 27 03:38:08 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 @transfers = (
40 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL), 1],
41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE), 1],
42);
36 43
37my @newcons; 44my @newcons;
38my @pool; 45my @pool;
39 46
40# one "execution thread" 47# one "execution thread"
41sub handler { 48sub handler {
42 while () { 49 while () {
43 my $new = pop @newcons;
44 if ($new) { 50 if (@newcons) {
45 eval { 51 eval {
46 conn->new(@$new)->handle; 52 conn->new(@{pop @newcons})->handle;
47 }; 53 };
48 slog 1, "$@" if $@ && !ref $@; 54 slog 1, "$@" if $@ && !ref $@;
49 $connections->up; 55 $connections->up;
50 } else { 56 } else {
51 last if @pool >= $MAX_POOL; 57 last if @pool >= $MAX_POOL;
… …
53 schedule; 59 schedule;
54 } 60 }
55 } 61 }
56} 62}
57 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
58my $http_port = new Coro::Socket 86my $http_port = new Coro::Socket
59 LocalAddr => $SERVER_HOST, 87 LocalAddr => $SERVER_HOST,
60 LocalPort => $SERVER_PORT, 88 LocalPort => $SERVER_PORT,
61 ReuseAddr => 1, 89 ReuseAddr => 1,
62 Listen => 50, 90 Listen => 50,
63 or die "unable to start server"; 91 or die "unable to start server";
64 92
65push @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}
66 105
67our $NOW; 106our $NOW;
68our $HTTP_NOW; 107our $HTTP_NOW;
69 108
70Event->timer(interval => 1, hard => 1, cb => sub { 109Event->timer(interval => 1, hard => 1, cb => sub {
71 $NOW = time; 110 $NOW = time;
72 $HTTP_NOW = time2str $NOW; 111 $HTTP_NOW = time2str $NOW;
73}); 112})->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 113
91package conn; 114package conn;
92 115
93use Socket; 116use Socket;
94use HTTP::Date; 117use HTTP::Date;
95use Convert::Scalar 'weaken'; 118use Convert::Scalar 'weaken';
96use Linux::AIO; 119use Linux::AIO;
97 120
98Linux::AIO::min_parallel $::AIO_PARALLEL; 121Linux::AIO::min_parallel $::AIO_PARALLEL;
99
100my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
101 122
102Event->io(fd => Linux::AIO::poll_fileno, 123Event->io(fd => Linux::AIO::poll_fileno,
103 poll => 'r', async => 1, 124 poll => 'r', async => 1,
104 cb => \&Linux::AIO::poll_cb); 125 cb => \&Linux::AIO::poll_cb);
105 126
… …
123 144
124read_mimetypes; 145read_mimetypes;
125 146
126sub new { 147sub new {
127 my $class = shift; 148 my $class = shift;
149 my $fh = shift;
128 my $peername = shift; 150 my $peername = shift;
129 my $fh = shift;
130 my $self = bless { fh => $fh }, $class; 151 my $self = bless { fh => $fh }, $class;
131 my (undef, $iaddr) = unpack_sockaddr_in $peername 152 my (undef, $iaddr) = unpack_sockaddr_in $peername
132 or $self->err(500, "unable to decode peername"); 153 or $self->err(500, "unable to decode peername");
133 154
134 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_addr} = inet_ntoa $iaddr;
135 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
136 157
137 # enter ourselves into various lists
138 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
139
140 $::conns++; 158 $::conns++;
141 159
142 $self; 160 $self;
143} 161}
144 162
145sub DESTROY { 163sub DESTROY {
146 my $self = shift; 164 my $self = shift;
147
148 $::conns--; 165 $::conns--;
149
150 $self->eoconn; 166 $self->eoconn;
151 delete $conn{$self->{remote_addr}}{$self*1};
152} 167}
153 168
154# end of connection 169# end of connection
155sub eoconn { 170sub eoconn {
156 my $self = shift; 171 my $self = shift;
172
173 # clean up hints
174 delete $conn{$self->{remote_id}}{$self*1};
157 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 175 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
176
177 $httpevent->broadcast;
158} 178}
159 179
160sub slog { 180sub slog {
161 my $self = shift; 181 my $self = shift;
162 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
… …
164 184
165sub response { 185sub response {
166 my ($self, $code, $msg, $hdr, $content) = @_; 186 my ($self, $code, $msg, $hdr, $content) = @_;
167 my $res = "HTTP/1.1 $code $msg\015\012"; 187 my $res = "HTTP/1.1 $code $msg\015\012";
168 188
169 $self->{h}{connection} ||= $hdr->{Connection}; 189 if (exists $hdr->{Connection}) {
190 if ($hdr->{Connection} =~ /close/) {
191 $self->{h}{connection} = "close"
192 }
193 } else {
194 if ($self->{version} < 1.1) {
195 if ($self->{h}{connection} =~ /keep-alive/i) {
196 $hdr->{Connection} = "Keep-Alive";
197 } else {
198 $self->{h}{connection} = "close"
199 }
200 }
201 }
170 202
171 $res .= "Date: $HTTP_NOW\015\012"; 203 $res .= "Date: $HTTP_NOW\015\012";
172 204
173 while (my ($h, $v) = each %$hdr) { 205 while (my ($h, $v) = each %$hdr) {
174 $res .= "$h: $v\015\012" 206 $res .= "$h: $v\015\012"
175 } 207 }
176 $res .= "\015\012"; 208 $res .= "\015\012";
177 209
178 $res .= $content if defined $content and $self->{method} ne "HEAD"; 210 $res .= $content if defined $content and $self->{method} ne "HEAD";
179 211
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
180 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 213 " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
181 214
182 print $accesslog $log if $accesslog; 215 print $accesslog $log if $accesslog;
183 print STDERR $log; 216 print STDERR $log;
184 217
185 $self->{written} += 218 $self->{written} +=
… …
189sub err { 222sub err {
190 my $self = shift; 223 my $self = shift;
191 my ($code, $msg, $hdr, $content) = @_; 224 my ($code, $msg, $hdr, $content) = @_;
192 225
193 unless (defined $content) { 226 unless (defined $content) {
194 $content = "$code $msg"; 227 $content = "$code $msg\n";
195 $hdr->{"Content-Type"} = "text/plain"; 228 $hdr->{"Content-Type"} = "text/plain";
196 $hdr->{"Content-Length"} = length $content; 229 $hdr->{"Content-Length"} = length $content;
197 } 230 }
198 $hdr->{"Connection"} = "close"; 231 $hdr->{"Connection"} = "close";
199 232
… …
224 } 257 }
225 258
226 $self->{h} = {}; 259 $self->{h} = {};
227 260
228 $fh->timeout($::RES_TIMEOUT); 261 $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 262
251 $req =~ /^(?:\015\012)? 263 $req =~ /^(?:\015\012)?
252 (GET|HEAD) \040+ 264 (GET|HEAD) \040+
253 ([^\040]+) \040+ 265 ([^\040]+) \040+
254 HTTP\/([0-9]+\.[0-9]+) 266 HTTP\/([0-9]+\.[0-9]+)
… …
279 291
280 $self->{h}{$h} = substr $v, 1 292 $self->{h}{$h} = substr $v, 1
281 while ($h, $v) = each %hdr; 293 while ($h, $v) = each %hdr;
282 } 294 }
283 295
296 # remote id should be unique per user
297 my $id = $self->{remote_addr};
298
299 if (exists $self->{h}{"client-ip"}) {
300 $id .= "[".$self->{h}{"client-ip"}."]";
301 } elsif (exists $self->{h}{"x-forwarded-for"}) {
302 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
303 }
304
305 $self->{remote_id} = $id;
306
307 if ($blocked{$id}) {
308 $self->err_blocked($blocked{$id})
309 if $blocked{$id} > $::NOW;
310
311 delete $blocked{$id};
312 }
313
314 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
315 my $delay = $::PER_TIMEOUT + $::NOW + 15;
316 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
317 if ($delay < $::NOW) {
318 $self->slog(2, "blocked ip $id");
319 $self->err_blocked;
320 } else {
321 $httpevent->wait;
322 }
323 }
324 }
325
284 # find out server name and port 326 # find out server name and port
285 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 327 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
286 $host = $1; 328 $host = $1;
287 } else { 329 } else {
288 $host = $self->{h}{host}; 330 $host = $self->{h}{host};
… …
290 332
291 if (defined $host) { 333 if (defined $host) {
292 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 334 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
293 } else { 335 } else {
294 ($self->{server_port}, $host) 336 ($self->{server_port}, $host)
295 = unpack_sockaddr_in $self->{fh}->getsockname 337 = unpack_sockaddr_in $self->{fh}->sockname
296 or $self->err(500, "unable to get socket name"); 338 or $self->err(500, "unable to get socket name");
297 $host = inet_ntoa $host; 339 $host = inet_ntoa $host;
298 } 340 }
299 341
300 $self->{server_name} = $host; 342 $self->{server_name} = $host;
301 343
302 # remote id should be unique per user 344 # enter ourselves into various lists
303 $self->{remote_id} = $self->{remote_addr}; 345 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); 346 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
312 347
313 eval { 348 eval {
314 $self->map_uri; 349 $self->map_uri;
315 $self->respond; 350 $self->respond;
316 }; 351 };
317 352
318 $self->eoconn; 353 $self->eoconn;
319 354
320 die if $@ && !ref $@; 355 die if $@ && !ref $@;
321 356
322 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 357 last if $self->{h}{connection} =~ /close/;
358
359 $httpevent->broadcast;
323 360
324 $fh->timeout($::PER_TIMEOUT); 361 $fh->timeout($::PER_TIMEOUT);
325 } 362 }
326} 363}
327 364
… …
397 } else { 434 } else {
398 $ims < $self->{stat}[9] 435 $ims < $self->{stat}[9]
399 or $self->err(304, "not modified"); 436 or $self->err(304, "not modified");
400 437
401 if (-r "$path/index.html") { 438 if (-r "$path/index.html") {
402 $self->{path} .= "/index.html"; 439 # replace directory "size" by index.html filesize
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
403 $self->handle_file; 441 $self->handle_file;
404 } else { 442 } else {
405 $self->handle_dir; 443 $self->handle_dir;
406 } 444 }
407 } 445 }
… …
419 457
420 $self->response(200, "ok", 458 $self->response(200, "ok",
421 { 459 {
422 "Content-Type" => "text/html", 460 "Content-Type" => "text/html",
423 "Content-Length" => length $idx, 461 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]),
424 }, 463 },
425 $idx); 464 $idx);
426} 465}
427 466
428sub handle_file { 467sub handle_file {
429 my $self = shift; 468 my $self = shift;
430 my $length = -s _; 469 my $length = $self->{stat}[7];
470 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
431 my $hdr = { 471 my $hdr = {
432 "Last-Modified" => time2str ((stat _)[9]), 472 "Last-Modified" => time2str ((stat _)[9]),
433 }; 473 };
434 474
435 my @code = (200, "ok"); 475 my @code = (200, "ok");
… …
447 } 487 }
448 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 488 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
449 } 489 }
450 $hdr->{"Content-Range"} = "bytes */$length"; 490 $hdr->{"Content-Range"} = "bytes */$length";
451 $hdr->{"Content-Length"} = $length; 491 $hdr->{"Content-Length"} = $length;
452 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
453 $self->err(416, "not satisfiable", $hdr, ""); 492 $self->err(416, "not satisfiable", $hdr, "");
454 493
455satisfiable: 494satisfiable:
456 # check for segmented downloads 495 # check for segmented downloads
457 if ($l && $::NO_SEGMENTED) { 496 if ($l && $::NO_SEGMENTED) {
458 my $delay = 180; 497 my $delay = $::NOW + $::PER_TIMEOUT + 15;
459 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
460 if ($delay <= 0) { 499 if ($delay <= $::NOW) {
461 $self->err_segmented_download; 500 $self->err_segmented_download;
462 } else { 501 } else {
463 Coro::Event::do_timer(after => 3); $delay -= 3; 502 $httpevent->wait;
464 } 503 }
465 } 504 }
466 } 505 }
467 506
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 507 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
481 $self->response(@code, $hdr, ""); 520 $self->response(@code, $hdr, "");
482 521
483 if ($self->{method} eq "GET") { 522 if ($self->{method} eq "GET") {
484 $self->{time} = $::NOW; 523 $self->{time} = $::NOW;
485 524
486 my $transfer = $::transfers->guard; 525 my $fudge = $queue->[0]->waiters;
487 $self->{fh}->writable or return; 526 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
488 527
489 push @::wait_time, $::NOW - $self->{time}; 528 $queue->[1] *= $fudge;
490 shift @::wait_time if @wait_time > 25;
491 $self->{time} = $::NOW;
492 529
493 my ($fh, $buf, $r); 530 my ($fh, $buf, $r);
494 my $current = $Coro::current; 531 my $current = $Coro::current;
495 open $fh, "<", $self->{path} 532 open $fh, "<", $self->{path}
496 or die "$self->{path}: late open failure ($!)"; 533 or die "$self->{path}: late open failure ($!)";
… …
500 if (0) { 537 if (0) {
501 if ($l) { 538 if ($l) {
502 sysseek $fh, $l, 0; 539 sysseek $fh, $l, 0;
503 } 540 }
504 } 541 }
542
543 my $transfer; # transfer guard
544 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
505 545
506 while ($h > 0) { 546 while ($h > 0) {
547 unless ($transfer) {
548 if ($transfer ||= $queue->[0]->timed_guard($::WAIT_INTERVAL)) {
549 if ($fudge != 1) {
550 $queue->[1] /= $fudge;
551 $queue->[1] = $queue->[1] * $::wait_factor
552 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
553 }
554 $bufsize = $::BUFSIZE;
555 $self->{time} = $::NOW;
556 }
557 }
558
507 if (0) { 559 if (0) {
508 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 560 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
509 or last; 561 or last;
510 } else { 562 } else {
511 undef $buf; 563 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 { 564 $buf, 0, sub {
515 $r = $_[0]; 565 $r = $_[0];
516 $current->ready; 566 Coro::ready($current);
517 }); 567 });
518 &Coro::schedule; 568 &Coro::schedule;
519 $aio_requests->up;
520 last unless $r; 569 last unless $r;
521 } 570 }
522 my $w = $self->{fh}->syswrite($buf) 571 my $w = syswrite $self->{fh}, $buf
523 or last; 572 or last;
524 $::written += $w; 573 $::written += $w;
525 $self->{written} += $w; 574 $self->{written} += $w;
526 $l += $r; 575 $l += $r;
527 } 576 }

Diff Legend

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