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

Diff Legend

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