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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines