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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines