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

Diff Legend

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