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

Diff Legend

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