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.4 by root, Fri Aug 10 04:16:41 2001 UTC vs.
Revision 1.35 by root, Thu Aug 30 12:35:28 2001 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5 5
6use HTTP::Date;
7
6no utf8; 8no utf8;
7use bytes; 9use bytes;
8 10
9# at least on my machine, this thingy serves files 11# at least on my machine, this thingy serves files
10# quite a bit faster than apache, ;) 12# quite a bit faster than apache, ;)
11# and quite a bit slower than thttpd :( 13# and quite a bit slower than thttpd :(
12 14
13$SIG{PIPE} = 'IGNORE'; 15$SIG{PIPE} = 'IGNORE';
14 16
17our $accesslog;
18
19if ($ACCESS_LOG) {
20 use IO::Handle;
21 open $accesslog, ">>$ACCESS_LOG"
22 or die "$ACCESS_LOG: $!";
23 $accesslog->autoflush(1);
24}
25
15sub slog { 26sub slog {
16 my $level = shift; 27 my $level = shift;
17 my $format = shift; 28 my $format = shift;
18 printf "---: $format\n", @_; 29 printf "---: $format\n", @_;
19} 30}
20 31
21my $connections = new Coro::Semaphore $MAX_CONNECTS; 32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
22 33
23my @fh; 34our $wait_factor = 0.95;
35
36our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
39);
40
41my @newcons;
24my @pool; 42my @pool;
25 43
26# one "execution thread" 44# one "execution thread"
27sub handler { 45sub handler {
28 while () { 46 while () {
29 my $fh = pop @fh; 47 my $new = pop @newcons;
30 if ($fh) { 48 if ($new) {
31 eval { 49 eval {
32 conn->new($fh)->handle; 50 conn->new(@$new)->handle;
33 }; 51 };
34 close $fh;
35 slog 1, "$@" if $@ && !ref $@; 52 slog 1, "$@" if $@ && !ref $@;
36 $connections->up; 53 $connections->up;
37 } else { 54 } else {
38 last if @pool >= $MAX_POOL; 55 last if @pool >= $MAX_POOL;
39 push @pool, $Coro::current; 56 push @pool, $Coro::current;
… …
44 61
45my $http_port = new Coro::Socket 62my $http_port = new Coro::Socket
46 LocalAddr => $SERVER_HOST, 63 LocalAddr => $SERVER_HOST,
47 LocalPort => $SERVER_PORT, 64 LocalPort => $SERVER_PORT,
48 ReuseAddr => 1, 65 ReuseAddr => 1,
49 Listen => 1, 66 Listen => 50,
50 or die "unable to start server"; 67 or die "unable to start server";
51 68
52push @listen_sockets, $http_port; 69push @listen_sockets, $http_port;
70
71our $NOW;
72our $HTTP_NOW;
73
74Event->timer(interval => 1, hard => 1, cb => sub {
75 $NOW = time;
76 $HTTP_NOW = time2str $NOW;
77})->now;
53 78
54# the "main thread" 79# the "main thread"
55async { 80async {
56 slog 1, "accepting connections"; 81 slog 1, "accepting connections";
57 while () { 82 while () {
58 $connections->down; 83 $connections->down;
59 push @fh, $http_port->accept; 84 push @newcons, [$http_port->accept];
60 #slog 3, "accepted @$connections ".scalar(@pool); 85 #slog 3, "accepted @$connections ".scalar(@pool);
61 $::NOW = time;
62 if (@pool) { 86 if (@pool) {
63 (pop @pool)->ready; 87 (pop @pool)->ready;
64 } else { 88 } else {
65 async \&handler; 89 async \&handler;
66 } 90 }
… …
71package conn; 95package conn;
72 96
73use Socket; 97use Socket;
74use HTTP::Date; 98use HTTP::Date;
75use Convert::Scalar 'weaken'; 99use Convert::Scalar 'weaken';
100use Linux::AIO;
76 101
102Linux::AIO::min_parallel $::AIO_PARALLEL;
103
104my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
105
106Event->io(fd => Linux::AIO::poll_fileno,
107 poll => 'r', async => 1,
108 cb => \&Linux::AIO::poll_cb);
109
77our %conn; # $conn{ip}{fh} => connobj 110our %conn; # $conn{ip}{self} => connobj
111our %uri; # $uri{ip}{uri}{self}
78our %blocked; 112our %blocked;
113our %mimetype;
114
115sub read_mimetypes {
116 local *M;
117 if (open M, "<mime_types") {
118 while (<M>) {
119 if (/^([^#]\S+)\t+(\S+)$/) {
120 $mimetype{lc $1} = $2;
121 }
122 }
123 } else {
124 print "cannot open mime_types\n";
125 }
126}
127
128read_mimetypes;
79 129
80sub new { 130sub new {
81 my $class = shift; 131 my $class = shift;
132 my $peername = shift;
82 my $fh = shift; 133 my $fh = shift;
83 my $self = bless { fh => $fh }, $class; 134 my $self = bless { fh => $fh }, $class;
84 my (undef, $iaddr) = unpack_sockaddr_in $fh->getpeername 135 my (undef, $iaddr) = unpack_sockaddr_in $peername
85 or $self->err(500, "unable to get peername"); 136 or $self->err(500, "unable to decode peername");
137
86 $self->{remote_addr} = inet_ntoa $iaddr; 138 $self->{remote_addr} = inet_ntoa $iaddr;
139 $self->{time} = $::NOW;
87 140
88 # enter ourselves into various lists 141 # enter ourselves into various lists
89 weaken ($conn{$self->{remote_addr}}{$self*1} = $self); 142 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
90 143
144 $::conns++;
145
91 $self; 146 $self;
92} 147}
93 148
94sub DESTROY { 149sub DESTROY {
95 my $self = shift; 150 my $self = shift;
151
152 $::conns--;
153
154 $self->eoconn;
96 delete $conn{$self->{remote_addr}}{$self*1}; 155 delete $conn{$self->{remote_addr}}{$self*1};
156}
157
158# end of connection
159sub eoconn {
160 my $self = shift;
97 delete $uri{$self->{uri}}{$self*1}; 161 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
98} 162}
99 163
100sub slog { 164sub slog {
101 my $self = shift; 165 my $self = shift;
102 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 166 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
103} 167}
104 168
105sub response { 169sub response {
106 my ($self, $code, $msg, $hdr, $content) = @_; 170 my ($self, $code, $msg, $hdr, $content) = @_;
107 my $res = "HTTP/1.0 $code $msg\015\012"; 171 my $res = "HTTP/1.1 $code $msg\015\012";
108 172
109 $res .= "Connection: close\015\012"; 173 $self->{h}{connection} ||= $hdr->{Connection};
110 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 174
175 $res .= "Date: $HTTP_NOW\015\012";
111 176
112 while (my ($h, $v) = each %$hdr) { 177 while (my ($h, $v) = each %$hdr) {
113 $res .= "$h: $v\015\012" 178 $res .= "$h: $v\015\012"
114 } 179 }
180 $res .= "\015\012";
115 181
116 $res .= "\015\012$content" if defined $content; 182 $res .= $content if defined $content and $self->{method} ne "HEAD";
117 183
118 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 184 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
119 185
186 print $accesslog $log if $accesslog;
187 print STDERR $log;
188
189 $self->{written} +=
120 print {$self->{fh}} $res; 190 print {$self->{fh}} $res;
121} 191}
122 192
123sub err { 193sub err {
124 my $self = shift; 194 my $self = shift;
125 my ($code, $msg, $hdr, $content) = @_; 195 my ($code, $msg, $hdr, $content) = @_;
126 196
127 unless (defined $content) { 197 unless (defined $content) {
128 $content = "$code $msg"; 198 $content = "$code $msg\n";
129 $hdr->{"Content-Type"} = "text/plain"; 199 $hdr->{"Content-Type"} = "text/plain";
130 $hdr->{"Content-Length"} = length $content; 200 $hdr->{"Content-Length"} = length $content;
131 } 201 }
202 $hdr->{"Connection"} = "close";
132 203
133 $self->response($code, $msg, $hdr, $content); 204 $self->response($code, $msg, $hdr, $content);
134 205
135 die bless {}, err::; 206 die bless {}, err::;
136} 207}
137 208
138sub err_blocked {
139 my $self = shift;
140 my $ip = $self->{remote_addr};
141 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
142 $self->err(403, "too many connections",
143 {
144 "Content-Type" => "text/html",
145 "Retry-After" => $::BLOCKTIME
146 },
147 <<EOF);
148<html><p>
149You have been blocked because you opened too many connections. You
150may retry at</p>
151
152 <p><blockquote>$time.</blockquote></p>
153
154<p>Until then, each new access will renew the block. You might want to have a
155look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
156</html>
157EOF
158}
159
160sub handle { 209sub handle {
161 my $self = shift; 210 my $self = shift;
162 my $fh = $self->{fh}; 211 my $fh = $self->{fh};
163 212
213 my $host;
214
215 $fh->timeout($::REQ_TIMEOUT);
164 #while() { 216 while() {
217 $self->{reqs}++;
218
219 # read request and parse first line
220 my $req = $fh->readline("\015\012\015\012");
221
222 unless (defined $req) {
223 if (exists $self->{version}) {
224 last;
225 } else {
226 $self->err(408, "request timeout");
227 }
228 }
229
165 $self->{h} = {}; 230 $self->{h} = {};
166 231
167 # read request and parse first line
168 $fh->timeout($::REQ_TIMEOUT);
169 my $req = $fh->readline("\015\012\015\012");
170 $fh->timeout($::RES_TIMEOUT); 232 $fh->timeout($::RES_TIMEOUT);
171
172 defined $req or
173 $self->err(408, "request timeout");
174
175 my $ip = $self->{remote_addr}; 233 my $ip = $self->{remote_addr};
176 234
177 if ($blocked{$ip}) { 235 if ($blocked{$ip}) {
178 $self->err_blocked($blocked{$ip}) 236 $self->err_blocked($blocked{$ip})
179 if $blocked{$ip} > $::NOW; 237 if $blocked{$ip} > $::NOW;
180 238
181 delete $blocked{$ip}; 239 delete $blocked{$ip};
182 } 240 }
183 241
184 if (%{$conn{$ip}} > $::MAX_CONN_IP) { 242 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
243 my $delay = 120;
244 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
245 if ($delay <= 0) {
185 $self->slog("blocked ip $ip"); 246 $self->slog(2, "blocked ip $ip");
186 $self->err_blocked; 247 $self->err_blocked;
248 } else {
249 Coro::Event::do_timer(after => 3);
250 $delay -= 3;
251 }
252 }
187 } 253 }
188 254
189 $req =~ /^(?:\015\012)? 255 $req =~ /^(?:\015\012)?
190 (GET|HEAD) \040+ 256 (GET|HEAD) \040+
191 ([^\040]+) \040+ 257 ([^\040]+) \040+
192 HTTP\/([0-9]+\.[0-9]+) 258 HTTP\/([0-9]+\.[0-9]+)
193 \015\012/gx 259 \015\012/gx
194 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 260 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
195
196 $2 ne "1.0"
197 or $self->err(506, "http protocol version not supported");
198 261
199 $self->{method} = $1; 262 $self->{method} = $1;
200 $self->{uri} = $2; 263 $self->{uri} = $2;
264 $self->{version} = $3;
265
266 $3 =~ /^1\./
267 or $self->err(506, "http protocol version $3 not supported");
201 268
202 # parse headers 269 # parse headers
203 { 270 {
204 my (%hdr, $h, $v); 271 my (%hdr, $h, $v);
205 272
… …
216 283
217 $self->{h}{$h} = substr $v, 1 284 $self->{h}{$h} = substr $v, 1
218 while ($h, $v) = each %hdr; 285 while ($h, $v) = each %hdr;
219 } 286 }
220 287
288 # find out server name and port
289 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
290 $host = $1;
291 } else {
292 $host = $self->{h}{host};
293 }
294
295 if (defined $host) {
221 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 296 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
297 } else {
298 ($self->{server_port}, $host)
299 = unpack_sockaddr_in $self->{fh}->getsockname
300 or $self->err(500, "unable to get socket name");
301 $host = inet_ntoa $host;
302 }
222 303
304 $self->{server_name} = $host;
305
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
223 weaken ($uri{$self->{uri}}{$self*1} = $self); 315 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self);
224 316
317 eval {
225 $self->map_uri; 318 $self->map_uri;
226
227 Coro::Event::do_timer(after => 5);
228
229 $self->respond; 319 $self->respond;
320 };
321
322 $self->eoconn;
323
324 die if $@ && !ref $@;
325
326 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1;
327
328 $fh->timeout($::PER_TIMEOUT);
230 #} 329 }
231} 330}
232 331
233# uri => path mapping 332# uri => path mapping
234sub map_uri { 333sub map_uri {
235 my $self = shift; 334 my $self = shift;
236 my $host = $self->{h}{host} || "default"; 335 my $host = $self->{server_name};
237 my $uri = $self->{uri}; 336 my $uri = $self->{uri};
238 337
239 # some massaging, also makes it more secure 338 # some massaging, also makes it more secure
240 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 339 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
241 $uri =~ s%//+%/%g; 340 $uri =~ s%//+%/%g;
… …
247 346
248 $self->{name} = $uri; 347 $self->{name} = $uri;
249 348
250 # now do the path mapping 349 # now do the path mapping
251 $self->{path} = "$::DOCROOT/$host$uri"; 350 $self->{path} = "$::DOCROOT/$host$uri";
252}
253 351
254sub server_address { 352 $self->access_check;
255 my $self = shift;
256 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
257 or $self->err(500, "unable to get socket name");
258 ((inet_ntoa $iaddr), $port);
259}
260
261sub server_host {
262 my $self = shift;
263 if (exists $self->{h}{host}) {
264 return $self->{h}{host};
265 } else {
266 return (($self->server_address)[0]);
267 }
268}
269
270sub server_hostport {
271 my $self = shift;
272 my ($host, $port);
273 if (exists $self->{h}{host}) {
274 ($host, $port) = ($self->{h}{host}, $self->{server_port});
275 } else {
276 ($host, $port) = $self->server_address;
277 }
278 $port = $port == 80 ? "" : ":$port";
279 $host.$port;
280} 353}
281 354
282sub _cgi { 355sub _cgi {
283 my $self = shift; 356 my $self = shift;
284 my $path = shift; 357 my $path = shift;
… …
287 # no two-way xxx supported 360 # no two-way xxx supported
288 if (0 == fork) { 361 if (0 == fork) {
289 open STDOUT, ">&".fileno($self->{fh}); 362 open STDOUT, ">&".fileno($self->{fh});
290 if (chdir $::DOCROOT) { 363 if (chdir $::DOCROOT) {
291 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 364 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
292 $ENV{HTTP_HOST} = $self->server_host; 365 $ENV{HTTP_HOST} = $self->{server_name};
293 $ENV{HTTP_PORT} = $self->{server_host}; 366 $ENV{HTTP_PORT} = $self->{server_port};
294 $ENV{SCRIPT_NAME} = $self->{name}; 367 $ENV{SCRIPT_NAME} = $self->{name};
295 exec $::INDEXPROG; 368 exec $path;
296 } 369 }
297 Coro::State::_exit(0); 370 Coro::State::_exit(0);
298 } else { 371 } else {
372 die;
299 } 373 }
374}
375
376sub server_hostport {
377 $_[0]{server_port} == 80
378 ? $_[0]{server_name}
379 : "$_[0]{server_name}:$_[0]{server_port}";
300} 380}
301 381
302sub respond { 382sub respond {
303 my $self = shift; 383 my $self = shift;
304 my $path = $self->{path}; 384 my $path = $self->{path};
305 385
306 stat $path 386 stat $path
307 or $self->err(404, "not found"); 387 or $self->err(404, "not found");
388
389 $self->{stat} = [stat _];
308 390
309 # idiotic netscape sends idiotic headers AGAIN 391 # idiotic netscape sends idiotic headers AGAIN
310 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/ 392 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
311 ? str2time $1 : 0; 393 ? str2time $1 : 0;
312 394
313 if (-d _ && -r _) { 395 if (-d _ && -r _) {
314 # directory 396 # directory
315 if ($path !~ /\/$/) { 397 if ($path !~ /\/$/) {
316 # create a redirect to get the trailing "/" 398 # create a redirect to get the trailing "/"
317 my $host = $self->server_hostport; 399 # we don't try to avoid the :80
318 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" }); 400 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
319 } else { 401 } else {
320 $ims < (stat _)[9] 402 $ims < $self->{stat}[9]
321 or $self->err(304, "not modified"); 403 or $self->err(304, "not modified");
322 404
323 if ($self->{method} eq "GET") {
324 if (-r "$path/index.html") { 405 if (-r "$path/index.html") {
325 $self->{path} .= "/index.html"; 406 $self->{path} .= "/index.html";
326 $self->handle_file; 407 $self->handle_file;
327 } else { 408 } else {
328 $self->handle_dir; 409 $self->handle_dir;
329 }
330 } 410 }
331 } 411 }
332 } elsif (-f _ && -r _) { 412 } elsif (-f _ && -r _) {
333 -x _ and $self->err(403, "forbidden"); 413 -x _ and $self->err(403, "forbidden");
334 $self->handle_file; 414 $self->handle_file;
… …
337 } 417 }
338} 418}
339 419
340sub handle_dir { 420sub handle_dir {
341 my $self = shift; 421 my $self = shift;
342 $self->_cgi($::INDEXPROG); 422 my $idx = $self->diridx;
423
424 $self->response(200, "ok",
425 {
426 "Content-Type" => "text/html",
427 "Content-Length" => length $idx,
428 },
429 $idx);
343} 430}
344 431
345sub handle_file { 432sub handle_file {
346 my $self = shift; 433 my $self = shift;
347 my $length = -s _; 434 my $length = $self->{stat}[7];
435 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
348 my $hdr = { 436 my $hdr = {
349 "Last-Modified" => time2str ((stat _)[9]), 437 "Last-Modified" => time2str ((stat _)[9]),
350 }; 438 };
351 439
352 my @code = (200, "ok"); 440 my @code = (200, "ok");
… …
360 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 448 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
361 } else { 449 } else {
362 ($l, $h) = (0, $length - 1); 450 ($l, $h) = (0, $length - 1);
363 goto ignore; 451 goto ignore;
364 } 452 }
365 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 453 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
366 } 454 }
367 $hdr->{"Content-Range"} = "bytes */$length"; 455 $hdr->{"Content-Range"} = "bytes */$length";
456 $hdr->{"Content-Length"} = $length;
368 $self->err(416, "not satisfiable", $hdr); 457 $self->err(416, "not satisfiable", $hdr, "");
369 458
370satisfiable: 459satisfiable:
371 # check for segmented downloads 460 # check for segmented downloads
372 if ($l && $NO_SEGMENTED) { 461 if ($l && $::NO_SEGMENTED) {
373 if (%{$uri{$self->{uri}}} > 1) { 462 my $delay = 180;
374 $self->slog("segmented download refused\n"); 463 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) {
375 $self->err(400, "segmented downloads are not allowed"); 464 if ($delay <= 0) {
465 $self->err_segmented_download;
466 } else {
467 Coro::Event::do_timer(after => 3); $delay -= 3;
468 }
376 } 469 }
377 } 470 }
378 471
379 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 472 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
380 @code = (206, "partial content"); 473 @code = (206, "partial content");
… …
383ignore: 476ignore:
384 } else { 477 } else {
385 ($l, $h) = (0, $length - 1); 478 ($l, $h) = (0, $length - 1);
386 } 479 }
387 480
388 if ($self->{path} =~ /\.html$/) { 481 $self->{path} =~ /\.([^.]+)$/;
389 $hdr->{"Content-Type"} = "text/html";
390 } else {
391 $hdr->{"Content-Type"} = "application/octet-stream"; 482 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
392 }
393
394 $hdr->{"Content-Length"} = $length; 483 $hdr->{"Content-Length"} = $length;
395 484
396 $self->response(@code, $hdr, ""); 485 $self->response(@code, $hdr, "");
397 486
398 if ($self->{method} eq "GET") { 487 if ($self->{method} eq "GET") {
488 $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;
502
503 $self->{fh}->writable or return;
504
399 my ($fh, $buf); 505 my ($fh, $buf, $r);
506 my $current = $Coro::current;
400 open $fh, "<", $self->{path} 507 open $fh, "<", $self->{path}
401 or die "$self->{path}: late open failure ($!)"; 508 or die "$self->{path}: late open failure ($!)";
402 509
403 if ($l) {
404 sysseek $fh, $l, 0
405 or die "$self->{path}: cannot seek to $l ($!)";
406 }
407
408 $h -= $l - 1; 510 $h -= $l - 1;
409 511
512 if (0) {
513 if ($l) {
514 sysseek $fh, $l, 0;
515 }
516 }
517
410 while ($h > 0) { 518 while ($h > 0) {
411 $h -= sysread $fh, $buf, $h > 16384 ? 16384 : $h; 519 if (0) {
412 print {$self->{fh}} $buf 520 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
521 or last;
522 } else {
523 undef $buf;
524 $aio_requests->down;
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)
413 or last; 535 or last;
414 cede; 536 $::written += $w;
537 $self->{written} += $w;
538 $l += $r;
415 } 539 }
416 }
417 540
418 close $fh; 541 close $fh;
542 }
419} 543}
420 544
4211; 5451;

Diff Legend

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