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.5 by root, Fri Aug 10 15:58:04 2001 UTC vs.
Revision 1.36 by root, Sun Sep 2 00:54:00 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 $::conns++;
89 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
90 142
91 $self; 143 $self;
92} 144}
93 145
94sub DESTROY { 146sub DESTROY {
95 my $self = shift; 147 my $self = shift;
148
149 $::conns--;
150
151 $self->eoconn;
152}
153
154# end of connection
155sub eoconn {
156 my $self = shift;
157
158 # clean up hints
96 delete $conn{$self->{remote_addr}}{$self*1}; 159 delete $conn{$self->{remote_id}}{$self*1};
97 delete $uri{$self->{uri}}{$self*1}; 160 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
98} 161}
99 162
100sub slog { 163sub slog {
101 my $self = shift; 164 my $self = shift;
102 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 165 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
103} 166}
104 167
105sub response { 168sub response {
106 my ($self, $code, $msg, $hdr, $content) = @_; 169 my ($self, $code, $msg, $hdr, $content) = @_;
107 my $res = "HTTP/1.0 $code $msg\015\012"; 170 my $res = "HTTP/1.1 $code $msg\015\012";
108 171
109 $res .= "Connection: close\015\012"; 172 $self->{h}{connection} ||= $hdr->{Connection};
110 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 173
174 $res .= "Date: $HTTP_NOW\015\012";
111 175
112 while (my ($h, $v) = each %$hdr) { 176 while (my ($h, $v) = each %$hdr) {
113 $res .= "$h: $v\015\012" 177 $res .= "$h: $v\015\012"
114 } 178 }
179 $res .= "\015\012";
115 180
116 $res .= "\015\012$content" if defined $content; 181 $res .= $content if defined $content and $self->{method} ne "HEAD";
117 182
118 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 183 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
119 184
185 print $accesslog $log if $accesslog;
186 print STDERR $log;
187
188 $self->{written} +=
120 print {$self->{fh}} $res; 189 print {$self->{fh}} $res;
121} 190}
122 191
123sub err { 192sub err {
124 my $self = shift; 193 my $self = shift;
125 my ($code, $msg, $hdr, $content) = @_; 194 my ($code, $msg, $hdr, $content) = @_;
126 195
127 unless (defined $content) { 196 unless (defined $content) {
128 $content = "$code $msg"; 197 $content = "$code $msg\n";
129 $hdr->{"Content-Type"} = "text/plain"; 198 $hdr->{"Content-Type"} = "text/plain";
130 $hdr->{"Content-Length"} = length $content; 199 $hdr->{"Content-Length"} = length $content;
131 } 200 }
201 $hdr->{"Connection"} = "close";
132 202
133 $self->response($code, $msg, $hdr, $content); 203 $self->response($code, $msg, $hdr, $content);
134 204
135 die bless {}, err::; 205 die bless {}, err::;
136} 206}
137 207
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 { 208sub handle {
161 my $self = shift; 209 my $self = shift;
162 my $fh = $self->{fh}; 210 my $fh = $self->{fh};
163 211
212 my $host;
213
214 $fh->timeout($::REQ_TIMEOUT);
164 #while() { 215 while() {
216 $self->{reqs}++;
217
218 # read request and parse first line
219 my $req = $fh->readline("\015\012\015\012");
220
221 unless (defined $req) {
222 if (exists $self->{version}) {
223 last;
224 } else {
225 $self->err(408, "request timeout");
226 }
227 }
228
165 $self->{h} = {}; 229 $self->{h} = {};
166 230
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); 231 $fh->timeout($::RES_TIMEOUT);
171
172 defined $req or
173 $self->err(408, "request timeout");
174
175 my $ip = $self->{remote_addr};
176
177 if ($blocked{$ip}) {
178 $self->err_blocked($blocked{$ip})
179 if $blocked{$ip} > $::NOW;
180
181 delete $blocked{$ip};
182 }
183
184 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
185 $self->slog("blocked ip $ip");
186 $self->err_blocked;
187 }
188 232
189 $req =~ /^(?:\015\012)? 233 $req =~ /^(?:\015\012)?
190 (GET|HEAD) \040+ 234 (GET|HEAD) \040+
191 ([^\040]+) \040+ 235 ([^\040]+) \040+
192 HTTP\/([0-9]+\.[0-9]+) 236 HTTP\/([0-9]+\.[0-9]+)
193 \015\012/gx 237 \015\012/gx
194 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 238 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 239
199 $self->{method} = $1; 240 $self->{method} = $1;
200 $self->{uri} = $2; 241 $self->{uri} = $2;
242 $self->{version} = $3;
243
244 $3 =~ /^1\./
245 or $self->err(506, "http protocol version $3 not supported");
201 246
202 # parse headers 247 # parse headers
203 { 248 {
204 my (%hdr, $h, $v); 249 my (%hdr, $h, $v);
205 250
… …
216 261
217 $self->{h}{$h} = substr $v, 1 262 $self->{h}{$h} = substr $v, 1
218 while ($h, $v) = each %hdr; 263 while ($h, $v) = each %hdr;
219 } 264 }
220 265
266 # remote id should be unique per user
267 my $id = $self->{remote_addr};
268
269 if (exists $self->{h}{"client-ip"}) {
270 $id .= "[".$self->{h}{"client-ip"}."]";
271 } elsif (exists $self->{h}{"x-forwarded-for"}) {
272 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
273 }
274
275 $self->{remote_id} = $id;
276
277 if ($blocked{$id}) {
278 $self->err_blocked($blocked{$id})
279 if $blocked{$id} > $::NOW;
280
281 delete $blocked{$id};
282 }
283
284 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
285 my $delay = $::PER_TIMEOUT + 15;
286 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
287 if ($delay <= 0) {
288 $self->slog(2, "blocked ip $id");
289 $self->err_blocked;
290 } else {
291 Coro::Event::do_timer(after => 4); $delay -= 4;
292 }
293 }
294 }
295
296 # find out server name and port
297 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
298 $host = $1;
299 } else {
300 $host = $self->{h}{host};
301 }
302
303 if (defined $host) {
221 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 304 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
305 } else {
306 ($self->{server_port}, $host)
307 = unpack_sockaddr_in $self->{fh}->getsockname
308 or $self->err(500, "unable to get socket name");
309 $host = inet_ntoa $host;
310 }
222 311
312 $self->{server_name} = $host;
313
314 # enter ourselves into various lists
315 weaken ($conn{$id}{$self*1} = $self);
223 weaken ($uri{$self->{uri}}{$self*1} = $self); 316 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
224 317
318 eval {
225 $self->map_uri; 319 $self->map_uri;
226 $self->respond; 320 $self->respond;
321 };
322
323 $self->eoconn;
324
325 die if $@ && !ref $@;
326
327 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1;
328
329 $fh->timeout($::PER_TIMEOUT);
227 #} 330 }
228} 331}
229 332
230# uri => path mapping 333# uri => path mapping
231sub map_uri { 334sub map_uri {
232 my $self = shift; 335 my $self = shift;
233 my $host = $self->{h}{host} || "default"; 336 my $host = $self->{server_name};
234 my $uri = $self->{uri}; 337 my $uri = $self->{uri};
235 338
236 # some massaging, also makes it more secure 339 # some massaging, also makes it more secure
237 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 340 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
238 $uri =~ s%//+%/%g; 341 $uri =~ s%//+%/%g;
… …
244 347
245 $self->{name} = $uri; 348 $self->{name} = $uri;
246 349
247 # now do the path mapping 350 # now do the path mapping
248 $self->{path} = "$::DOCROOT/$host$uri"; 351 $self->{path} = "$::DOCROOT/$host$uri";
249}
250 352
251sub server_address { 353 $self->access_check;
252 my $self = shift;
253 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
254 or $self->err(500, "unable to get socket name");
255 ((inet_ntoa $iaddr), $port);
256}
257
258sub server_host {
259 my $self = shift;
260 if (exists $self->{h}{host}) {
261 return $self->{h}{host};
262 } else {
263 return (($self->server_address)[0]);
264 }
265}
266
267sub server_hostport {
268 my $self = shift;
269 my ($host, $port);
270 if (exists $self->{h}{host}) {
271 ($host, $port) = ($self->{h}{host}, $self->{server_port});
272 } else {
273 ($host, $port) = $self->server_address;
274 }
275 $port = $port == 80 ? "" : ":$port";
276 $host.$port;
277} 354}
278 355
279sub _cgi { 356sub _cgi {
280 my $self = shift; 357 my $self = shift;
281 my $path = shift; 358 my $path = shift;
… …
284 # no two-way xxx supported 361 # no two-way xxx supported
285 if (0 == fork) { 362 if (0 == fork) {
286 open STDOUT, ">&".fileno($self->{fh}); 363 open STDOUT, ">&".fileno($self->{fh});
287 if (chdir $::DOCROOT) { 364 if (chdir $::DOCROOT) {
288 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 365 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
289 $ENV{HTTP_HOST} = $self->server_host; 366 $ENV{HTTP_HOST} = $self->{server_name};
290 $ENV{HTTP_PORT} = $self->{server_host}; 367 $ENV{HTTP_PORT} = $self->{server_port};
291 $ENV{SCRIPT_NAME} = $self->{name}; 368 $ENV{SCRIPT_NAME} = $self->{name};
292 exec $::INDEXPROG; 369 exec $path;
293 } 370 }
294 Coro::State::_exit(0); 371 Coro::State::_exit(0);
295 } else { 372 } else {
373 die;
296 } 374 }
375}
376
377sub server_hostport {
378 $_[0]{server_port} == 80
379 ? $_[0]{server_name}
380 : "$_[0]{server_name}:$_[0]{server_port}";
297} 381}
298 382
299sub respond { 383sub respond {
300 my $self = shift; 384 my $self = shift;
301 my $path = $self->{path}; 385 my $path = $self->{path};
302 386
303 stat $path 387 stat $path
304 or $self->err(404, "not found"); 388 or $self->err(404, "not found");
389
390 $self->{stat} = [stat _];
305 391
306 # idiotic netscape sends idiotic headers AGAIN 392 # idiotic netscape sends idiotic headers AGAIN
307 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/ 393 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
308 ? str2time $1 : 0; 394 ? str2time $1 : 0;
309 395
310 if (-d _ && -r _) { 396 if (-d _ && -r _) {
311 # directory 397 # directory
312 if ($path !~ /\/$/) { 398 if ($path !~ /\/$/) {
313 # create a redirect to get the trailing "/" 399 # create a redirect to get the trailing "/"
314 my $host = $self->server_hostport; 400 # we don't try to avoid the :80
315 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" }); 401 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
316 } else { 402 } else {
317 $ims < (stat _)[9] 403 $ims < $self->{stat}[9]
318 or $self->err(304, "not modified"); 404 or $self->err(304, "not modified");
319 405
320 if ($self->{method} eq "GET") {
321 if (-r "$path/index.html") { 406 if (-r "$path/index.html") {
322 $self->{path} .= "/index.html"; 407 $self->{path} .= "/index.html";
323 $self->handle_file; 408 $self->handle_file;
324 } else { 409 } else {
325 $self->handle_dir; 410 $self->handle_dir;
326 }
327 } 411 }
328 } 412 }
329 } elsif (-f _ && -r _) { 413 } elsif (-f _ && -r _) {
330 -x _ and $self->err(403, "forbidden"); 414 -x _ and $self->err(403, "forbidden");
331 $self->handle_file; 415 $self->handle_file;
… …
334 } 418 }
335} 419}
336 420
337sub handle_dir { 421sub handle_dir {
338 my $self = shift; 422 my $self = shift;
339 $self->_cgi($::INDEXPROG); 423 my $idx = $self->diridx;
424
425 $self->response(200, "ok",
426 {
427 "Content-Type" => "text/html",
428 "Content-Length" => length $idx,
429 },
430 $idx);
340} 431}
341 432
342sub handle_file { 433sub handle_file {
343 my $self = shift; 434 my $self = shift;
344 my $length = -s _; 435 my $length = $self->{stat}[7];
436 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
345 my $hdr = { 437 my $hdr = {
346 "Last-Modified" => time2str ((stat _)[9]), 438 "Last-Modified" => time2str ((stat _)[9]),
347 }; 439 };
348 440
349 my @code = (200, "ok"); 441 my @code = (200, "ok");
… …
357 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 449 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
358 } else { 450 } else {
359 ($l, $h) = (0, $length - 1); 451 ($l, $h) = (0, $length - 1);
360 goto ignore; 452 goto ignore;
361 } 453 }
362 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 454 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
363 } 455 }
364 $hdr->{"Content-Range"} = "bytes */$length"; 456 $hdr->{"Content-Range"} = "bytes */$length";
457 $hdr->{"Content-Length"} = $length;
365 $self->err(416, "not satisfiable", $hdr); 458 $self->err(416, "not satisfiable", $hdr, "");
366 459
367satisfiable: 460satisfiable:
368 # check for segmented downloads 461 # check for segmented downloads
369 if ($l && $NO_SEGMENTED) { 462 if ($l && $::NO_SEGMENTED) {
463 my $delay = $::PER_TIMEOUT + 15;
370 if (%{$uri{$self->{uri}}} > 1) { 464 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
371 $self->slog("segmented download refused\n"); 465 if ($delay <= 0) {
372 $self->err(400, "segmented downloads are not allowed"); 466 $self->err_segmented_download;
467 } else {
468 Coro::Event::do_timer(after => 4); $delay -= 4;
469 }
373 } 470 }
374 } 471 }
375 472
376 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 473 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
377 @code = (206, "partial content"); 474 @code = (206, "partial content");
… …
380ignore: 477ignore:
381 } else { 478 } else {
382 ($l, $h) = (0, $length - 1); 479 ($l, $h) = (0, $length - 1);
383 } 480 }
384 481
385 if ($self->{path} =~ /\.html$/) { 482 $self->{path} =~ /\.([^.]+)$/;
386 $hdr->{"Content-Type"} = "text/html";
387 } else {
388 $hdr->{"Content-Type"} = "application/octet-stream"; 483 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
389 }
390
391 $hdr->{"Content-Length"} = $length; 484 $hdr->{"Content-Length"} = $length;
392 485
393 $self->response(@code, $hdr, ""); 486 $self->response(@code, $hdr, "");
394 487
395 if ($self->{method} eq "GET") { 488 if ($self->{method} eq "GET") {
489 $self->{time} = $::NOW;
490
491 my $fudge = $queue->[0]->waiters;
492 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
493
494 $queue->[1] *= $fudge;
495 my $transfer = $queue->[0]->guard;
496
497 if ($fudge != 1) {
498 $queue->[1] /= $fudge;
499 $queue->[1] = $queue->[1] * $::wait_factor
500 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
501 }
502 $self->{time} = $::NOW;
503
504 $self->{fh}->writable or return;
505
396 my ($fh, $buf); 506 my ($fh, $buf, $r);
507 my $current = $Coro::current;
397 open $fh, "<", $self->{path} 508 open $fh, "<", $self->{path}
398 or die "$self->{path}: late open failure ($!)"; 509 or die "$self->{path}: late open failure ($!)";
399 510
400 if ($l) {
401 sysseek $fh, $l, 0
402 or die "$self->{path}: cannot seek to $l ($!)";
403 }
404
405 $h -= $l - 1; 511 $h -= $l - 1;
406 512
513 if (0) {
514 if ($l) {
515 sysseek $fh, $l, 0;
516 }
517 }
518
407 while ($h > 0) { 519 while ($h > 0) {
520 if (0) {
408 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h; 521 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
522 or last;
523 } else {
524 undef $buf;
525 $aio_requests->down;
526 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
527 $buf, 0, sub {
528 $r = $_[0];
529 $current->ready;
530 });
531 &Coro::schedule;
532 $aio_requests->up;
533 last unless $r;
534 }
409 $self->{fh}->syswrite($buf) 535 my $w = $self->{fh}->syswrite($buf)
410 or last; 536 or last;
537 $::written += $w;
538 $self->{written} += $w;
539 $l += $r;
411 } 540 }
412 }
413 541
414 close $fh; 542 close $fh;
543 }
415} 544}
416 545
4171; 5461;

Diff Legend

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