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

Diff Legend

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