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

Diff Legend

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