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

Diff Legend

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