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.40 by root, Mon Sep 3 00:06:06 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"
36sub handler { 45sub handler {
37 while () { 46 while () {
38 my $new = pop @newcons;
39 if ($new) { 47 if (@newcons) {
40 eval { 48 eval {
41 conn->new(@$new)->handle; 49 conn->new(@{pop @newcons})->handle;
42 }; 50 };
43 slog 1, "$@" if $@ && !ref $@; 51 slog 1, "$@" if $@ && !ref $@;
44 $connections->up; 52 $connections->up;
45 } else { 53 } else {
46 last if @pool >= $MAX_POOL; 54 last if @pool >= $MAX_POOL;
… …
48 schedule; 56 schedule;
49 } 57 }
50 } 58 }
51} 59}
52 60
61sub listen_on {
62 my $listen = $_[0];
63
64 push @listen_sockets, $listen;
65
66 # the "main thread"
67 async {
68 slog 1, "accepting connections";
69 while () {
70 $connections->down;
71 push @newcons, [$listen->accept];
72 #slog 3, "accepted @$connections ".scalar(@pool);
73 if (@pool) {
74 (pop @pool)->ready;
75 } else {
76 async \&handler;
77 }
78
79 }
80 };
81}
82
53my $http_port = new Coro::Socket 83my $http_port = new Coro::Socket
54 LocalAddr => $SERVER_HOST, 84 LocalAddr => $SERVER_HOST,
55 LocalPort => $SERVER_PORT, 85 LocalPort => $SERVER_PORT,
56 ReuseAddr => 1, 86 ReuseAddr => 1,
57 Listen => 50, 87 Listen => 50,
58 or die "unable to start server"; 88 or die "unable to start server";
59 89
60push @listen_sockets, $http_port; 90listen_on $http_port;
61 91
62# the "main thread" 92my $http_port = new Coro::Socket
63async { 93 LocalAddr => $SERVER_HOST,
64 slog 1, "accepting connections"; 94 LocalPort => $SERVER_PORT2,
65 while () { 95 ReuseAddr => 1,
66 $connections->down; 96 Listen => 50,
67 push @newcons, [$http_port->accept]; 97 or die "unable to start server";
68 #slog 3, "accepted @$connections ".scalar(@pool); 98
99listen_on $http_port;
100
101our $NOW;
102our $HTTP_NOW;
103
104Event->timer(interval => 1, hard => 1, cb => sub {
69 $::NOW = time; 105 $NOW = time;
70 if (@pool) { 106 $HTTP_NOW = time2str $NOW;
71 (pop @pool)->ready; 107})->now;
72 } else {
73 async \&handler;
74 }
75
76 }
77};
78 108
79package conn; 109package conn;
80 110
81use Socket; 111use Socket;
82use HTTP::Date; 112use HTTP::Date;
83use Convert::Scalar 'weaken'; 113use Convert::Scalar 'weaken';
84use Linux::AIO; 114use Linux::AIO;
85 115
86Linux::AIO::min_parallel $::AIO_PARALLEL; 116Linux::AIO::min_parallel $::AIO_PARALLEL;
87
88my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
89 117
90Event->io(fd => Linux::AIO::poll_fileno, 118Event->io(fd => Linux::AIO::poll_fileno,
91 poll => 'r', async => 1, 119 poll => 'r', async => 1,
92 cb => \&Linux::AIO::poll_cb); 120 cb => \&Linux::AIO::poll_cb);
93 121
… …
120 or $self->err(500, "unable to decode peername"); 148 or $self->err(500, "unable to decode peername");
121 149
122 $self->{remote_addr} = inet_ntoa $iaddr; 150 $self->{remote_addr} = inet_ntoa $iaddr;
123 $self->{time} = $::NOW; 151 $self->{time} = $::NOW;
124 152
125 # enter ourselves into various lists
126 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
127
128 $::conns++; 153 $::conns++;
129 154
130 $self; 155 $self;
131} 156}
132 157
133sub DESTROY { 158sub DESTROY {
134 my $self = shift; 159 my $self = shift;
135
136 $::conns--; 160 $::conns--;
137
138 $self->eoconn; 161 $self->eoconn;
139 delete $conn{$self->{remote_addr}}{$self*1};
140} 162}
141 163
142# end of connection 164# end of connection
143sub eoconn { 165sub eoconn {
144 my $self = shift; 166 my $self = shift;
167
168 # clean up hints
169 delete $conn{$self->{remote_id}}{$self*1};
145 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 170 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
146} 171}
147 172
148sub slog { 173sub slog {
149 my $self = shift; 174 my $self = shift;
150 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 175 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
… …
154 my ($self, $code, $msg, $hdr, $content) = @_; 179 my ($self, $code, $msg, $hdr, $content) = @_;
155 my $res = "HTTP/1.1 $code $msg\015\012"; 180 my $res = "HTTP/1.1 $code $msg\015\012";
156 181
157 $self->{h}{connection} ||= $hdr->{Connection}; 182 $self->{h}{connection} ||= $hdr->{Connection};
158 183
159 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 184 $res .= "Date: $HTTP_NOW\015\012";
160 185
161 while (my ($h, $v) = each %$hdr) { 186 while (my ($h, $v) = each %$hdr) {
162 $res .= "$h: $v\015\012" 187 $res .= "$h: $v\015\012"
163 } 188 }
164 $res .= "\015\012"; 189 $res .= "\015\012";
… …
177sub err { 202sub err {
178 my $self = shift; 203 my $self = shift;
179 my ($code, $msg, $hdr, $content) = @_; 204 my ($code, $msg, $hdr, $content) = @_;
180 205
181 unless (defined $content) { 206 unless (defined $content) {
182 $content = "$code $msg"; 207 $content = "$code $msg\n";
183 $hdr->{"Content-Type"} = "text/plain"; 208 $hdr->{"Content-Type"} = "text/plain";
184 $hdr->{"Content-Length"} = length $content; 209 $hdr->{"Content-Length"} = length $content;
185 } 210 }
186 $hdr->{"Connection"} = "close"; 211 $hdr->{"Connection"} = "close";
187 212
… …
212 } 237 }
213 238
214 $self->{h} = {}; 239 $self->{h} = {};
215 240
216 $fh->timeout($::RES_TIMEOUT); 241 $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 242
239 $req =~ /^(?:\015\012)? 243 $req =~ /^(?:\015\012)?
240 (GET|HEAD) \040+ 244 (GET|HEAD) \040+
241 ([^\040]+) \040+ 245 ([^\040]+) \040+
242 HTTP\/([0-9]+\.[0-9]+) 246 HTTP\/([0-9]+\.[0-9]+)
… …
267 271
268 $self->{h}{$h} = substr $v, 1 272 $self->{h}{$h} = substr $v, 1
269 while ($h, $v) = each %hdr; 273 while ($h, $v) = each %hdr;
270 } 274 }
271 275
276 # remote id should be unique per user
277 my $id = $self->{remote_addr};
278
279 if (exists $self->{h}{"client-ip"}) {
280 $id .= "[".$self->{h}{"client-ip"}."]";
281 } elsif (exists $self->{h}{"x-forwarded-for"}) {
282 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
283 }
284
285 $self->{remote_id} = $id;
286
287 if ($blocked{$id}) {
288 $self->err_blocked($blocked{$id})
289 if $blocked{$id} > $::NOW;
290
291 delete $blocked{$id};
292 }
293
294 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
295 my $delay = $::PER_TIMEOUT + 15;
296 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 if ($delay <= 0) {
298 $self->slog(2, "blocked ip $id");
299 $self->err_blocked;
300 } else {
301 Coro::Event::do_timer(after => 4); $delay -= 4;
302 }
303 }
304 }
305
272 # find out server name and port 306 # find out server name and port
273 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 307 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
274 $host = $1; 308 $host = $1;
275 } else { 309 } else {
276 $host = $self->{h}{host}; 310 $host = $self->{h}{host};
… …
285 $host = inet_ntoa $host; 319 $host = inet_ntoa $host;
286 } 320 }
287 321
288 $self->{server_name} = $host; 322 $self->{server_name} = $host;
289 323
290 # remote id should be unique per user 324 # enter ourselves into various lists
291 $self->{remote_id} = $self->{remote_addr}; 325 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); 326 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
300 327
301 eval { 328 eval {
302 $self->map_uri; 329 $self->map_uri;
303 $self->respond; 330 $self->respond;
304 }; 331 };
… …
413 $idx); 440 $idx);
414} 441}
415 442
416sub handle_file { 443sub handle_file {
417 my $self = shift; 444 my $self = shift;
418 my $length = -s _; 445 my $length = $self->{stat}[7];
446 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
419 my $hdr = { 447 my $hdr = {
420 "Last-Modified" => time2str ((stat _)[9]), 448 "Last-Modified" => time2str ((stat _)[9]),
421 }; 449 };
422 450
423 my @code = (200, "ok"); 451 my @code = (200, "ok");
… …
435 } 463 }
436 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 464 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
437 } 465 }
438 $hdr->{"Content-Range"} = "bytes */$length"; 466 $hdr->{"Content-Range"} = "bytes */$length";
439 $hdr->{"Content-Length"} = $length; 467 $hdr->{"Content-Length"} = $length;
440 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
441 $self->err(416, "not satisfiable", $hdr, ""); 468 $self->err(416, "not satisfiable", $hdr, "");
442 469
443satisfiable: 470satisfiable:
444 # check for segmented downloads 471 # check for segmented downloads
445 if ($l && $::NO_SEGMENTED) { 472 if ($l && $::NO_SEGMENTED) {
446 my $delay = 180; 473 my $delay = $::PER_TIMEOUT + 15;
447 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 474 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
448 if ($delay <= 0) { 475 if ($delay <= 0) {
449 $self->err_segmented_download; 476 $self->err_segmented_download;
450 } else { 477 } else {
451 Coro::Event::do_timer(after => 3); $delay -= 3; 478 Coro::Event::do_timer(after => 4); $delay -= 4;
452 } 479 }
453 } 480 }
454 } 481 }
455 482
456 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 483 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
467 $hdr->{"Content-Length"} = $length; 494 $hdr->{"Content-Length"} = $length;
468 495
469 $self->response(@code, $hdr, ""); 496 $self->response(@code, $hdr, "");
470 497
471 if ($self->{method} eq "GET") { 498 if ($self->{method} eq "GET") {
499 $self->{time} = $::NOW;
500
501 my $fudge = $queue->[0]->waiters;
502 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
503
504 $queue->[1] *= $fudge;
505 my $transfer = $queue->[0]->guard;
506
507 if ($fudge != 1) {
508 $queue->[1] /= $fudge;
509 $queue->[1] = $queue->[1] * $::wait_factor
510 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
511 }
512 $self->{time} = $::NOW;
513
514 $self->{fh}->writable or return;
515
472 my ($fh, $buf, $r); 516 my ($fh, $buf, $r);
473 my $current = $Coro::current; 517 my $current = $Coro::current;
474 open $fh, "<", $self->{path} 518 open $fh, "<", $self->{path}
475 or die "$self->{path}: late open failure ($!)"; 519 or die "$self->{path}: late open failure ($!)";
476 520
… …
485 while ($h > 0) { 529 while ($h > 0) {
486 if (0) { 530 if (0) {
487 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 531 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
488 or last; 532 or last;
489 } else { 533 } else {
490 undef $buf;
491 $aio_requests->down;
492 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 534 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
493 $buf, 0, sub { 535 $buf, 0, sub {
494 $r = $_[0]; 536 $r = $_[0];
495 $current->ready; 537 Coro::ready($current);
496 }); 538 });
497 &Coro::schedule; 539 &Coro::schedule;
498 $aio_requests->up;
499 last unless $r; 540 last unless $r;
500 } 541 }
501 my $w = $self->{fh}->syswrite($buf) 542 my $w = syswrite $self->{fh}, $buf
502 or last; 543 or last;
503 $::written += $w; 544 $::written += $w;
504 $self->{written} += $w; 545 $self->{written} += $w;
505 $l += $r; 546 $l += $r;
506 } 547 }
507 }
508 548
509 close $fh; 549 close $fh;
550 }
510} 551}
511 552
5121; 5531;

Diff Legend

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