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

Diff Legend

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