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

Diff Legend

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