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

Diff Legend

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