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

Diff Legend

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