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

Diff Legend

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