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.36 by root, Sun Sep 2 00:54:00 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 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"
45sub handler { 79sub handler {
46 while () { 80 while () {
47 my $new = pop @newcons;
48 if ($new) { 81 if (@newcons) {
49 eval { 82 eval {
50 conn->new(@$new)->handle; 83 conn->new(@{pop @newcons})->handle;
51 }; 84 };
52 slog 1, "$@" if $@ && !ref $@; 85 slog 1, "$@" if $@ && !ref $@;
86
87 $httpevent->broadcast; # only for testing, but doesn't matter much
88
53 $connections->up; 89 $connections->up;
54 } else { 90 } else {
55 last if @pool >= $MAX_POOL; 91 last if @pool >= $MAX_POOL;
56 push @pool, $Coro::current; 92 push @pool, $Coro::current;
57 schedule; 93 schedule;
58 } 94 }
59 } 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 };
60} 117}
61 118
62my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 120 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 121 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 122 ReuseAddr => 1,
66 Listen => 50, 123 Listen => 50,
67 or die "unable to start server"; 124 or die "unable to start server";
68 125
69push @listen_sockets, $http_port; 126listen_on $http_port;
70 127
71our $NOW; 128if ($SERVER_PORT2) {
72our $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";
73 135
74Event->timer(interval => 1, hard => 1, cb => sub { 136 listen_on $http_port;
75 $NOW = time; 137}
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 138
95package conn; 139package conn;
96 140
97use Socket; 141use Socket;
98use HTTP::Date; 142use HTTP::Date;
99use Convert::Scalar 'weaken'; 143use Convert::Scalar 'weaken';
100use Linux::AIO; 144use IO::AIO;
101 145
102Linux::AIO::min_parallel $::AIO_PARALLEL; 146IO::AIO::min_parallel $::AIO_PARALLEL;
103 147
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105
106Event->io(fd => Linux::AIO::poll_fileno, 148Event->io(fd => IO::AIO::poll_fileno,
107 poll => 'r', async => 1, 149 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb); 150 cb => \&IO::AIO::poll_cb);
109 151
110our %conn; # $conn{ip}{self} => connobj 152our %conn; # $conn{ip}{self} => connobj
111our %uri; # $uri{ip}{uri}{self} 153our %uri; # $uri{ip}{uri}{self}
112our %blocked; 154our %blocked;
113our %mimetype; 155our %mimetype;
127 169
128read_mimetypes; 170read_mimetypes;
129 171
130sub new { 172sub new {
131 my $class = shift; 173 my $class = shift;
174 my $fh = shift;
132 my $peername = shift; 175 my $peername = shift;
133 my $fh = shift;
134 my $self = bless { fh => $fh }, $class; 176 my $self = bless { fh => $fh }, $class;
135 my (undef, $iaddr) = unpack_sockaddr_in $peername 177 my (undef, $iaddr) = unpack_sockaddr_in $peername
136 or $self->err(500, "unable to decode peername"); 178 or $self->err(500, "unable to decode peername");
137 179
180 $self->{remote_addr} =
138 $self->{remote_addr} = inet_ntoa $iaddr; 181 $self->{remote_id} = inet_ntoa $iaddr;
182
139 $self->{time} = $::NOW; 183 $self->{time} = $::NOW;
140 184
185 weaken ($Coro::current->{conn} = $self);
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} 196}
153 197
154# end of connection 198sub prune_cache {
155sub eoconn { 199 my $hash = $_[0];
156 my $self = shift;
157 200
158 # clean up hints 201 for (keys %$hash) {
159 delete $conn{$self->{remote_id}}{$self*1}; 202 if (ref $hash->{$_} eq HASH::) {
160 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 }
161} 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);
162 222
163sub slog { 223sub slog {
164 my $self = shift; 224 my $self = shift;
165 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 225 main::slog($_[0], "$self->{remote_id}> $_[1]");
166} 226}
167 227
168sub response { 228sub response {
169 my ($self, $code, $msg, $hdr, $content) = @_; 229 my ($self, $code, $msg, $hdr, $content) = @_;
170 my $res = "HTTP/1.1 $code $msg\015\012"; 230 my $res = "HTTP/1.1 $code $msg\015\012";
231 my $GZ = "";
171 232
172 $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 }
173 259
174 $res .= "Date: $HTTP_NOW\015\012"; 260 $res .= "Date: $HTTP_NOW\015\012";
261 $res .= "Server: $::NAME\015\012";
175 262
176 while (my ($h, $v) = each %$hdr) { 263 while (my ($h, $v) = each %$hdr) {
177 $res .= "$h: $v\015\012" 264 $res .= "$h: $v\015\012"
178 } 265 }
179 $res .= "\015\012"; 266 $res .= "\015\012";
180 267
181 $res .= $content if defined $content and $self->{method} ne "HEAD"; 268 $res .= $content if defined $content and $self->{method} ne "HEAD";
182 269
183 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";
184 273
185 print $accesslog $log if $accesslog; 274 print $::accesslog $log if $::accesslog;
186 print STDERR $log; 275 print STDERR $log;
187 276
188 $self->{written} += 277 $tbf_top->request(length $res, 1e6);
189 print {$self->{fh}} $res; 278 $self->{written} += print {$self->{fh}} $res;
190} 279}
191 280
192sub err { 281sub err {
193 my $self = shift; 282 my $self = shift;
194 my ($code, $msg, $hdr, $content) = @_; 283 my ($code, $msg, $hdr, $content) = @_;
249 my (%hdr, $h, $v); 338 my (%hdr, $h, $v);
250 339
251 $hdr{lc $1} .= ",$2" 340 $hdr{lc $1} .= ",$2"
252 while $req =~ /\G 341 while $req =~ /\G
253 ([^:\000-\040]+): 342 ([^:\000-\040]+):
254 [\008\040]* 343 [\011\040]*
255 ((?: [^\015\012]+ | \015\012[\008\040] )*) 344 ((?: [^\015\012]+ | \015\012[\011\040] )*)
256 \015\012 345 \015\012
257 /gxc; 346 /gxc;
258 347
259 $req =~ /\G\015\012$/ 348 $req =~ /\G\015\012$/
260 or $self->err(400, "bad request"); 349 or $self->err(400, "bad request");
272 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 361 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
273 } 362 }
274 363
275 $self->{remote_id} = $id; 364 $self->{remote_id} = $id;
276 365
366 weaken (local $conn{$id}{$self*1} = $self);
367
277 if ($blocked{$id}) { 368 if ($blocked{$id}) {
278 $self->err_blocked($blocked{$id}) 369 $self->err_blocked
279 if $blocked{$id} > $::NOW; 370 if $blocked{$id}[0] > $::NOW;
280 371
281 delete $blocked{$id}; 372 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 } 373 }
295 374
296 # find out server name and port 375 # find out server name and port
297 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 376 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
298 $host = $1; 377 $host = $1;
302 381
303 if (defined $host) { 382 if (defined $host) {
304 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 383 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
305 } else { 384 } else {
306 ($self->{server_port}, $host) 385 ($self->{server_port}, $host)
307 = unpack_sockaddr_in $self->{fh}->getsockname 386 = unpack_sockaddr_in $self->{fh}->sockname
308 or $self->err(500, "unable to get socket name"); 387 or $self->err(500, "unable to get socket name");
309 $host = inet_ntoa $host; 388 $host = inet_ntoa $host;
310 } 389 }
311 390
312 $self->{server_name} = $host; 391 $self->{server_name} = $host;
313 392
314 # enter ourselves into various lists
315 weaken ($conn{$id}{$self*1} = $self);
316 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 393 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
317 394
318 eval { 395 eval {
319 $self->map_uri; 396 $self->map_uri;
320 $self->respond; 397 $self->respond;
321 }; 398 };
322 399
323 $self->eoconn;
324
325 die if $@ && !ref $@; 400 die if $@ && !ref $@;
326 401
327 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 402 last if $self->{h}{connection} =~ /close/i;
403
404 $httpevent->broadcast;
328 405
329 $fh->timeout($::PER_TIMEOUT); 406 $fh->timeout($::PER_TIMEOUT);
330 } 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;
331} 416}
332 417
333# uri => path mapping 418# uri => path mapping
334sub map_uri { 419sub map_uri {
335 my $self = shift; 420 my $self = shift;
382 467
383sub respond { 468sub respond {
384 my $self = shift; 469 my $self = shift;
385 my $path = $self->{path}; 470 my $path = $self->{path};
386 471
387 stat $path 472 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
388 or $self->err(404, "not found"); 473 if ($::internal{$1}) {
389 474 $::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 { 475 } else {
403 $ims < $self->{stat}[9] 476 $self->err(404, "not found");
477 }
478 } else {
479
480 stat $path
404 or $self->err(304, "not modified"); 481 or $self->err(404, "not found");
405 482
406 if (-r "$path/index.html") { 483 $self->{stat} = [stat _];
407 $self->{path} .= "/index.html"; 484
408 $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}/" });
409 } 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 {
410 $self->handle_dir; 504 $self->handle_dir;
411 } 505 }
412 } 506 }
413 } elsif (-f _ && -r _) { 507 } elsif (-f _ && -r _) {
414 -x _ and $self->err(403, "forbidden"); 508 -x _ and $self->err(403, "forbidden");
415 $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);
416 } else { 522 } else {
417 $self->err(404, "not found"); 523 $self->err(404, "not found");
524 }
418 } 525 }
419} 526}
420 527
421sub handle_dir { 528sub handle_dir {
422 my $self = shift; 529 my $self = shift;
423 my $idx = $self->diridx; 530 my $idx = $self->diridx;
424 531
425 $self->response(200, "ok", 532 $self->response(200, "ok",
426 { 533 {
427 "Content-Type" => "text/html", 534 "Content-Type" => "text/html; charset=utf-8",
428 "Content-Length" => length $idx, 535 "Content-Length" => length $idx,
536 "Last-Modified" => time2str ($self->{stat}[9]),
429 }, 537 },
430 $idx); 538 $idx);
431} 539}
432 540
433sub handle_file { 541sub handle_file {
434 my $self = shift; 542 my ($self, $queue, $tbf) = @_;
435 my $length = $self->{stat}[7]; 543 my $length = $self->{stat}[7];
436 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
437 my $hdr = { 544 my $hdr = {
438 "Last-Modified" => time2str ((stat _)[9]), 545 "Last-Modified" => time2str ((stat _)[9]),
546 "Accept-Ranges" => "bytes",
439 }; 547 };
440 548
441 my @code = (200, "ok"); 549 my @code = (200, "ok");
442 my ($l, $h); 550 my ($l, $h);
443 551
458 $self->err(416, "not satisfiable", $hdr, ""); 566 $self->err(416, "not satisfiable", $hdr, "");
459 567
460satisfiable: 568satisfiable:
461 # check for segmented downloads 569 # check for segmented downloads
462 if ($l && $::NO_SEGMENTED) { 570 if ($l && $::NO_SEGMENTED) {
463 my $delay = $::PER_TIMEOUT + 15; 571 my $timeout = $::NOW + 15;
464 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 572 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
465 if ($delay <= 0) { 573 if ($timeout <= $::NOW) {
574 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
466 $self->err_segmented_download; 575 #$self->err_segmented_download;
467 } else { 576 } else {
468 Coro::Event::do_timer(after => 4); $delay -= 4; 577 $httpevent->wait;
469 } 578 }
470 } 579 }
471 } 580 }
472 581
473 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 582 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
485 594
486 $self->response(@code, $hdr, ""); 595 $self->response(@code, $hdr, "");
487 596
488 if ($self->{method} eq "GET") { 597 if ($self->{method} eq "GET") {
489 $self->{time} = $::NOW; 598 $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; 599 $self->{written} = 0;
503 600
504 $self->{fh}->writable or return; 601 my $current = $Coro::current;
505 602
506 my ($fh, $buf, $r); 603 my ($fh, $buf, $r);
507 my $current = $Coro::current; 604
508 open $fh, "<", $self->{path} 605 open $fh, "<", $self->{path}
509 or die "$self->{path}: late open failure ($!)"; 606 or die "$self->{path}: late open failure ($!)";
510 607
511 $h -= $l - 1; 608 $h -= $l - 1;
512 609
513 if (0) { 610 if (0) { # !AIO
514 if ($l) { 611 if ($l) {
515 sysseek $fh, $l, 0; 612 sysseek $fh, $l, 0;
516 } 613 }
517 } 614 }
615
616 my $transfer = $queue->start_transfer($h);
617 my $locked;
618 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
518 619
519 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
520 if (0) { 634 if (0) { # !AIO
521 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 635 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
522 or last; 636 or last;
523 } else { 637 } else {
524 undef $buf; 638 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
525 $aio_requests->down;
526 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
527 $buf, 0, sub { 639 $buf, 0, sub {
528 $r = $_[0]; 640 $r = $_[0];
529 $current->ready; 641 Coro::ready($current);
530 }); 642 });
531 &Coro::schedule; 643 &Coro::schedule;
532 $aio_requests->up;
533 last unless $r; 644 last unless $r;
534 } 645 }
535 my $w = $self->{fh}->syswrite($buf) 646
647 $tbf->request(length $buf);
648 my $w = syswrite $self->{fh}, $buf
536 or last; 649 or last;
537 $::written += $w; 650 $::written += $w;
538 $self->{written} += $w; 651 $self->{written} += $w;
539 $l += $r; 652 $l += $r;
540 } 653 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines