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

Diff Legend

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