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.36 by root, Sun Sep 2 00:54:00 2001 UTC vs.
Revision 1.83 by root, Sun Dec 3 17:49:22 2006 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;
6use Coro::AIO ();
5 7
6use HTTP::Date; 8use HTTP::Date;
9use POSIX ();
10
11use Compress::Zlib ();
7 12
8no utf8; 13no utf8;
9use bytes; 14use bytes;
10 15
11# at least on my machine, this thingy serves files 16# at least on my machine, this thingy serves files
… …
13# and quite a bit slower than thttpd :( 18# and quite a bit slower than thttpd :(
14 19
15$SIG{PIPE} = 'IGNORE'; 20$SIG{PIPE} = 'IGNORE';
16 21
17our $accesslog; 22our $accesslog;
23our $errorlog;
24
25our $NOW;
26our $HTTP_NOW;
27
28our $ERROR_LOG;
29our $ACCESS_LOG;
30
31Event->timer(interval => 1, hard => 1, cb => sub {
32 $NOW = time;
33 $HTTP_NOW = time2str $NOW;
34})->now;
35
36if ($ERROR_LOG) {
37 use IO::Handle;
38 open $errorlog, ">>$ERROR_LOG"
39 or die "$ERROR_LOG: $!";
40 $errorlog->autoflush(1);
41}
18 42
19if ($ACCESS_LOG) { 43if ($ACCESS_LOG) {
20 use IO::Handle; 44 use IO::Handle;
21 open $accesslog, ">>$ACCESS_LOG" 45 open $accesslog, ">>$ACCESS_LOG"
22 or die "$ACCESS_LOG: $!"; 46 or die "$ACCESS_LOG: $!";
… …
24} 48}
25 49
26sub slog { 50sub slog {
27 my $level = shift; 51 my $level = shift;
28 my $format = shift; 52 my $format = shift;
53 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
29 printf "---: $format\n", @_; 54 printf "$NOW: $format\n", @_;
55 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
30} 56}
31 57
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 58our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
59our $httpevent = new Coro::Signal;
33 60
34our $wait_factor = 0.95; 61our $queue_file = new transferqueue $MAX_TRANSFERS;
62our $queue_index = new transferqueue 10;
35 63
36our @transfers = ( 64our $tbf_top = new tbf rate => $TBF_RATE || 100000;
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 65
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 66my $unused_bytes = 0;
39); 67my $unused_last = time;
68
69sub unused_bandwidth {
70 $unused_bytes += $_[0];
71 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
72 $unused_last = $NOW;
73 $unused_bytes = 0;
74 $queue_file->force_wake_next;
75 slog 1, "forced filetransfer due to unused bandwidth";
76 }
77}
40 78
41my @newcons; 79my @newcons;
42my @pool; 80my @pool;
43 81
44# one "execution thread" 82# one "execution thread"
45sub handler { 83sub handler {
46 while () { 84 while () {
47 my $new = pop @newcons;
48 if ($new) { 85 if (@newcons) {
49 eval { 86 eval {
50 conn->new(@$new)->handle; 87 conn->new (@{pop @newcons})->handle;
51 }; 88 };
52 slog 1, "$@" if $@ && !ref $@; 89 slog 1, "$@" if $@ && !ref $@;
90
91 $httpevent->broadcast; # only for testing, but doesn't matter much
92
53 $connections->up; 93 $connections->up;
54 } else { 94 } else {
55 last if @pool >= $MAX_POOL; 95 last if @pool >= $MAX_POOL;
56 push @pool, $Coro::current; 96 push @pool, $Coro::current;
57 schedule; 97 schedule;
58 } 98 }
59 } 99 }
60} 100}
61 101
102sub listen_on {
103 my $listen = $_[0];
104
105 push @listen_sockets, $listen;
106
107 # the "main thread"
108 async {
109 slog 1, "accepting connections";
110 while () {
111 $connections->down;
112 push @newcons, [$listen->accept];
113 #slog 3, "accepted @$connections ".scalar(@pool);
114 if (@pool) {
115 (pop @pool)->ready;
116 } else {
117 async \&handler;
118 }
119 }
120 };
121}
122
62my $http_port = new Coro::Socket 123my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 124 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 125 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 126 ReuseAddr => 1,
66 Listen => 50, 127 Listen => 50,
67 or die "unable to start server"; 128 or die "unable to start server";
68 129
69push @listen_sockets, $http_port; 130listen_on $http_port;
70 131
71our $NOW; 132if ($SERVER_PORT2) {
72our $HTTP_NOW; 133 my $http_port = new Coro::Socket
134 LocalAddr => $SERVER_HOST,
135 LocalPort => $SERVER_PORT2,
136 ReuseAddr => 1,
137 Listen => 50,
138 or die "unable to start server";
73 139
74Event->timer(interval => 1, hard => 1, cb => sub { 140 listen_on $http_port;
75 $NOW = time; 141}
76 $HTTP_NOW = time2str $NOW;
77})->now;
78
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 142
95package conn; 143package conn;
144
145use strict;
146use bytes;
96 147
97use Socket; 148use Socket;
98use HTTP::Date; 149use HTTP::Date;
99use Convert::Scalar 'weaken'; 150use Convert::Scalar 'weaken';
100use Linux::AIO; 151use IO::AIO;
101 152
102Linux::AIO::min_parallel $::AIO_PARALLEL; 153IO::AIO::min_parallel $::AIO_PARALLEL;
103 154
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105
106Event->io(fd => Linux::AIO::poll_fileno, 155Event->io (fd => IO::AIO::poll_fileno,
107 poll => 'r', async => 1, 156 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb); 157 cb => \&IO::AIO::poll_cb);
109 158
110our %conn; # $conn{ip}{self} => connobj 159our %conn; # $conn{ip}{self} => connobj
111our %uri; # $uri{ip}{uri}{self} 160our %uri; # $uri{ip}{uri}{self}
112our %blocked; 161our %blocked;
113our %mimetype; 162our %mimetype;
114 163
115sub read_mimetypes { 164sub read_mimetypes {
116 local *M;
117 if (open M, "<mime_types") { 165 if (open my $fh, "<mime_types") {
118 while (<M>) { 166 while (<$fh>) {
119 if (/^([^#]\S+)\t+(\S+)$/) { 167 if (/^([^#]\S+)\t+(\S+)$/) {
120 $mimetype{lc $1} = $2; 168 $mimetype{lc $1} = $2;
121 } 169 }
122 } 170 }
123 } else { 171 } else {
… …
127 175
128read_mimetypes; 176read_mimetypes;
129 177
130sub new { 178sub new {
131 my $class = shift; 179 my $class = shift;
180 my $fh = shift;
132 my $peername = shift; 181 my $peername = shift;
133 my $fh = shift;
134 my $self = bless { fh => $fh }, $class; 182 my $self = bless { fh => $fh }, $class;
135 my (undef, $iaddr) = unpack_sockaddr_in $peername 183 my (undef, $iaddr) = unpack_sockaddr_in $peername
136 or $self->err(500, "unable to decode peername"); 184 or $self->err (500, "unable to decode peername");
137 185
186 $self->{remote_addr} =
138 $self->{remote_addr} = inet_ntoa $iaddr; 187 $self->{remote_id} = inet_ntoa $iaddr;
188
139 $self->{time} = $::NOW; 189 $self->{time} = $::NOW;
140 190
191 weaken ($Coro::current->{conn} = $self);
192
141 $::conns++; 193 ++$::conns;
194 $::maxconns = $::conns if $::conns > $::maxconns;
142 195
143 $self; 196 $self
144} 197}
145 198
146sub DESTROY { 199sub DESTROY {
147 my $self = shift; 200 my $self = shift;
148 201
149 $::conns--; 202 --$::conns;
150
151 $self->eoconn;
152} 203}
153 204
154# end of connection 205sub prune_cache {
155sub eoconn { 206 my $hash = $_[0];
156 my $self = shift;
157 207
158 # clean up hints 208 for (keys %$hash) {
159 delete $conn{$self->{remote_id}}{$self*1}; 209 if (ref $hash->{$_} eq HASH::) {
160 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 210 prune_cache($hash->{$_});
211 unless (scalar keys %{$hash->{$_}}) {
212 delete $hash->{$_};
213 }
214 }
215 }
161} 216}
217
218sub prune_caches {
219 prune_cache \%conn;
220 prune_cache \%uri;
221
222 for (keys %blocked) {
223 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
224 }
225}
226
227Event->timer (interval => 60, cb => \&prune_caches);
162 228
163sub slog { 229sub slog {
164 my $self = shift; 230 my $self = shift;
165 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 231 main::slog($_[0], "$self->{remote_id}> $_[1]");
166} 232}
167 233
168sub response { 234sub response {
169 my ($self, $code, $msg, $hdr, $content) = @_; 235 my ($self, $code, $msg, $hdr, $content) = @_;
170 my $res = "HTTP/1.1 $code $msg\015\012"; 236 my $res = "HTTP/1.1 $code $msg\015\012";
237 my $GZ = "";
171 238
172 $self->{h}{connection} ||= $hdr->{Connection}; 239 if (exists $hdr->{Connection}) {
240 if ($hdr->{Connection} =~ /close/) {
241 $self->{h}{connection} = "close"
242 }
243 } else {
244 if ($self->{version} < 1.1) {
245 if ($self->{h}{connection} =~ /keep-alive/i) {
246 $hdr->{Connection} = "Keep-Alive";
247 } else {
248 $self->{h}{connection} = "close"
249 }
250 }
251 }
252
253 if ($self->{method} ne "HEAD"
254 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
255 && 400 < length $content
256 && $hdr->{"Content-Length"} == length $content
257 && !exists $hdr->{"Content-Encoding"}
258 ) {
259 my $orig = length $content;
260 $hdr->{"Content-Encoding"} = "gzip";
261 $content = Compress::Zlib::memGzip(\$content);
262 $hdr->{"Content-Length"} = length $content;
263 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
264 }
173 265
174 $res .= "Date: $HTTP_NOW\015\012"; 266 $res .= "Date: $HTTP_NOW\015\012";
267 $res .= "Server: $::NAME\015\012";
175 268
176 while (my ($h, $v) = each %$hdr) { 269 while (my ($h, $v) = each %$hdr) {
177 $res .= "$h: $v\015\012" 270 $res .= "$h: $v\015\012"
178 } 271 }
179 $res .= "\015\012"; 272 $res .= "\015\012";
180 273
181 $res .= $content if defined $content and $self->{method} ne "HEAD"; 274 $res .= $content if defined $content and $self->{method} ne "HEAD";
182 275
183 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 276 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
277 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
278 " \"$self->{h}{referer}\"\n";
184 279
185 print $accesslog $log if $accesslog; 280 print $::accesslog $log if $::accesslog;
186 print STDERR $log; 281 print STDERR $log;
187 282
188 $self->{written} += 283 $tbf_top->request(length $res, 1e6);
189 print {$self->{fh}} $res; 284 $self->{written} += print {$self->{fh}} $res;
190} 285}
191 286
192sub err { 287sub err {
193 my $self = shift; 288 my $self = shift;
194 my ($code, $msg, $hdr, $content) = @_; 289 my ($code, $msg, $hdr, $content) = @_;
… …
198 $hdr->{"Content-Type"} = "text/plain"; 293 $hdr->{"Content-Type"} = "text/plain";
199 $hdr->{"Content-Length"} = length $content; 294 $hdr->{"Content-Length"} = length $content;
200 } 295 }
201 $hdr->{"Connection"} = "close"; 296 $hdr->{"Connection"} = "close";
202 297
203 $self->response($code, $msg, $hdr, $content); 298 $self->response ($code, $msg, $hdr, $content);
204 299
205 die bless {}, err::; 300 die bless {}, err::
206} 301}
207 302
208sub handle { 303sub handle {
209 my $self = shift; 304 my $self = shift;
210 my $fh = $self->{fh}; 305 my $fh = $self->{fh};
211 306
212 my $host; 307 my $host;
213 308
214 $fh->timeout($::REQ_TIMEOUT); 309 $fh->timeout($::REQ_TIMEOUT);
215 while() { 310 while () {
216 $self->{reqs}++; 311 $self->{reqs}++;
217 312
218 # read request and parse first line 313 # read request and parse first line
219 my $req = $fh->readline("\015\012\015\012"); 314 my $req = $fh->readline("\015\012\015\012");
220 315
… …
249 my (%hdr, $h, $v); 344 my (%hdr, $h, $v);
250 345
251 $hdr{lc $1} .= ",$2" 346 $hdr{lc $1} .= ",$2"
252 while $req =~ /\G 347 while $req =~ /\G
253 ([^:\000-\040]+): 348 ([^:\000-\040]+):
254 [\008\040]* 349 [\011\040]*
255 ((?: [^\015\012]+ | \015\012[\008\040] )*) 350 ((?: [^\015\012]+ | \015\012[\011\040] )*)
256 \015\012 351 \015\012
257 /gxc; 352 /gxc;
258 353
259 $req =~ /\G\015\012$/ 354 $req =~ /\G\015\012$/
260 or $self->err(400, "bad request"); 355 or $self->err(400, "bad request");
… …
272 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 367 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
273 } 368 }
274 369
275 $self->{remote_id} = $id; 370 $self->{remote_id} = $id;
276 371
372 weaken (local $conn{$id}{$self*1} = $self);
373
277 if ($blocked{$id}) { 374 if ($blocked{$id}) {
278 $self->err_blocked($blocked{$id}) 375 $self->err_blocked
279 if $blocked{$id} > $::NOW; 376 if $blocked{$id}[0] > $::NOW;
280 377
281 delete $blocked{$id}; 378 delete $blocked{$id};
282 }
283
284 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
285 my $delay = $::PER_TIMEOUT + 15;
286 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
287 if ($delay <= 0) {
288 $self->slog(2, "blocked ip $id");
289 $self->err_blocked;
290 } else {
291 Coro::Event::do_timer(after => 4); $delay -= 4;
292 }
293 }
294 } 379 }
295 380
296 # find out server name and port 381 # find out server name and port
297 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 382 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
298 $host = $1; 383 $host = $1;
… …
302 387
303 if (defined $host) { 388 if (defined $host) {
304 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 389 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
305 } else { 390 } else {
306 ($self->{server_port}, $host) 391 ($self->{server_port}, $host)
307 = unpack_sockaddr_in $self->{fh}->getsockname 392 = unpack_sockaddr_in $self->{fh}->sockname
308 or $self->err(500, "unable to get socket name"); 393 or $self->err(500, "unable to get socket name");
309 $host = inet_ntoa $host; 394 $host = inet_ntoa $host;
310 } 395 }
311 396
312 $self->{server_name} = $host; 397 $self->{server_name} = $host;
313 398
314 # enter ourselves into various lists
315 weaken ($conn{$id}{$self*1} = $self);
316 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 399 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
317 400
318 eval { 401 eval {
319 $self->map_uri; 402 $self->map_uri;
320 $self->respond; 403 $self->respond;
321 }; 404 };
322 405
323 $self->eoconn;
324
325 die if $@ && !ref $@; 406 die if $@ && !ref $@;
326 407
327 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 408 last if $self->{h}{connection} =~ /close/i;
409
410 $httpevent->broadcast;
328 411
329 $fh->timeout($::PER_TIMEOUT); 412 $fh->timeout($::PER_TIMEOUT);
330 } 413 }
414}
415
416sub block {
417 my $self = shift;
418
419 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
420 $self->slog(2, "blocked ip $self->{remote_id}");
421 $self->err_blocked;
331} 422}
332 423
333# uri => path mapping 424# uri => path mapping
334sub map_uri { 425sub map_uri {
335 my $self = shift; 426 my $self = shift;
… …
382 473
383sub respond { 474sub respond {
384 my $self = shift; 475 my $self = shift;
385 my $path = $self->{path}; 476 my $path = $self->{path};
386 477
387 stat $path 478 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
388 or $self->err(404, "not found"); 479 if ($::internal{$1}) {
389 480 $::internal{$1}->($self);
390 $self->{stat} = [stat _];
391
392 # idiotic netscape sends idiotic headers AGAIN
393 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
394 ? str2time $1 : 0;
395
396 if (-d _ && -r _) {
397 # directory
398 if ($path !~ /\/$/) {
399 # create a redirect to get the trailing "/"
400 # we don't try to avoid the :80
401 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
402 } else { 481 } else {
403 $ims < $self->{stat}[9] 482 $self->err (404, "not found");
483 }
484 } else {
485
486 stat $path
404 or $self->err(304, "not modified"); 487 or $self->err (404, "not found");
405 488
406 if (-r "$path/index.html") { 489 $self->{stat} = [stat _];
407 $self->{path} .= "/index.html"; 490
408 $self->handle_file; 491 # idiotic netscape sends idiotic headers AGAIN
492 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
493 ? str2time $1 : 0;
494
495 if (-d _ && -r _) {
496 # directory
497 if ($path !~ /\/$/) {
498 # create a redirect to get the trailing "/"
499 # we don't try to avoid the :80
500 $self->err (301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
409 } else { 501 } else {
502 $ims < $self->{stat}[9]
503 or $self->err (304, "not modified");
504
505 if (-r "$path/index.html") {
506 # replace directory "size" by index.html filesize
507 $self->{stat} = [stat ($self->{path} .= "/index.html")];
508 $self->handle_file ($queue_index, $tbf_top);
509 } else {
410 $self->handle_dir; 510 $self->handle_dir;
411 } 511 }
412 } 512 }
413 } elsif (-f _ && -r _) { 513 } elsif (-f _ && -r _) {
414 -x _ and $self->err(403, "forbidden"); 514 -x _ and $self->err (403, "forbidden");
415 $self->handle_file; 515
516 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
517 my $timeout = $::NOW + 10;
518 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
519 if ($timeout < $::NOW) {
520 $self->block($::BLOCKTIME, "too many connections");
521 } else {
522 $httpevent->wait;
523 }
524 }
525 }
526
527 $self->handle_file ($queue_file, $tbf_top);
416 } else { 528 } else {
417 $self->err(404, "not found"); 529 $self->err (404, "not found");
530 }
418 } 531 }
419} 532}
420 533
421sub handle_dir { 534sub handle_dir {
422 my $self = shift; 535 my $self = shift;
423 my $idx = $self->diridx; 536 my $idx = $self->diridx;
424 537
425 $self->response(200, "ok", 538 $self->response (200, "ok",
426 { 539 {
427 "Content-Type" => "text/html", 540 "Content-Type" => "text/html; charset=utf-8",
428 "Content-Length" => length $idx, 541 "Content-Length" => length $idx,
542 "Last-Modified" => time2str ($self->{stat}[9]),
429 }, 543 },
430 $idx); 544 $idx);
431} 545}
432 546
433sub handle_file { 547sub handle_file {
434 my $self = shift; 548 my ($self, $queue, $tbf) = @_;
435 my $length = $self->{stat}[7]; 549 my $length = $self->{stat}[7];
436 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
437 my $hdr = { 550 my $hdr = {
438 "Last-Modified" => time2str ((stat _)[9]), 551 "Last-Modified" => time2str ((stat _)[9]),
552 "Accept-Ranges" => "bytes",
439 }; 553 };
440 554
441 my @code = (200, "ok"); 555 my @code = (200, "ok");
442 my ($l, $h); 556 my ($l, $h);
443 557
… …
453 } 567 }
454 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 568 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
455 } 569 }
456 $hdr->{"Content-Range"} = "bytes */$length"; 570 $hdr->{"Content-Range"} = "bytes */$length";
457 $hdr->{"Content-Length"} = $length; 571 $hdr->{"Content-Length"} = $length;
458 $self->err(416, "not satisfiable", $hdr, ""); 572 $self->err (416, "not satisfiable", $hdr, "");
459 573
460satisfiable: 574satisfiable:
461 # check for segmented downloads 575 # check for segmented downloads
462 if ($l && $::NO_SEGMENTED) { 576 if ($l && $::NO_SEGMENTED) {
463 my $delay = $::PER_TIMEOUT + 15; 577 my $timeout = $::NOW + 15;
464 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 578 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
465 if ($delay <= 0) { 579 if ($timeout <= $::NOW) {
580 $self->block ($::BLOCKTIME, "segmented downloads are forbidden");
466 $self->err_segmented_download; 581 #$self->err_segmented_download;
467 } else { 582 } else {
468 Coro::Event::do_timer(after => 4); $delay -= 4; 583 $httpevent->wait;
469 } 584 }
470 } 585 }
471 } 586 }
472 587
473 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 588 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
481 596
482 $self->{path} =~ /\.([^.]+)$/; 597 $self->{path} =~ /\.([^.]+)$/;
483 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream"; 598 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
484 $hdr->{"Content-Length"} = $length; 599 $hdr->{"Content-Length"} = $length;
485 600
486 $self->response(@code, $hdr, ""); 601 $self->response (@code, $hdr, "");
487 602
488 if ($self->{method} eq "GET") { 603 if ($self->{method} eq "GET") {
489 $self->{time} = $::NOW; 604 $self->{time} = $::NOW;
490
491 my $fudge = $queue->[0]->waiters;
492 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
493
494 $queue->[1] *= $fudge;
495 my $transfer = $queue->[0]->guard;
496
497 if ($fudge != 1) {
498 $queue->[1] /= $fudge;
499 $queue->[1] = $queue->[1] * $::wait_factor
500 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
501 }
502 $self->{time} = $::NOW; 605 $self->{written} = 0;
503 606
504 $self->{fh}->writable or return;
505
506 my ($fh, $buf, $r);
507 my $current = $Coro::current;
508 open $fh, "<", $self->{path} 607 open my $fh, "<", $self->{path}
509 or die "$self->{path}: late open failure ($!)"; 608 or die "$self->{path}: late open failure ($!)";
510 609
511 $h -= $l - 1; 610 $h -= $l - 1;
512 611
513 if (0) { 612 my $transfer = $queue->start_transfer ($h);
514 if ($l) { 613 my $locked;
515 sysseek $fh, $l, 0; 614 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
516 }
517 }
518 615
519 while ($h > 0) { 616 while ($h > 0) {
520 if (0) { 617 unless ($locked) {
521 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 618 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) {
619 $bufsize = $::BUFSIZE;
620 $self->{time} = $::NOW;
621 $self->{written} = 0;
622 }
623 }
624
625 if ($blocked{$self->{remote_id}}) {
626 $self->{h}{connection} = "close";
627 die bless {}, err::;
628 }
629
630 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
522 or last; 631 or last;
523 } else { 632
524 undef $buf; 633 $tbf->request (length $buf);
525 $aio_requests->down; 634 my $w = syswrite $self->{fh}, $buf
526 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
527 $buf, 0, sub {
528 $r = $_[0];
529 $current->ready;
530 });
531 &Coro::schedule;
532 $aio_requests->up;
533 last unless $r;
534 }
535 my $w = $self->{fh}->syswrite($buf)
536 or last; 635 or last;
537 $::written += $w; 636 $::written += $w;
538 $self->{written} += $w; 637 $self->{written} += $w;
539 $l += $r; 638 $l += $w;
540 } 639 }
541 640
542 close $fh; 641 close $fh;
543 } 642 }
544} 643}
545 644
5461; 6451
646

Diff Legend

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