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

Diff Legend

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