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

Diff Legend

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