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.34 by root, Thu Aug 30 02:58:17 2001 UTC vs.
Revision 1.45 by root, Sun Nov 11 03:32:19 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;
7 8
8no utf8; 9no utf8;
9use bytes; 10use bytes;
… …
28 my $format = shift; 29 my $format = shift;
29 printf "---: $format\n", @_; 30 printf "---: $format\n", @_;
30} 31}
31 32
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 33our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
34our $httpevent = new Coro::Signal;
33 35
34our $wait_factor = 0.95; 36our $wait_factor = 0.95;
35 37
36our @transfers = ( 38our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 600], 39 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 600], 40 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
39); 41);
40 42
41my @newcons; 43my @newcons;
42my @pool; 44my @pool;
43 45
44# one "execution thread" 46# one "execution thread"
45sub handler { 47sub handler {
46 while () { 48 while () {
47 my $new = pop @newcons;
48 if ($new) { 49 if (@newcons) {
49 eval { 50 eval {
50 conn->new(@$new)->handle; 51 conn->new(@{pop @newcons})->handle;
51 }; 52 };
52 slog 1, "$@" if $@ && !ref $@; 53 slog 1, "$@" if $@ && !ref $@;
53 $connections->up; 54 $connections->up;
54 } else { 55 } else {
55 last if @pool >= $MAX_POOL; 56 last if @pool >= $MAX_POOL;
… …
57 schedule; 58 schedule;
58 } 59 }
59 } 60 }
60} 61}
61 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
62my $http_port = new Coro::Socket 85my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 86 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 87 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 88 ReuseAddr => 1,
66 Listen => 50, 89 Listen => 50,
67 or die "unable to start server"; 90 or die "unable to start server";
68 91
69push @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}
70 104
71our $NOW; 105our $NOW;
72our $HTTP_NOW; 106our $HTTP_NOW;
73 107
74Event->timer(interval => 1, hard => 1, cb => sub { 108Event->timer(interval => 1, hard => 1, cb => sub {
75 $NOW = time; 109 $NOW = time;
76 $HTTP_NOW = time2str $NOW; 110 $HTTP_NOW = time2str $NOW;
77})->now; 111})->now;
78 112
79# the "main thread"
80async {
81 slog 1, "accepting connections";
82 while () {
83 $connections->down;
84 push @newcons, [$http_port->accept];
85 #slog 3, "accepted @$connections ".scalar(@pool);
86 if (@pool) {
87 (pop @pool)->ready;
88 } else {
89 async \&handler;
90 }
91
92 }
93};
94
95package conn; 113package conn;
96 114
97use Socket; 115use Socket;
98use HTTP::Date; 116use HTTP::Date;
99use Convert::Scalar 'weaken'; 117use Convert::Scalar 'weaken';
100use Linux::AIO; 118use Linux::AIO;
101 119
102Linux::AIO::min_parallel $::AIO_PARALLEL; 120Linux::AIO::min_parallel $::AIO_PARALLEL;
103
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105 121
106Event->io(fd => Linux::AIO::poll_fileno, 122Event->io(fd => Linux::AIO::poll_fileno,
107 poll => 'r', async => 1, 123 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb); 124 cb => \&Linux::AIO::poll_cb);
109 125
… …
127 143
128read_mimetypes; 144read_mimetypes;
129 145
130sub new { 146sub new {
131 my $class = shift; 147 my $class = shift;
148 my $fh = shift;
132 my $peername = shift; 149 my $peername = shift;
133 my $fh = shift;
134 my $self = bless { fh => $fh }, $class; 150 my $self = bless { fh => $fh }, $class;
135 my (undef, $iaddr) = unpack_sockaddr_in $peername 151 my (undef, $iaddr) = unpack_sockaddr_in $peername
136 or $self->err(500, "unable to decode peername"); 152 or $self->err(500, "unable to decode peername");
137 153
138 $self->{remote_addr} = inet_ntoa $iaddr; 154 $self->{remote_addr} = inet_ntoa $iaddr;
139 $self->{time} = $::NOW; 155 $self->{time} = $::NOW;
140 156
141 # enter ourselves into various lists
142 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
143
144 $::conns++; 157 $::conns++;
145 158
146 $self; 159 $self;
147} 160}
148 161
149sub DESTROY { 162sub DESTROY {
150 my $self = shift; 163 my $self = shift;
151
152 $::conns--; 164 $::conns--;
153
154 $self->eoconn; 165 $self->eoconn;
155 delete $conn{$self->{remote_addr}}{$self*1};
156} 166}
157 167
158# end of connection 168# end of connection
159sub eoconn { 169sub eoconn {
160 my $self = shift; 170 my $self = shift;
171
172 # clean up hints
173 delete $conn{$self->{remote_id}}{$self*1};
161 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 174 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
175
176 $httpevent->broadcast;
162} 177}
163 178
164sub slog { 179sub slog {
165 my $self = shift; 180 my $self = shift;
166 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 181 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
… …
168 183
169sub response { 184sub response {
170 my ($self, $code, $msg, $hdr, $content) = @_; 185 my ($self, $code, $msg, $hdr, $content) = @_;
171 my $res = "HTTP/1.1 $code $msg\015\012"; 186 my $res = "HTTP/1.1 $code $msg\015\012";
172 187
173 $self->{h}{connection} ||= $hdr->{Connection}; 188 $self->{h}{connection} = "close"
189 if exists $hdr->{Connection} # to avoid "empty" header lines due to vivification
190 and $hdr->{Connection} =~ /close/;
174 191
175 $res .= "Date: $HTTP_NOW\015\012"; 192 $res .= "Date: $HTTP_NOW\015\012";
176 193
177 while (my ($h, $v) = each %$hdr) { 194 while (my ($h, $v) = each %$hdr) {
178 $res .= "$h: $v\015\012" 195 $res .= "$h: $v\015\012"
… …
193sub err { 210sub err {
194 my $self = shift; 211 my $self = shift;
195 my ($code, $msg, $hdr, $content) = @_; 212 my ($code, $msg, $hdr, $content) = @_;
196 213
197 unless (defined $content) { 214 unless (defined $content) {
198 $content = "$code $msg"; 215 $content = "$code $msg\n";
199 $hdr->{"Content-Type"} = "text/plain"; 216 $hdr->{"Content-Type"} = "text/plain";
200 $hdr->{"Content-Length"} = length $content; 217 $hdr->{"Content-Length"} = length $content;
201 } 218 }
202 $hdr->{"Connection"} = "close"; 219 $hdr->{"Connection"} = "close";
203 220
… …
228 } 245 }
229 246
230 $self->{h} = {}; 247 $self->{h} = {};
231 248
232 $fh->timeout($::RES_TIMEOUT); 249 $fh->timeout($::RES_TIMEOUT);
233 my $ip = $self->{remote_addr};
234
235 if ($blocked{$ip}) {
236 $self->err_blocked($blocked{$ip})
237 if $blocked{$ip} > $::NOW;
238
239 delete $blocked{$ip};
240 }
241
242 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
243 my $delay = 120;
244 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
245 if ($delay <= 0) {
246 $self->slog(2, "blocked ip $ip");
247 $self->err_blocked;
248 } else {
249 Coro::Event::do_timer(after => 3);
250 $delay -= 3;
251 }
252 }
253 }
254 250
255 $req =~ /^(?:\015\012)? 251 $req =~ /^(?:\015\012)?
256 (GET|HEAD) \040+ 252 (GET|HEAD) \040+
257 ([^\040]+) \040+ 253 ([^\040]+) \040+
258 HTTP\/([0-9]+\.[0-9]+) 254 HTTP\/([0-9]+\.[0-9]+)
… …
283 279
284 $self->{h}{$h} = substr $v, 1 280 $self->{h}{$h} = substr $v, 1
285 while ($h, $v) = each %hdr; 281 while ($h, $v) = each %hdr;
286 } 282 }
287 283
284 # remote id should be unique per user
285 my $id = $self->{remote_addr};
286
287 if (exists $self->{h}{"client-ip"}) {
288 $id .= "[".$self->{h}{"client-ip"}."]";
289 } elsif (exists $self->{h}{"x-forwarded-for"}) {
290 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
291 }
292
293 $self->{remote_id} = $id;
294
295 if ($blocked{$id}) {
296 $self->err_blocked($blocked{$id})
297 if $blocked{$id} > $::NOW;
298
299 delete $blocked{$id};
300 }
301
302 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
303 my $delay = $::PER_TIMEOUT + $::NOW + 15;
304 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
305 if ($delay < $::NOW) {
306 $self->slog(2, "blocked ip $id");
307 $self->err_blocked;
308 } else {
309 $httpevent->wait;
310 }
311 }
312 }
313
288 # find out server name and port 314 # find out server name and port
289 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 315 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
290 $host = $1; 316 $host = $1;
291 } else { 317 } else {
292 $host = $self->{h}{host}; 318 $host = $self->{h}{host};
… …
294 320
295 if (defined $host) { 321 if (defined $host) {
296 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 322 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
297 } else { 323 } else {
298 ($self->{server_port}, $host) 324 ($self->{server_port}, $host)
299 = unpack_sockaddr_in $self->{fh}->getsockname 325 = unpack_sockaddr_in $self->{fh}->sockname
300 or $self->err(500, "unable to get socket name"); 326 or $self->err(500, "unable to get socket name");
301 $host = inet_ntoa $host; 327 $host = inet_ntoa $host;
302 } 328 }
303 329
304 $self->{server_name} = $host; 330 $self->{server_name} = $host;
305 331
306 # remote id should be unique per user 332 # enter ourselves into various lists
307 $self->{remote_id} = $self->{remote_addr}; 333 weaken ($conn{$id}{$self*1} = $self);
308
309 if (exists $self->{h}{"client-ip"}) {
310 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
311 } elsif (exists $self->{h}{"x-forwarded-for"}) {
312 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
313 }
314
315 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 334 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
316 335
317 eval { 336 eval {
318 $self->map_uri; 337 $self->map_uri;
319 $self->respond; 338 $self->respond;
320 }; 339 };
… …
322 $self->eoconn; 341 $self->eoconn;
323 342
324 die if $@ && !ref $@; 343 die if $@ && !ref $@;
325 344
326 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 345 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1;
346
347 $httpevent->broadcast;
327 348
328 $fh->timeout($::PER_TIMEOUT); 349 $fh->timeout($::PER_TIMEOUT);
329 } 350 }
330} 351}
331 352
… …
401 } else { 422 } else {
402 $ims < $self->{stat}[9] 423 $ims < $self->{stat}[9]
403 or $self->err(304, "not modified"); 424 or $self->err(304, "not modified");
404 425
405 if (-r "$path/index.html") { 426 if (-r "$path/index.html") {
406 $self->{path} .= "/index.html"; 427 # replace directory "size" by index.html filesize
428 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
407 $self->handle_file; 429 $self->handle_file;
408 } else { 430 } else {
409 $self->handle_dir; 431 $self->handle_dir;
410 } 432 }
411 } 433 }
… …
452 } 474 }
453 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 475 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
454 } 476 }
455 $hdr->{"Content-Range"} = "bytes */$length"; 477 $hdr->{"Content-Range"} = "bytes */$length";
456 $hdr->{"Content-Length"} = $length; 478 $hdr->{"Content-Length"} = $length;
457 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
458 $self->err(416, "not satisfiable", $hdr, ""); 479 $self->err(416, "not satisfiable", $hdr, "");
459 480
460satisfiable: 481satisfiable:
461 # check for segmented downloads 482 # check for segmented downloads
462 if ($l && $::NO_SEGMENTED) { 483 if ($l && $::NO_SEGMENTED) {
463 my $delay = 180; 484 my $delay = $::NOW + $::PER_TIMEOUT + 15;
464 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 485 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
465 if ($delay <= 0) { 486 if ($delay <= $::NOW) {
466 $self->err_segmented_download; 487 $self->err_segmented_download;
467 } else { 488 } else {
468 Coro::Event::do_timer(after => 3); $delay -= 3; 489 $httpevent->broadcast;
469 } 490 }
470 } 491 }
471 } 492 }
472 493
473 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 494 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
486 $self->response(@code, $hdr, ""); 507 $self->response(@code, $hdr, "");
487 508
488 if ($self->{method} eq "GET") { 509 if ($self->{method} eq "GET") {
489 $self->{time} = $::NOW; 510 $self->{time} = $::NOW;
490 511
512 my $fudge = $queue->[0]->waiters;
513 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
514
515 $queue->[1] *= $fudge;
491 my $transfer = $queue->[0]->guard; 516 my $transfer = $queue->[0]->guard;
517
518 if ($fudge != 1) {
519 $queue->[1] /= $fudge;
520 $queue->[1] = $queue->[1] * $::wait_factor
521 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
522 }
523 $self->{time} = $::NOW;
524
492 $self->{fh}->writable or return; 525 $self->{fh}->writable or return;
493
494 $queue->[1] = $queue->[1] * $::wait_factor
495 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
496 $self->{time} = $::NOW;
497 526
498 my ($fh, $buf, $r); 527 my ($fh, $buf, $r);
499 my $current = $Coro::current; 528 my $current = $Coro::current;
500 open $fh, "<", $self->{path} 529 open $fh, "<", $self->{path}
501 or die "$self->{path}: late open failure ($!)"; 530 or die "$self->{path}: late open failure ($!)";
… …
511 while ($h > 0) { 540 while ($h > 0) {
512 if (0) { 541 if (0) {
513 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 542 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
514 or last; 543 or last;
515 } else { 544 } else {
516 undef $buf;
517 $aio_requests->down;
518 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 545 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
519 $buf, 0, sub { 546 $buf, 0, sub {
520 $r = $_[0]; 547 $r = $_[0];
521 $current->ready; 548 Coro::ready($current);
522 }); 549 });
523 &Coro::schedule; 550 &Coro::schedule;
524 $aio_requests->up;
525 last unless $r; 551 last unless $r;
526 } 552 }
527 my $w = $self->{fh}->syswrite($buf) 553 my $w = syswrite $self->{fh}, $buf
528 or last; 554 or last;
529 $::written += $w; 555 $::written += $w;
530 $self->{written} += $w; 556 $self->{written} += $w;
531 $l += $r; 557 $l += $r;
532 } 558 }

Diff Legend

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