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.18 by root, Wed Aug 15 03:13:36 2001 UTC vs.
Revision 1.48 by root, Tue Nov 27 03:38:08 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), 1],
41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE), 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;
… …
76 120
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);
82 126
83our %conn; # $conn{ip}{fh} => connobj 127our %conn; # $conn{ip}{self} => connobj
128our %uri; # $uri{ip}{uri}{self}
84our %blocked; 129our %blocked;
85our %mimetype; 130our %mimetype;
86 131
87sub read_mimetypes { 132sub read_mimetypes {
88 local *M; 133 local *M;
… …
99 144
100read_mimetypes; 145read_mimetypes;
101 146
102sub new { 147sub new {
103 my $class = shift; 148 my $class = shift;
149 my $fh = shift;
104 my $peername = shift; 150 my $peername = shift;
105 my $fh = shift;
106 my $self = bless { fh => $fh }, $class; 151 my $self = bless { fh => $fh }, $class;
107 my (undef, $iaddr) = unpack_sockaddr_in $peername 152 my (undef, $iaddr) = unpack_sockaddr_in $peername
108 or $self->err(500, "unable to decode peername"); 153 or $self->err(500, "unable to decode peername");
109 154
110 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_addr} = inet_ntoa $iaddr;
111 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
112 157
113 # enter ourselves into various lists
114 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
115
116 $::conns++; 158 $::conns++;
117 159
118 $self; 160 $self;
119} 161}
120 162
121sub DESTROY { 163sub DESTROY {
122 my $self = shift; 164 my $self = shift;
123
124 $::conns--; 165 $::conns--;
166 $self->eoconn;
167}
125 168
169# end of connection
170sub eoconn {
171 my $self = shift;
172
173 # clean up hints
126 delete $conn{$self->{remote_addr}}{$self*1}; 174 delete $conn{$self->{remote_id}}{$self*1};
127 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 175 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
176
177 $httpevent->broadcast;
128} 178}
129 179
130sub slog { 180sub slog {
131 my $self = shift; 181 my $self = shift;
132 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
133} 183}
134 184
135sub response { 185sub response {
136 my ($self, $code, $msg, $hdr, $content) = @_; 186 my ($self, $code, $msg, $hdr, $content) = @_;
137 my $res = "HTTP/1.1 $code $msg\015\012"; 187 my $res = "HTTP/1.1 $code $msg\015\012";
138 188
139 #$res .= "Connection: close\015\012"; 189 if (exists $hdr->{Connection}) {
140 $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";
141 204
142 while (my ($h, $v) = each %$hdr) { 205 while (my ($h, $v) = each %$hdr) {
143 $res .= "$h: $v\015\012" 206 $res .= "$h: $v\015\012"
144 } 207 }
145 $res .= "\015\012"; 208 $res .= "\015\012";
146 209
147 $res .= $content if defined $content and $self->{method} ne "HEAD"; 210 $res .= $content if defined $content and $self->{method} ne "HEAD";
148 211
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
149 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;
150 217
151 $self->{written} += 218 $self->{written} +=
152 print {$self->{fh}} $res; 219 print {$self->{fh}} $res;
153} 220}
154 221
155sub err { 222sub err {
156 my $self = shift; 223 my $self = shift;
157 my ($code, $msg, $hdr, $content) = @_; 224 my ($code, $msg, $hdr, $content) = @_;
158 225
159 unless (defined $content) { 226 unless (defined $content) {
160 $content = "$code $msg"; 227 $content = "$code $msg\n";
161 $hdr->{"Content-Type"} = "text/plain"; 228 $hdr->{"Content-Type"} = "text/plain";
162 $hdr->{"Content-Length"} = length $content; 229 $hdr->{"Content-Length"} = length $content;
163 } 230 }
164 $hdr->{"Connection"} = "close"; 231 $hdr->{"Connection"} = "close";
165 232
166 $self->response($code, $msg, $hdr, $content); 233 $self->response($code, $msg, $hdr, $content);
167 234
168 die bless {}, err::; 235 die bless {}, err::;
169} 236}
170 237
171sub err_blocked {
172 my $self = shift;
173 my $ip = $self->{remote_addr};
174 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
175
176 Coro::Event::do_timer(after => 15);
177
178 $self->err(401, "too many connections",
179 {
180 "Content-Type" => "text/html",
181 "Retry-After" => $::BLOCKTIME
182 },
183 <<EOF);
184<html><p>
185You have been blocked because you opened too many connections. You
186may retry at</p>
187
188 <p><blockquote>$time.</blockquote></p>
189
190<p>Until then, each new access will renew the block. You might want to have a
191look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
192</html>
193EOF
194}
195
196sub handle { 238sub handle {
197 my $self = shift; 239 my $self = shift;
198 my $fh = $self->{fh}; 240 my $fh = $self->{fh};
241
242 my $host;
199 243
200 $fh->timeout($::REQ_TIMEOUT); 244 $fh->timeout($::REQ_TIMEOUT);
201 while() { 245 while() {
202 $self->{reqs}++; 246 $self->{reqs}++;
203 247
… …
213 } 257 }
214 258
215 $self->{h} = {}; 259 $self->{h} = {};
216 260
217 $fh->timeout($::RES_TIMEOUT); 261 $fh->timeout($::RES_TIMEOUT);
218 my $ip = $self->{remote_addr};
219
220 if ($blocked{$ip}) {
221 $self->err_blocked($blocked{$ip})
222 if $blocked{$ip} > $::NOW;
223
224 delete $blocked{$ip};
225 }
226
227 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
228 $self->slog(2, "blocked ip $ip");
229 $self->err_blocked;
230 }
231 262
232 $req =~ /^(?:\015\012)? 263 $req =~ /^(?:\015\012)?
233 (GET|HEAD) \040+ 264 (GET|HEAD) \040+
234 ([^\040]+) \040+ 265 ([^\040]+) \040+
235 HTTP\/([0-9]+\.[0-9]+) 266 HTTP\/([0-9]+\.[0-9]+)
… …
238 269
239 $self->{method} = $1; 270 $self->{method} = $1;
240 $self->{uri} = $2; 271 $self->{uri} = $2;
241 $self->{version} = $3; 272 $self->{version} = $3;
242 273
243 $3 eq "1.0" or $3 eq "1.1" 274 $3 =~ /^1\./
244 or $self->err(506, "http protocol version $3 not supported"); 275 or $self->err(506, "http protocol version $3 not supported");
245 276
246 # parse headers 277 # parse headers
247 { 278 {
248 my (%hdr, $h, $v); 279 my (%hdr, $h, $v);
… …
260 291
261 $self->{h}{$h} = substr $v, 1 292 $self->{h}{$h} = substr $v, 1
262 while ($h, $v) = each %hdr; 293 while ($h, $v) = each %hdr;
263 } 294 }
264 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) {
265 $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 }
266 341
342 $self->{server_name} = $host;
343
344 # enter ourselves into various lists
345 weaken ($conn{$id}{$self*1} = $self);
267 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 346 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
268 347
348 eval {
269 $self->map_uri; 349 $self->map_uri;
270 $self->respond; 350 $self->respond;
351 };
271 352
353 $self->eoconn;
354
355 die if $@ && !ref $@;
356
272 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 357 last if $self->{h}{connection} =~ /close/;
273 358
274 $self->slog(9, "persistant connection [".$self->{h}{"user-agent"}."][$self->{reqs}]"); 359 $httpevent->broadcast;
360
275 $fh->timeout($::PER_TIMEOUT); 361 $fh->timeout($::PER_TIMEOUT);
276 } 362 }
277} 363}
278 364
279# uri => path mapping 365# uri => path mapping
280sub map_uri { 366sub map_uri {
281 my $self = shift; 367 my $self = shift;
282 my $host = $self->{h}{host} || "default"; 368 my $host = $self->{server_name};
283 my $uri = $self->{uri}; 369 my $uri = $self->{uri};
284 370
285 # some massaging, also makes it more secure 371 # some massaging, also makes it more secure
286 $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;
287 $uri =~ s%//+%/%g; 373 $uri =~ s%//+%/%g;
… …
297 $self->{path} = "$::DOCROOT/$host$uri"; 383 $self->{path} = "$::DOCROOT/$host$uri";
298 384
299 $self->access_check; 385 $self->access_check;
300} 386}
301 387
302sub server_address {
303 my $self = shift;
304 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
305 or $self->err(500, "unable to get socket name");
306 ((inet_ntoa $iaddr), $port);
307}
308
309sub server_host {
310 my $self = shift;
311 if (exists $self->{h}{host}) {
312 return $self->{h}{host};
313 } else {
314 return (($self->server_address)[0]);
315 }
316}
317
318sub server_hostport {
319 my $self = shift;
320 my ($host, $port);
321 if (exists $self->{h}{host}) {
322 ($host, $port) = ($self->{h}{host}, $self->{server_port});
323 } else {
324 ($host, $port) = $self->server_address;
325 }
326 $port = $port == 80 ? "" : ":$port";
327 $host.$port;
328}
329
330sub _cgi { 388sub _cgi {
331 my $self = shift; 389 my $self = shift;
332 my $path = shift; 390 my $path = shift;
333 my $fh; 391 my $fh;
334 392
335 # no two-way xxx supported 393 # no two-way xxx supported
336 if (0 == fork) { 394 if (0 == fork) {
337 open STDOUT, ">&".fileno($self->{fh}); 395 open STDOUT, ">&".fileno($self->{fh});
338 if (chdir $::DOCROOT) { 396 if (chdir $::DOCROOT) {
339 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 397 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
340 $ENV{HTTP_HOST} = $self->server_host; 398 $ENV{HTTP_HOST} = $self->{server_name};
341 $ENV{HTTP_PORT} = $self->{server_host}; 399 $ENV{HTTP_PORT} = $self->{server_port};
342 $ENV{SCRIPT_NAME} = $self->{name}; 400 $ENV{SCRIPT_NAME} = $self->{name};
343 exec $path; 401 exec $path;
344 } 402 }
345 Coro::State::_exit(0); 403 Coro::State::_exit(0);
346 } else { 404 } else {
405 die;
347 } 406 }
407}
408
409sub server_hostport {
410 $_[0]{server_port} == 80
411 ? $_[0]{server_name}
412 : "$_[0]{server_name}:$_[0]{server_port}";
348} 413}
349 414
350sub respond { 415sub respond {
351 my $self = shift; 416 my $self = shift;
352 my $path = $self->{path}; 417 my $path = $self->{path};
… …
362 427
363 if (-d _ && -r _) { 428 if (-d _ && -r _) {
364 # directory 429 # directory
365 if ($path !~ /\/$/) { 430 if ($path !~ /\/$/) {
366 # create a redirect to get the trailing "/" 431 # create a redirect to get the trailing "/"
367 my $host = $self->server_hostport; 432 # we don't try to avoid the :80
368 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" }); 433 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
369 } else { 434 } else {
370 $ims < $self->{stat}[9] 435 $ims < $self->{stat}[9]
371 or $self->err(304, "not modified"); 436 or $self->err(304, "not modified");
372 437
373 if ($self->{method} eq "GET") {
374 if (-r "$path/index.html") { 438 if (-r "$path/index.html") {
375 $self->{path} .= "/index.html"; 439 # replace directory "size" by index.html filesize
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
376 $self->handle_file; 441 $self->handle_file;
377 } else { 442 } else {
378 $self->handle_dir; 443 $self->handle_dir;
379 }
380 } 444 }
381 } 445 }
382 } elsif (-f _ && -r _) { 446 } elsif (-f _ && -r _) {
383 -x _ and $self->err(403, "forbidden"); 447 -x _ and $self->err(403, "forbidden");
384 $self->handle_file; 448 $self->handle_file;
… …
393 457
394 $self->response(200, "ok", 458 $self->response(200, "ok",
395 { 459 {
396 "Content-Type" => "text/html", 460 "Content-Type" => "text/html",
397 "Content-Length" => length $idx, 461 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]),
398 }, 463 },
399 $idx); 464 $idx);
400} 465}
401 466
402sub handle_file { 467sub handle_file {
403 my $self = shift; 468 my $self = shift;
404 my $length = -s _; 469 my $length = $self->{stat}[7];
470 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
405 my $hdr = { 471 my $hdr = {
406 "Last-Modified" => time2str ((stat _)[9]), 472 "Last-Modified" => time2str ((stat _)[9]),
407 }; 473 };
408 474
409 my @code = (200, "ok"); 475 my @code = (200, "ok");
… …
417 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 483 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
418 } else { 484 } else {
419 ($l, $h) = (0, $length - 1); 485 ($l, $h) = (0, $length - 1);
420 goto ignore; 486 goto ignore;
421 } 487 }
422 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 488 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
423 } 489 }
424 $hdr->{"Content-Range"} = "bytes */$length"; 490 $hdr->{"Content-Range"} = "bytes */$length";
491 $hdr->{"Content-Length"} = $length;
425 $self->err(416, "not satisfiable", $hdr); 492 $self->err(416, "not satisfiable", $hdr, "");
426 493
427satisfiable: 494satisfiable:
428 # check for segmented downloads 495 # check for segmented downloads
429 if ($l && $::NO_SEGMENTED) { 496 if ($l && $::NO_SEGMENTED) {
497 my $delay = $::NOW + $::PER_TIMEOUT + 15;
430 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
431 Coro::Event::do_timer(after => 15); 499 if ($delay <= $::NOW) {
432 500 $self->err_segmented_download;
433 $self->err(400, "segmented downloads are not allowed"); 501 } else {
502 $httpevent->wait;
503 }
434 } 504 }
435 } 505 }
436 506
437 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 507 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
438 @code = (206, "partial content"); 508 @code = (206, "partial content");
… …
448 $hdr->{"Content-Length"} = $length; 518 $hdr->{"Content-Length"} = $length;
449 519
450 $self->response(@code, $hdr, ""); 520 $self->response(@code, $hdr, "");
451 521
452 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
453 my ($fh, $buf, $r); 530 my ($fh, $buf, $r);
454 my $current = $Coro::current; 531 my $current = $Coro::current;
455 open $fh, "<", $self->{path} 532 open $fh, "<", $self->{path}
456 or die "$self->{path}: late open failure ($!)"; 533 or die "$self->{path}: late open failure ($!)";
457 534
458 $h -= $l - 1; 535 $h -= $l - 1;
459 536
537 if (0) {
538 if ($l) {
539 sysseek $fh, $l, 0;
540 }
541 }
542
543 my $transfer; # transfer guard
544 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
545
460 while ($h > 0) { 546 while ($h > 0) {
461 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 547 unless ($transfer) {
548 if ($transfer ||= $queue->[0]->timed_guard($::WAIT_INTERVAL)) {
549 if ($fudge != 1) {
550 $queue->[1] /= $fudge;
551 $queue->[1] = $queue->[1] * $::wait_factor
552 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
553 }
554 $bufsize = $::BUFSIZE;
555 $self->{time} = $::NOW;
556 }
557 }
558
559 if (0) {
560 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
561 or last;
562 } else {
563 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
462 $buf, 0, sub { 564 $buf, 0, sub {
463 $r = $_[0]; 565 $r = $_[0];
464 $current->ready; 566 Coro::ready($current);
465 }); 567 });
466 &Coro::schedule; 568 &Coro::schedule;
467 last unless $r; 569 last unless $r;
468 my $w = $self->{fh}->syswrite($buf) 570 }
571 my $w = syswrite $self->{fh}, $buf
469 or last; 572 or last;
470 $::written += $w; 573 $::written += $w;
471 $self->{written} += $w; 574 $self->{written} += $w;
472 $l += $r; 575 $l += $r;
473 } 576 }
474 }
475 577
476 close $fh; 578 close $fh;
579 }
477} 580}
478 581
4791; 5821;

Diff Legend

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