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

Diff Legend

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