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.31 by root, Mon Aug 27 05:05:26 2001 UTC vs.
Revision 1.37 by root, Sun Sep 2 01:03:53 2001 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5
6use HTTP::Date;
5 7
6no utf8; 8no utf8;
7use bytes; 9use bytes;
8 10
9# at least on my machine, this thingy serves files 11# at least on my machine, this thingy serves files
… …
25 my $level = shift; 27 my $level = shift;
26 my $format = shift; 28 my $format = shift;
27 printf "---: $format\n", @_; 29 printf "---: $format\n", @_;
28} 30}
29 31
30my $connections = new Coro::Semaphore $MAX_CONNECTS; 32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
33
34our $wait_factor = 0.95;
35
36our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
39);
31 40
32my @newcons; 41my @newcons;
33my @pool; 42my @pool;
34 43
35# one "execution thread" 44# one "execution thread"
… …
57 Listen => 50, 66 Listen => 50,
58 or die "unable to start server"; 67 or die "unable to start server";
59 68
60push @listen_sockets, $http_port; 69push @listen_sockets, $http_port;
61 70
71our $NOW;
72our $HTTP_NOW;
73
74Event->timer(interval => 1, hard => 1, cb => sub {
75 $NOW = time;
76 $HTTP_NOW = time2str $NOW;
77})->now;
78
62# the "main thread" 79# the "main thread"
63async { 80async {
64 slog 1, "accepting connections"; 81 slog 1, "accepting connections";
65 while () { 82 while () {
66 $connections->down; 83 $connections->down;
67 push @newcons, [$http_port->accept]; 84 push @newcons, [$http_port->accept];
68 #slog 3, "accepted @$connections ".scalar(@pool); 85 #slog 3, "accepted @$connections ".scalar(@pool);
69 $::NOW = time;
70 if (@pool) { 86 if (@pool) {
71 (pop @pool)->ready; 87 (pop @pool)->ready;
72 } else { 88 } else {
73 async \&handler; 89 async \&handler;
74 } 90 }
… …
82use HTTP::Date; 98use HTTP::Date;
83use Convert::Scalar 'weaken'; 99use Convert::Scalar 'weaken';
84use Linux::AIO; 100use Linux::AIO;
85 101
86Linux::AIO::min_parallel $::AIO_PARALLEL; 102Linux::AIO::min_parallel $::AIO_PARALLEL;
87
88my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
89 103
90Event->io(fd => Linux::AIO::poll_fileno, 104Event->io(fd => Linux::AIO::poll_fileno,
91 poll => 'r', async => 1, 105 poll => 'r', async => 1,
92 cb => \&Linux::AIO::poll_cb); 106 cb => \&Linux::AIO::poll_cb);
93 107
… …
120 or $self->err(500, "unable to decode peername"); 134 or $self->err(500, "unable to decode peername");
121 135
122 $self->{remote_addr} = inet_ntoa $iaddr; 136 $self->{remote_addr} = inet_ntoa $iaddr;
123 $self->{time} = $::NOW; 137 $self->{time} = $::NOW;
124 138
125 # enter ourselves into various lists
126 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
127
128 $::conns++; 139 $::conns++;
129 140
130 $self; 141 $self;
131} 142}
132 143
… …
134 my $self = shift; 145 my $self = shift;
135 146
136 $::conns--; 147 $::conns--;
137 148
138 $self->eoconn; 149 $self->eoconn;
139 delete $conn{$self->{remote_addr}}{$self*1};
140} 150}
141 151
142# end of connection 152# end of connection
143sub eoconn { 153sub eoconn {
144 my $self = shift; 154 my $self = shift;
155
156 # clean up hints
157 delete $conn{$self->{remote_id}}{$self*1};
145 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 158 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
146} 159}
147 160
148sub slog { 161sub slog {
149 my $self = shift; 162 my $self = shift;
150 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 163 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
… …
154 my ($self, $code, $msg, $hdr, $content) = @_; 167 my ($self, $code, $msg, $hdr, $content) = @_;
155 my $res = "HTTP/1.1 $code $msg\015\012"; 168 my $res = "HTTP/1.1 $code $msg\015\012";
156 169
157 $self->{h}{connection} ||= $hdr->{Connection}; 170 $self->{h}{connection} ||= $hdr->{Connection};
158 171
159 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 172 $res .= "Date: $HTTP_NOW\015\012";
160 173
161 while (my ($h, $v) = each %$hdr) { 174 while (my ($h, $v) = each %$hdr) {
162 $res .= "$h: $v\015\012" 175 $res .= "$h: $v\015\012"
163 } 176 }
164 $res .= "\015\012"; 177 $res .= "\015\012";
… …
177sub err { 190sub err {
178 my $self = shift; 191 my $self = shift;
179 my ($code, $msg, $hdr, $content) = @_; 192 my ($code, $msg, $hdr, $content) = @_;
180 193
181 unless (defined $content) { 194 unless (defined $content) {
182 $content = "$code $msg"; 195 $content = "$code $msg\n";
183 $hdr->{"Content-Type"} = "text/plain"; 196 $hdr->{"Content-Type"} = "text/plain";
184 $hdr->{"Content-Length"} = length $content; 197 $hdr->{"Content-Length"} = length $content;
185 } 198 }
186 $hdr->{"Connection"} = "close"; 199 $hdr->{"Connection"} = "close";
187 200
… …
212 } 225 }
213 226
214 $self->{h} = {}; 227 $self->{h} = {};
215 228
216 $fh->timeout($::RES_TIMEOUT); 229 $fh->timeout($::RES_TIMEOUT);
217 my $ip = $self->{remote_addr};
218
219 if ($blocked{$ip}) {
220 $self->err_blocked($blocked{$ip})
221 if $blocked{$ip} > $::NOW;
222
223 delete $blocked{$ip};
224 }
225
226 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
227 my $delay = 120;
228 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
229 if ($delay <= 0) {
230 $self->slog(2, "blocked ip $ip");
231 $self->err_blocked;
232 } else {
233 Coro::Event::do_timer(after => 3);
234 $delay -= 3;
235 }
236 }
237 }
238 230
239 $req =~ /^(?:\015\012)? 231 $req =~ /^(?:\015\012)?
240 (GET|HEAD) \040+ 232 (GET|HEAD) \040+
241 ([^\040]+) \040+ 233 ([^\040]+) \040+
242 HTTP\/([0-9]+\.[0-9]+) 234 HTTP\/([0-9]+\.[0-9]+)
… …
267 259
268 $self->{h}{$h} = substr $v, 1 260 $self->{h}{$h} = substr $v, 1
269 while ($h, $v) = each %hdr; 261 while ($h, $v) = each %hdr;
270 } 262 }
271 263
264 # remote id should be unique per user
265 my $id = $self->{remote_addr};
266
267 if (exists $self->{h}{"client-ip"}) {
268 $id .= "[".$self->{h}{"client-ip"}."]";
269 } elsif (exists $self->{h}{"x-forwarded-for"}) {
270 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
271 }
272
273 $self->{remote_id} = $id;
274
275 if ($blocked{$id}) {
276 $self->err_blocked($blocked{$id})
277 if $blocked{$id} > $::NOW;
278
279 delete $blocked{$id};
280 }
281
282 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
283 my $delay = $::PER_TIMEOUT + 15;
284 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
285 if ($delay <= 0) {
286 $self->slog(2, "blocked ip $id");
287 $self->err_blocked;
288 } else {
289 Coro::Event::do_timer(after => 4); $delay -= 4;
290 }
291 }
292 }
293
272 # find out server name and port 294 # find out server name and port
273 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 295 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
274 $host = $1; 296 $host = $1;
275 } else { 297 } else {
276 $host = $self->{h}{host}; 298 $host = $self->{h}{host};
… …
285 $host = inet_ntoa $host; 307 $host = inet_ntoa $host;
286 } 308 }
287 309
288 $self->{server_name} = $host; 310 $self->{server_name} = $host;
289 311
290 # remote id should be unique per user 312 # enter ourselves into various lists
291 $self->{remote_id} = $self->{remote_addr}; 313 weaken ($conn{$id}{$self*1} = $self);
292
293 if (exists $self->{h}{"client-ip"}) {
294 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
295 } elsif (exists $self->{h}{"x-forwarded-for"}) {
296 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
297 }
298
299 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 314 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
300 315
301 eval { 316 eval {
302 $self->map_uri; 317 $self->map_uri;
303 $self->respond; 318 $self->respond;
304 }; 319 };
… …
413 $idx); 428 $idx);
414} 429}
415 430
416sub handle_file { 431sub handle_file {
417 my $self = shift; 432 my $self = shift;
418 my $length = -s _; 433 my $length = $self->{stat}[7];
434 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
419 my $hdr = { 435 my $hdr = {
420 "Last-Modified" => time2str ((stat _)[9]), 436 "Last-Modified" => time2str ((stat _)[9]),
421 }; 437 };
422 438
423 my @code = (200, "ok"); 439 my @code = (200, "ok");
… …
435 } 451 }
436 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 452 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
437 } 453 }
438 $hdr->{"Content-Range"} = "bytes */$length"; 454 $hdr->{"Content-Range"} = "bytes */$length";
439 $hdr->{"Content-Length"} = $length; 455 $hdr->{"Content-Length"} = $length;
440 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
441 $self->err(416, "not satisfiable", $hdr, ""); 456 $self->err(416, "not satisfiable", $hdr, "");
442 457
443satisfiable: 458satisfiable:
444 # check for segmented downloads 459 # check for segmented downloads
445 if ($l && $::NO_SEGMENTED) { 460 if ($l && $::NO_SEGMENTED) {
446 my $delay = 180; 461 my $delay = $::PER_TIMEOUT + 15;
447 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 462 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
448 if ($delay <= 0) { 463 if ($delay <= 0) {
449 $self->err_segmented_download; 464 $self->err_segmented_download;
450 } else { 465 } else {
451 Coro::Event::do_timer(after => 3); $delay -= 3; 466 Coro::Event::do_timer(after => 4); $delay -= 4;
452 } 467 }
453 } 468 }
454 } 469 }
455 470
456 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 471 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
467 $hdr->{"Content-Length"} = $length; 482 $hdr->{"Content-Length"} = $length;
468 483
469 $self->response(@code, $hdr, ""); 484 $self->response(@code, $hdr, "");
470 485
471 if ($self->{method} eq "GET") { 486 if ($self->{method} eq "GET") {
487 $self->{time} = $::NOW;
488
489 my $fudge = $queue->[0]->waiters;
490 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
491
492 $queue->[1] *= $fudge;
493 my $transfer = $queue->[0]->guard;
494
495 if ($fudge != 1) {
496 $queue->[1] /= $fudge;
497 $queue->[1] = $queue->[1] * $::wait_factor
498 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
499 }
500 $self->{time} = $::NOW;
501
502 $self->{fh}->writable or return;
503
472 my ($fh, $buf, $r); 504 my ($fh, $buf, $r);
473 my $current = $Coro::current; 505 my $current = $Coro::current;
474 open $fh, "<", $self->{path} 506 open $fh, "<", $self->{path}
475 or die "$self->{path}: late open failure ($!)"; 507 or die "$self->{path}: late open failure ($!)";
476 508
… …
485 while ($h > 0) { 517 while ($h > 0) {
486 if (0) { 518 if (0) {
487 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 519 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
488 or last; 520 or last;
489 } else { 521 } else {
490 undef $buf;
491 $aio_requests->down;
492 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 522 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
493 $buf, 0, sub { 523 $buf, 0, sub {
494 $r = $_[0]; 524 $r = $_[0];
495 $current->ready; 525 Coro::ready($current);
496 }); 526 });
497 &Coro::schedule; 527 &Coro::schedule;
498 $aio_requests->up;
499 last unless $r; 528 last unless $r;
500 } 529 }
501 my $w = $self->{fh}->syswrite($buf) 530 my $w = syswrite $self->{fh}, $buf
502 or last; 531 or last;
503 $::written += $w; 532 $::written += $w;
504 $self->{written} += $w; 533 $self->{written} += $w;
505 $l += $r; 534 $l += $r;
506 } 535 }
507 }
508 536
509 close $fh; 537 close $fh;
538 }
510} 539}
511 540
5121; 5411;

Diff Legend

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