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.56 by root, Mon Dec 3 04:57:22 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
… …
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 $MAX_TRANSFERS;
56our $queue_index = new transferqueue 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;
121 $self->{time} = $::NOW; 166 $self->{time} = $::NOW;
122 167
123 # enter ourselves into various lists 168 weaken ($Coro::current->{conn} = $self);
124 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
125 169
126 $::conns++; 170 $::conns++;
171 $::maxconns = $::conns if $::conns > $::maxconns;
127 172
128 $self; 173 $self;
129} 174}
130 175
131sub DESTROY { 176sub DESTROY {
132 my $self = shift; 177 #my $self = shift;
133
134 $::conns--; 178 $::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} 179}
145 180
146sub slog { 181sub slog {
147 my $self = shift; 182 my $self = shift;
148 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 183 main::slog($_[0], "$self->{remote_id}> $_[1]");
149} 184}
150 185
151sub response { 186sub response {
152 my ($self, $code, $msg, $hdr, $content) = @_; 187 my ($self, $code, $msg, $hdr, $content) = @_;
153 my $res = "HTTP/1.1 $code $msg\015\012"; 188 my $res = "HTTP/1.1 $code $msg\015\012";
154 189
155 #$res .= "Connection: close\015\012"; 190 if (exists $hdr->{Connection}) {
156 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 191 if ($hdr->{Connection} =~ /close/) {
192 $self->{h}{connection} = "close"
193 }
194 } else {
195 if ($self->{version} < 1.1) {
196 if ($self->{h}{connection} =~ /keep-alive/i) {
197 $hdr->{Connection} = "Keep-Alive";
198 } else {
199 $self->{h}{connection} = "close"
200 }
201 }
202 }
203
204 $res .= "Date: $HTTP_NOW\015\012";
157 205
158 while (my ($h, $v) = each %$hdr) { 206 while (my ($h, $v) = each %$hdr) {
159 $res .= "$h: $v\015\012" 207 $res .= "$h: $v\015\012"
160 } 208 }
161 $res .= "\015\012"; 209 $res .= "\015\012";
162 210
163 $res .= $content if defined $content and $self->{method} ne "HEAD"; 211 $res .= $content if defined $content and $self->{method} ne "HEAD";
164 212
165 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 213 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
214 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
215 " \"$self->{h}{referer}\"\n";
166 216
167 print $accesslog $log if $accesslog; 217 print $accesslog $log if $accesslog;
168 print STDERR $log; 218 print STDERR $log;
169 219
170 $self->{written} += 220 $self->{written} +=
… …
174sub err { 224sub err {
175 my $self = shift; 225 my $self = shift;
176 my ($code, $msg, $hdr, $content) = @_; 226 my ($code, $msg, $hdr, $content) = @_;
177 227
178 unless (defined $content) { 228 unless (defined $content) {
179 $content = "$code $msg"; 229 $content = "$code $msg\n";
180 $hdr->{"Content-Type"} = "text/plain"; 230 $hdr->{"Content-Type"} = "text/plain";
181 $hdr->{"Content-Length"} = length $content; 231 $hdr->{"Content-Length"} = length $content;
182 } 232 }
183 $hdr->{"Connection"} = "close"; 233 $hdr->{"Connection"} = "close";
184 234
185 $self->response($code, $msg, $hdr, $content); 235 $self->response($code, $msg, $hdr, $content);
186 236
187 die bless {}, err::; 237 die bless {}, err::;
188} 238}
189 239
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 { 240sub handle {
224 my $self = shift; 241 my $self = shift;
225 my $fh = $self->{fh}; 242 my $fh = $self->{fh};
243
244 my $host;
226 245
227 $fh->timeout($::REQ_TIMEOUT); 246 $fh->timeout($::REQ_TIMEOUT);
228 while() { 247 while() {
229 $self->{reqs}++; 248 $self->{reqs}++;
230 249
… …
240 } 259 }
241 260
242 $self->{h} = {}; 261 $self->{h} = {};
243 262
244 $fh->timeout($::RES_TIMEOUT); 263 $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 264
259 $req =~ /^(?:\015\012)? 265 $req =~ /^(?:\015\012)?
260 (GET|HEAD) \040+ 266 (GET|HEAD) \040+
261 ([^\040]+) \040+ 267 ([^\040]+) \040+
262 HTTP\/([0-9]+\.[0-9]+) 268 HTTP\/([0-9]+\.[0-9]+)
… …
287 293
288 $self->{h}{$h} = substr $v, 1 294 $self->{h}{$h} = substr $v, 1
289 while ($h, $v) = each %hdr; 295 while ($h, $v) = each %hdr;
290 } 296 }
291 297
298 # remote id should be unique per user
299 my $id = $self->{remote_addr};
300
301 if (exists $self->{h}{"client-ip"}) {
302 $id .= "[".$self->{h}{"client-ip"}."]";
303 } elsif (exists $self->{h}{"x-forwarded-for"}) {
304 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
305 }
306
307 $self->{remote_id} = $id;
308
309 weaken (local $conn{$id}{$self*1} = $self);
310
311 if ($blocked{$id}) {
312 $self->err_blocked
313 if $blocked{$id}[0] > $::NOW;
314
315 delete $blocked{$id};
316 }
317
318 # find out server name and port
319 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
320 $host = $1;
321 } else {
322 $host = $self->{h}{host};
323 }
324
325 if (defined $host) {
292 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 326 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
327 } else {
328 ($self->{server_port}, $host)
329 = unpack_sockaddr_in $self->{fh}->sockname
330 or $self->err(500, "unable to get socket name");
331 $host = inet_ntoa $host;
332 }
293 333
334 $self->{server_name} = $host;
335
294 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 336 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
295 337
296 eval { 338 eval {
297 $self->map_uri; 339 $self->map_uri;
298 $self->respond; 340 $self->respond;
299 }; 341 };
300 342
301 $self->eoconn;
302
303 die if $@ && !ref $@; 343 die if $@ && !ref $@;
304 344
305 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 345 last if $self->{h}{connection} =~ /close/i;
306 346
307 $self->slog(9, "persistent connection [".$self->{h}{"user-agent"}."][$self->{reqs}]"); 347 $httpevent->broadcast;
348
308 $fh->timeout($::PER_TIMEOUT); 349 $fh->timeout($::PER_TIMEOUT);
309 } 350 }
351}
352
353sub block {
354 my $self = shift;
355
356 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
357 $self->slog(2, "blocked ip $self->{remote_id}");
358 $self->err_blocked;
310} 359}
311 360
312# uri => path mapping 361# uri => path mapping
313sub map_uri { 362sub map_uri {
314 my $self = shift; 363 my $self = shift;
315 my $host = $self->{h}{host} || "default"; 364 my $host = $self->{server_name};
316 my $uri = $self->{uri}; 365 my $uri = $self->{uri};
317 366
318 # some massaging, also makes it more secure 367 # some massaging, also makes it more secure
319 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 368 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
320 $uri =~ s%//+%/%g; 369 $uri =~ s%//+%/%g;
… …
330 $self->{path} = "$::DOCROOT/$host$uri"; 379 $self->{path} = "$::DOCROOT/$host$uri";
331 380
332 $self->access_check; 381 $self->access_check;
333} 382}
334 383
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 { 384sub _cgi {
364 my $self = shift; 385 my $self = shift;
365 my $path = shift; 386 my $path = shift;
366 my $fh; 387 my $fh;
367 388
368 # no two-way xxx supported 389 # no two-way xxx supported
369 if (0 == fork) { 390 if (0 == fork) {
370 open STDOUT, ">&".fileno($self->{fh}); 391 open STDOUT, ">&".fileno($self->{fh});
371 if (chdir $::DOCROOT) { 392 if (chdir $::DOCROOT) {
372 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 393 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
373 $ENV{HTTP_HOST} = $self->server_host; 394 $ENV{HTTP_HOST} = $self->{server_name};
374 $ENV{HTTP_PORT} = $self->{server_host}; 395 $ENV{HTTP_PORT} = $self->{server_port};
375 $ENV{SCRIPT_NAME} = $self->{name}; 396 $ENV{SCRIPT_NAME} = $self->{name};
376 exec $path; 397 exec $path;
377 } 398 }
378 Coro::State::_exit(0); 399 Coro::State::_exit(0);
379 } else { 400 } else {
401 die;
380 } 402 }
403}
404
405sub server_hostport {
406 $_[0]{server_port} == 80
407 ? $_[0]{server_name}
408 : "$_[0]{server_name}:$_[0]{server_port}";
381} 409}
382 410
383sub respond { 411sub respond {
384 my $self = shift; 412 my $self = shift;
385 my $path = $self->{path}; 413 my $path = $self->{path};
386 414
387 stat $path 415 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
388 or $self->err(404, "not found"); 416 if ($::internal{$1}) {
389 417 $::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 { 418 } else {
403 $ims < $self->{stat}[9] 419 $self->err(404, "not found");
420 }
421 } else {
422
423 stat $path
404 or $self->err(304, "not modified"); 424 or $self->err(404, "not found");
405 425
406 if (-r "$path/index.html") { 426 $self->{stat} = [stat _];
407 $self->{path} .= "/index.html"; 427
408 $self->handle_file; 428 # idiotic netscape sends idiotic headers AGAIN
429 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
430 ? str2time $1 : 0;
431
432 if (-d _ && -r _) {
433 # directory
434 if ($path !~ /\/$/) {
435 # create a redirect to get the trailing "/"
436 # we don't try to avoid the :80
437 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
409 } else { 438 } else {
439 $ims < $self->{stat}[9]
440 or $self->err(304, "not modified");
441
442 if (-r "$path/index.html") {
443 # replace directory "size" by index.html filesize
444 $self->{stat} = [stat ($self->{path} .= "/index.html")];
445 $self->handle_file($queue_index);
446 } else {
410 $self->handle_dir; 447 $self->handle_dir;
411 } 448 }
412 } 449 }
413 } elsif (-f _ && -r _) { 450 } elsif (-f _ && -r _) {
414 -x _ and $self->err(403, "forbidden"); 451 -x _ and $self->err(403, "forbidden");
452
453 if (%{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
454 my $timeout = $::NOW + 10;
455 while (%{$conn{$self->{remote_id}}} >= $::MAX_TRANSFERS_IP) {
456 if ($timeout < $::NOW) {
457 $self->block($::BLOCKTIME, "too many connections");
458 } else {
459 $httpevent->wait;
460 }
461 }
462 }
463
415 $self->handle_file; 464 $self->handle_file($queue_file);
416 } else { 465 } else {
417 $self->err(404, "not found"); 466 $self->err(404, "not found");
467 }
418 } 468 }
419} 469}
420 470
421sub handle_dir { 471sub handle_dir {
422 my $self = shift; 472 my $self = shift;
… …
424 474
425 $self->response(200, "ok", 475 $self->response(200, "ok",
426 { 476 {
427 "Content-Type" => "text/html", 477 "Content-Type" => "text/html",
428 "Content-Length" => length $idx, 478 "Content-Length" => length $idx,
479 "Last-Modified" => time2str ($self->{stat}[9]),
429 }, 480 },
430 $idx); 481 $idx);
431} 482}
432 483
433sub handle_file { 484sub handle_file {
434 my $self = shift; 485 my ($self, $queue) = @_;
435 my $length = -s _; 486 my $length = $self->{stat}[7];
436 my $hdr = { 487 my $hdr = {
437 "Last-Modified" => time2str ((stat _)[9]), 488 "Last-Modified" => time2str ((stat _)[9]),
438 }; 489 };
439 490
440 my @code = (200, "ok"); 491 my @code = (200, "ok");
… …
452 } 503 }
453 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 504 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
454 } 505 }
455 $hdr->{"Content-Range"} = "bytes */$length"; 506 $hdr->{"Content-Range"} = "bytes */$length";
456 $hdr->{"Content-Length"} = $length; 507 $hdr->{"Content-Length"} = $length;
457 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
458 $self->err(416, "not satisfiable", $hdr, ""); 508 $self->err(416, "not satisfiable", $hdr, "");
459 509
460satisfiable: 510satisfiable:
461 # check for segmented downloads 511 # check for segmented downloads
462 if ($l && $::NO_SEGMENTED) { 512 if ($l && $::NO_SEGMENTED) {
513 my $timeout = $::NOW + 15;
463 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 514 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
464 $self->err(400, "segmented downloads are not allowed"); 515 if ($timeout <= $::NOW) {
516 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
517 #$self->err_segmented_download;
518 } else {
519 $httpevent->wait;
520 }
465 } 521 }
466 } 522 }
467 523
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 524 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
469 @code = (206, "partial content"); 525 @code = (206, "partial content");
… …
479 $hdr->{"Content-Length"} = $length; 535 $hdr->{"Content-Length"} = $length;
480 536
481 $self->response(@code, $hdr, ""); 537 $self->response(@code, $hdr, "");
482 538
483 if ($self->{method} eq "GET") { 539 if ($self->{method} eq "GET") {
540 $self->{time} = $::NOW;
541
542 my $current = $Coro::current;
543
484 my ($fh, $buf, $r); 544 my ($fh, $buf, $r);
485 my $current = $Coro::current; 545
486 open $fh, "<", $self->{path} 546 open $fh, "<", $self->{path}
487 or die "$self->{path}: late open failure ($!)"; 547 or die "$self->{path}: late open failure ($!)";
488 548
489 $h -= $l - 1; 549 $h -= $l - 1;
490 550
491 if (0) { 551 if (0) { # !AIO
492 if ($l) { 552 if ($l) {
493 sysseek $fh, $l, 0; 553 sysseek $fh, $l, 0;
494 } 554 }
495 } 555 }
556
557 my $transfer = $queue->start_transfer($h);
558 my $locked;
559 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
496 560
497 while ($h > 0) { 561 while ($h > 0) {
562 unless ($locked) {
563 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
564 $bufsize = $::BUFSIZE;
565 $self->{time} = $::NOW;
566 }
567 }
568
569 if ($blocked{$self->{remote_id}}) {
570 $self->{h}{connection} = "close";
571 die bless {}, err::
572 }
573
498 if (0) { 574 if (0) { # !AIO
499 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 575 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
500 or last; 576 or last;
501 } else { 577 } else {
502 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 578 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
503 $buf, 0, sub { 579 $buf, 0, sub {
504 $r = $_[0]; 580 $r = $_[0];
505 $current->ready; 581 Coro::ready($current);
506 }); 582 });
507 &Coro::schedule; 583 &Coro::schedule;
508 last unless $r; 584 last unless $r;
509 } 585 }
510 my $w = $self->{fh}->syswrite($buf) 586 my $w = syswrite $self->{fh}, $buf
511 or last; 587 or last;
512 $::written += $w; 588 $::written += $w;
513 $self->{written} += $w; 589 $self->{written} += $w;
514 $l += $r; 590 $l += $r;
515 } 591 }
516 }
517 592
518 close $fh; 593 close $fh;
594 }
519} 595}
520 596
5211; 5971;

Diff Legend

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