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.62 by root, Sun Jan 6 05:29:39 2002 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC

1use AnyEvent ();
2
1use Coro; 3use Coro;
2use Coro::Semaphore; 4use Coro::Semaphore;
5use Coro::SemaphoreSet;
3use Coro::Event; 6use Coro::EV;
4use Coro::Socket; 7use Coro::Socket;
5use Coro::Signal; 8use Coro::Signal;
9use Coro::AIO ();
6 10
11use Fcntl;
7use HTTP::Date; 12use HTTP::Date;
8use POSIX (); 13use POSIX ();
9 14
10no utf8; 15use Compress::Zlib ();
11use bytes; 16
17use common::sense;
12 18
13# at least on my machine, this thingy serves files 19# at least on my machine, this thingy serves files
14# quite a bit faster than apache, ;) 20# quite a bit faster than apache, ;)
15# and quite a bit slower than thttpd :( 21# and quite a bit slower than thttpd :(
16 22
17$SIG{PIPE} = 'IGNORE'; 23$SIG{PIPE} = 'IGNORE';
18 24
19our $accesslog; 25our $accesslog;
20our $errorlog; 26our $errorlog;
27our @listen_sockets;
21 28
22our $NOW; 29our $NOW;
23our $HTTP_NOW; 30our $HTTP_NOW;
24 31
25Event->timer(interval => 1, hard => 1, cb => sub { 32our $ERROR_LOG;
33our $ACCESS_LOG;
34our $TRANSFER_LOCK = new Coro::SemaphoreSet; # lock to be acquired per ip
35
36our $update_time = EV::periodic 0, 1, undef, sub {
26 $NOW = time; 37 $NOW = time;
27 $HTTP_NOW = time2str $NOW; 38 $HTTP_NOW = time2str $NOW;
28})->now; 39};
40$update_time->invoke;
29 41
30if ($ERROR_LOG) { 42if ($ERROR_LOG) {
31 use IO::Handle; 43 use IO::Handle;
32 open $errorlog, ">>$ERROR_LOG" 44 open $errorlog, ">>$ERROR_LOG"
33 or die "$ERROR_LOG: $!"; 45 or die "$ERROR_LOG: $!";
42} 54}
43 55
44sub slog { 56sub slog {
45 my $level = shift; 57 my $level = shift;
46 my $format = shift; 58 my $format = shift;
59
60 $format = sprintf $format, @_ if @_;
61
47 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW); 62 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
48 printf "$NOW: $format\n", @_; 63 print "$NOW: $format\n";
49 printf $errorlog "$NOW: $format\n", @_ if $errorlog; 64 print $errorlog "$NOW: $format\n", @_ if $errorlog;
50} 65}
51 66
52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 67our $connections = new Coro::Semaphore $::MAX_CONNECTS || 250;
53our $httpevent = new Coro::Signal; 68our $httpevent = new Coro::Signal;
54 69
55our $queue_file = new transferqueue slots => $MAX_TRANSFERS, maxsize => 250_000_000; 70our $queue_file = new transferqueue $::MAX_TRANSFERS;
56our $queue_index = new transferqueue slots => 10; 71our $queue_index = new transferqueue 10;
57 72
58our $requests; 73our $tbf_top = new tbf rate => $::TBF_RATE || 100000;
59 74
60my @newcons; 75my $unused_bytes = 0;
61my @pool; 76my $unused_last = time;
62 77
63# one "execution thread" 78sub unused_bandwidth {
64sub handler { 79 $unused_bytes += $_[0];
65 while () { 80 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
66 if (@newcons) { 81 $unused_last = $NOW;
67 eval { 82 $unused_bytes = 0;
68 conn->new(@{pop @newcons})->handle; 83 $queue_file->force_wake_next
69 }; 84 and slog 1, "forced filetransfer due to unused bandwidth";
70 slog 1, "$@" if $@ && !ref $@;
71
72 $httpevent->broadcast; # only for testing, but doesn't matter much
73
74 $connections->up;
75 } else {
76 last if @pool >= $MAX_POOL;
77 push @pool, $Coro::current;
78 schedule;
79 }
80 } 85 }
81} 86}
82 87
83sub listen_on { 88sub listen_on {
84 my $listen = $_[0]; 89 my $listen = $_[0];
88 # the "main thread" 93 # the "main thread"
89 async { 94 async {
90 slog 1, "accepting connections"; 95 slog 1, "accepting connections";
91 while () { 96 while () {
92 $connections->down; 97 $connections->down;
93 push @newcons, [$listen->accept]; 98 my @conn = $listen->accept;
94 #slog 3, "accepted @$connections ".scalar(@pool); 99 #slog 3, "accepted @$connections ".scalar(@pool);
95 if (@pool) { 100
96 (pop @pool)->ready; 101 async_pool {
97 } else { 102 eval {
98 async \&handler; 103 conn->new (@conn)->handle;
99 } 104 };
105 slog 1, "$@" if $@ && !ref $@;
100 106
107 $httpevent->broadcast; # only for testing, but doesn't matter much
108
109 $connections->up;
110 }
101 } 111 }
102 }; 112 };
103} 113}
104 114
105my $http_port = new Coro::Socket 115my $http_port = new Coro::Socket
106 LocalAddr => $SERVER_HOST, 116 LocalAddr => $::SERVER_HOST,
107 LocalPort => $SERVER_PORT, 117 LocalPort => $::SERVER_PORT,
108 ReuseAddr => 1, 118 ReuseAddr => 1,
109 Listen => 50, 119 Listen => 50,
110 or die "unable to start server"; 120 or die "unable to start server";
111 121
112listen_on $http_port; 122listen_on $http_port;
113 123
114if ($SERVER_PORT2) { 124if ($::SERVER_PORT2) {
115 my $http_port = new Coro::Socket 125 my $http_port = new Coro::Socket
116 LocalAddr => $SERVER_HOST, 126 LocalAddr => $::SERVER_HOST,
117 LocalPort => $SERVER_PORT2, 127 LocalPort => $::SERVER_PORT2,
118 ReuseAddr => 1, 128 ReuseAddr => 1,
119 Listen => 50, 129 Listen => 50,
120 or die "unable to start server"; 130 or die "unable to start server";
121 131
122 listen_on $http_port; 132 listen_on $http_port;
123} 133}
124 134
125package conn; 135package conn;
136
137use common::sense;
126 138
127use Socket; 139use Socket;
128use HTTP::Date; 140use HTTP::Date;
129use Convert::Scalar 'weaken'; 141use Convert::Scalar 'weaken';
130use Linux::AIO; 142use IO::AIO;
143use AnyEvent::AIO;
131 144
132Linux::AIO::min_parallel $::AIO_PARALLEL; 145IO::AIO::min_parallel $::AIO_PARALLEL;
133
134Event->io(fd => Linux::AIO::poll_fileno,
135 poll => 'r', async => 1,
136 cb => \&Linux::AIO::poll_cb);
137 146
138our %conn; # $conn{ip}{self} => connobj 147our %conn; # $conn{ip}{self} => connobj
139our %uri; # $uri{ip}{uri}{self} 148our %uri; # $uri{ip}{uri}{self}
140our %blocked; 149our %blocked;
141our %mimetype; 150our %mimetype;
142 151
143sub read_mimetypes { 152sub read_mimetypes {
144 local *M;
145 if (open M, "<mime_types") { 153 if (open my $fh, "<mime_types") {
146 while (<M>) { 154 while (<$fh>) {
147 if (/^([^#]\S+)\t+(\S+)$/) { 155 if (/^([^#]\S+)\t+(\S+)$/) {
148 $mimetype{lc $1} = $2; 156 $mimetype{lc $1} = $2;
149 } 157 }
150 } 158 }
151 } else { 159 } else {
159 my $class = shift; 167 my $class = shift;
160 my $fh = shift; 168 my $fh = shift;
161 my $peername = shift; 169 my $peername = shift;
162 my $self = bless { fh => $fh }, $class; 170 my $self = bless { fh => $fh }, $class;
163 my (undef, $iaddr) = unpack_sockaddr_in $peername 171 my (undef, $iaddr) = unpack_sockaddr_in $peername
164 or $self->err(500, "unable to decode peername"); 172 or $self->err (500, "unable to decode peername");
165 173
166 $self->{remote_addr} = 174 $self->{remote_addr} =
167 $self->{remote_id} = inet_ntoa $iaddr; 175 $self->{remote_id} = inet_ntoa $iaddr;
168 176
169 $self->{time} = $::NOW; 177 $self->{time} = $::NOW;
170 178
171 weaken ($Coro::current->{conn} = $self); 179 weaken ($Coro::current->{conn} = $self);
172 180
173 $::conns++; 181 ++$::conns;
174 $::maxconns = $::conns if $::conns > $::maxconns; 182 $::maxconns = $::conns if $::conns > $::maxconns;
175 183
176 $self; 184 $self
177} 185}
178 186
179sub DESTROY { 187sub DESTROY {
180 #my $self = shift; 188 my $self = shift;
189
181 $::conns--; 190 --$::conns;
182} 191}
192
193sub prune_cache {
194 my $hash = $_[0];
195
196 for (keys %$hash) {
197 if (ref $hash->{$_} eq HASH::) {
198 prune_cache($hash->{$_});
199 unless (scalar keys %{$hash->{$_}}) {
200 delete $hash->{$_};
201 }
202 }
203 }
204}
205
206sub prune_caches {
207 prune_cache \%conn;
208 prune_cache \%uri;
209
210 for (keys %blocked) {
211 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
212 }
213}
214
215our $PRUNE_WATCHER = AE::timer 60, 60, \&prune_caches;
183 216
184sub slog { 217sub slog {
185 my $self = shift; 218 my $self = shift;
186 main::slog($_[0], "$self->{remote_id}> $_[1]"); 219 main::slog($_[0], "$self->{remote_id}> $_[1]");
187} 220}
188 221
189sub response { 222sub response {
190 my ($self, $code, $msg, $hdr, $content) = @_; 223 my ($self, $code, $msg, $hdr, $content) = @_;
191 my $res = "HTTP/1.1 $code $msg\015\012"; 224 my $res = "HTTP/1.1 $code $msg\015\012";
225 my $GZ = "";
192 226
193 if (exists $hdr->{Connection}) { 227 if (exists $hdr->{Connection}) {
194 if ($hdr->{Connection} =~ /close/) { 228 if ($hdr->{Connection} =~ /close/) {
195 $self->{h}{connection} = "close" 229 $self->{h}{connection} = "close"
196 } 230 }
202 $self->{h}{connection} = "close" 236 $self->{h}{connection} = "close"
203 } 237 }
204 } 238 }
205 } 239 }
206 240
241 if ($self->{method} ne "HEAD"
242 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
243 && 400 < length $content
244 && $hdr->{"Content-Length"} == length $content
245 && !exists $hdr->{"Content-Encoding"}
246 ) {
247 my $orig = length $content;
248 $hdr->{"Content-Encoding"} = "gzip";
249 $content = Compress::Zlib::memGzip(\$content);
250 $hdr->{"Content-Length"} = length $content;
251 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
252 }
253
207 $res .= "Date: $HTTP_NOW\015\012"; 254 $res .= "Date: $HTTP_NOW\015\012";
255 $res .= "Server: $::NAME\015\012";
208 256
209 while (my ($h, $v) = each %$hdr) { 257 while (my ($h, $v) = each %$hdr) {
210 $res .= "$h: $v\015\012" 258 $res .= "$h: $v\015\012"
211 } 259 }
212 $res .= "\015\012"; 260 $res .= "\015\012";
213 261
214 $res .= $content if defined $content and $self->{method} ne "HEAD"; 262 $res .= $content if defined $content and $self->{method} ne "HEAD";
215 263
216 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW). 264 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
217 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}. 265 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
218 " \"$self->{h}{referer}\"\n"; 266 " \"$self->{h}{referer}\"\n";
219 267
220 print $accesslog $log if $accesslog; 268 print $::accesslog $log if $::accesslog;
221 print STDERR $log; 269 print STDERR $log;
222 270
223 $self->{written} += 271 $tbf_top->request(length $res, 1e6);
224 print {$self->{fh}} $res; 272 $self->{written} += print {$self->{fh}} $res;
225} 273}
226 274
227sub err { 275sub err {
228 my $self = shift; 276 my $self = shift;
229 my ($code, $msg, $hdr, $content) = @_; 277 my ($code, $msg, $hdr, $content) = @_;
233 $hdr->{"Content-Type"} = "text/plain"; 281 $hdr->{"Content-Type"} = "text/plain";
234 $hdr->{"Content-Length"} = length $content; 282 $hdr->{"Content-Length"} = length $content;
235 } 283 }
236 $hdr->{"Connection"} = "close"; 284 $hdr->{"Connection"} = "close";
237 285
238 $self->response($code, $msg, $hdr, $content); 286 $self->response ($code, $msg, $hdr, $content);
239 287
240 die bless {}, err::; 288 die bless {}, err::
241} 289}
242 290
243sub handle { 291sub handle {
244 my $self = shift; 292 my $self = shift;
245 my $fh = $self->{fh}; 293 my $fh = $self->{fh};
246 294
247 my $host; 295 my $host;
248 296
249 $fh->timeout($::REQ_TIMEOUT); 297 $fh->timeout($::REQ_TIMEOUT);
250 while() { 298 while () {
251 $self->{reqs}++; 299 $self->{reqs}++;
252 300
253 # read request and parse first line 301 # read request and parse first line
254 my $req = $fh->readline("\015\012\015\012"); 302 my $req = $fh->readline("\015\012\015\012");
255 303
284 my (%hdr, $h, $v); 332 my (%hdr, $h, $v);
285 333
286 $hdr{lc $1} .= ",$2" 334 $hdr{lc $1} .= ",$2"
287 while $req =~ /\G 335 while $req =~ /\G
288 ([^:\000-\040]+): 336 ([^:\000-\040]+):
289 [\008\040]* 337 [\011\040]*
290 ((?: [^\015\012]+ | \015\012[\008\040] )*) 338 ((?: [^\015\012]+ | \015\012[\011\040] )*)
291 \015\012 339 \015\012
292 /gxc; 340 /gxc;
293 341
294 $req =~ /\G\015\012$/ 342 $req =~ /\G\015\012$/
295 or $self->err(400, "bad request"); 343 or $self->err(400, "bad request");
296 344
297 $self->{h}{$h} = substr $v, 1 345 $self->{h}{$h} = substr $v, 1
298 while ($h, $v) = each %hdr; 346 while ($h, $v) = each %hdr;
299 } 347 }
300
301 $requests++;
302 348
303 # remote id should be unique per user 349 # remote id should be unique per user
304 my $id = $self->{remote_addr}; 350 my $id = $self->{remote_addr};
305 351
306 if (exists $self->{h}{"client-ip"}) { 352 if (exists $self->{h}{"client-ip"}) {
366# uri => path mapping 412# uri => path mapping
367sub map_uri { 413sub map_uri {
368 my $self = shift; 414 my $self = shift;
369 my $host = $self->{server_name}; 415 my $host = $self->{server_name};
370 my $uri = $self->{uri}; 416 my $uri = $self->{uri};
417
418 $host =~ /[\/\\]/
419 and $self->err(400, "bad request");
371 420
372 # some massaging, also makes it more secure 421 # some massaging, also makes it more secure
373 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 422 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
374 $uri =~ s%//+%/%g; 423 $uri =~ s%//+%/%g;
375 $uri =~ s%/\.(?=/|$)%%g; 424 $uri =~ s%/\.(?=/|$)%%g;
419 468
420 if ($self->{name} =~ s%^/internal/([^/]+)%%) { 469 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
421 if ($::internal{$1}) { 470 if ($::internal{$1}) {
422 $::internal{$1}->($self); 471 $::internal{$1}->($self);
423 } else { 472 } else {
424 $self->err(404, "not found"); 473 $self->err (404, "not found");
425 } 474 }
426 } else { 475 } else {
427 476
428 stat $path 477 Coro::AIO::aio_stat $path
429 or $self->err(404, "not found"); 478 and $self->err (404, "not found");
430 479
431 $self->{stat} = [stat _]; 480 $self->{stat} = [stat _];
432 481
433 # idiotic netscape sends idiotic headers AGAIN 482 # idiotic netscape sends idiotic headers AGAIN
434 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/ 483 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
437 if (-d _ && -r _) { 486 if (-d _ && -r _) {
438 # directory 487 # directory
439 if ($path !~ /\/$/) { 488 if ($path !~ /\/$/) {
440 # create a redirect to get the trailing "/" 489 # create a redirect to get the trailing "/"
441 # we don't try to avoid the :80 490 # we don't try to avoid the :80
442 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" }); 491 $self->err (301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
443 } else { 492 } else {
444 $ims < $self->{stat}[9] 493 $ims < $self->{stat}[9]
445 or $self->err(304, "not modified"); 494 or $self->err (304, "not modified");
446 495
447 if (-r "$path/index.html") { 496 if (-r "$path/index.html") {
448 # replace directory "size" by index.html filesize 497 # replace directory "size" by index.html filesize
449 $self->{stat} = [stat ($self->{path} .= "/index.html")]; 498 $self->{stat} = [stat ($self->{path} .= "/index.html")];
450 $self->handle_file($queue_index); 499 $self->handle_file ($queue_index, $tbf_top);
451 } else { 500 } else {
452 $self->handle_dir; 501 $self->handle_dir;
453 } 502 }
454 } 503 }
455 } elsif (-f _ && -r _) { 504 } elsif (-f _ && -r _) {
456 -x _ and $self->err(403, "forbidden"); 505 -x _ and $self->err (403, "forbidden");
457 506
458 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) { 507 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
459 my $timeout = $::NOW + 10; 508 my $timeout = $::NOW + 10;
460 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) { 509 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
461 if ($timeout < $::NOW) { 510 if ($timeout < $::NOW) {
464 $httpevent->wait; 513 $httpevent->wait;
465 } 514 }
466 } 515 }
467 } 516 }
468 517
469 $self->handle_file($queue_file); 518 $self->handle_file ($queue_file, $tbf_top);
470 } else { 519 } else {
471 $self->err(404, "not found"); 520 $self->err (404, "not found");
472 } 521 }
473 } 522 }
474} 523}
475 524
476sub handle_dir { 525sub handle_dir {
477 my $self = shift; 526 my $self = shift;
478 my $idx = $self->diridx; 527 my $idx = $self->diridx;
479 528
480 $self->response(200, "ok", 529 $self->response (200, "ok",
481 { 530 {
482 "Content-Type" => "text/html", 531 "Content-Type" => "text/html; charset=utf-8",
483 "Content-Length" => length $idx, 532 "Content-Length" => length $idx,
484 "Last-Modified" => time2str ($self->{stat}[9]), 533 "Last-Modified" => time2str ($self->{stat}[9]),
485 }, 534 },
486 $idx); 535 $idx);
487} 536}
488 537
489sub handle_file { 538sub handle_file {
490 my ($self, $queue) = @_; 539 my ($self, $queue, $tbf) = @_;
491 my $length = $self->{stat}[7]; 540 my $length = $self->{stat}[7];
492 my $hdr = { 541 my $hdr = {
493 "Last-Modified" => time2str ((stat _)[9]), 542 "Last-Modified" => time2str ((stat _)[9]),
543 "Accept-Ranges" => "bytes",
494 }; 544 };
495 545
496 my @code = (200, "ok"); 546 my @code = (200, "ok");
497 my ($l, $h); 547 my ($l, $h);
498 548
499 if ($self->{h}{range} =~ /^bytes=(.*)$/) { 549 if ($self->{h}{range} =~ /^bytes=(.*)$/i) {
500 for (split /,/, $1) { 550 for (split /,/, $1) {
501 if (/^-(\d+)$/) { 551 if (/^-(\d+)$/) {
502 ($l, $h) = ($length - $1, $length - 1); 552 ($l, $h) = ($length - $1, $length - 1);
503 } elsif (/^(\d+)-(\d*)$/) { 553 } elsif (/^(\d+)-(\d*)$/) {
504 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 554 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
508 } 558 }
509 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 559 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
510 } 560 }
511 $hdr->{"Content-Range"} = "bytes */$length"; 561 $hdr->{"Content-Range"} = "bytes */$length";
512 $hdr->{"Content-Length"} = $length; 562 $hdr->{"Content-Length"} = $length;
513 $self->err(416, "not satisfiable", $hdr, ""); 563 $self->err (416, "not satisfiable", $hdr, "");
514 564
515satisfiable: 565satisfiable:
516 # check for segmented downloads 566 # check for segmented downloads
517 if ($l && $::NO_SEGMENTED) { 567 if ($l && $::NO_SEGMENTED) {
518 my $timeout = $::NOW + 15; 568 my $timeout = $::NOW + 60;
519 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 569 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
520 if ($timeout <= $::NOW) { 570 if ($timeout <= $::NOW) {
521 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
522 #$self->err_segmented_download; 571 $self->err_segmented_download;
523 } else { 572 } else {
524 $httpevent->wait; 573 $httpevent->wait;
525 } 574 }
526 } 575 }
527 } 576 }
537 586
538 $self->{path} =~ /\.([^.]+)$/; 587 $self->{path} =~ /\.([^.]+)$/;
539 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream"; 588 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
540 $hdr->{"Content-Length"} = $length; 589 $hdr->{"Content-Length"} = $length;
541 590
542 $self->response(@code, $hdr, ""); 591 $self->response (@code, $hdr, "");
543 592
544 if ($self->{method} eq "GET") { 593 if ($self->{method} eq "GET") {
545 $self->{time} = $::NOW; 594 $self->{time} = $::NOW;
595 $self->{written} = 0;
546 596
547 my $current = $Coro::current; 597 my $fh = Coro::AIO::aio_open $self->{path}, Fcntl::O_RDONLY, 0
548
549 my ($fh, $buf, $r);
550
551 open $fh, "<", $self->{path}
552 or die "$self->{path}: late open failure ($!)"; 598 or die "$self->{path}: late open failure ($!)";
553 599
554 $h -= $l - 1; 600 $h -= $l - 1;
555 601
556 if (0) { # !AIO
557 if ($l) {
558 sysseek $fh, $l, 0;
559 }
560 }
561
562 my $transfer = $queue->start_transfer($h); 602 my $transfer = $queue->start_transfer ($h);
563 my $locked; 603 my $locked;
564 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 604 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
565 605
566 while ($h > 0) { 606 while ($h > 0) {
607 Coro::cede;
608 my $transfer_lock = $TRANSFER_LOCK->guard ($self->{remote_id});
609
567 unless ($locked) { 610 unless ($locked) {
568 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 611 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) {
569 $bufsize = $::BUFSIZE; 612 $bufsize = $::BUFSIZE;
570 $self->{time} = $::NOW; 613 $self->{time} = $::NOW;
614 $self->{written} = 0;
571 } 615 }
572 } 616 }
573 617
574 if ($blocked{$self->{remote_id}}) { 618 if ($blocked{$self->{remote_id}}) {
575 $self->{h}{connection} = "close"; 619 $self->{h}{connection} = "close";
576 die bless {}, err::; 620 die bless {}, err::;
577 } 621 }
578 622
579 if (0) { # !AIO 623 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
580 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
581 or last; 624 or last;
582 } else { 625
583 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h), 626 # readahead to work around rijk disk issues
584 $buf, 0, sub { 627 IO::AIO::aio_readahead $fh, $l + $bufsize, $bufsize;
585 $r = $_[0]; 628
586 Coro::ready($current); 629 $tbf->request (length $buf);
587 }); 630 my $w = $self->{fh}->syswrite ($buf)
588 &Coro::schedule;
589 last unless $r;
590 }
591 my $w = syswrite $self->{fh}, $buf
592 or last; 631 or last;
593 $::written += $w; 632 $::written += $w;
594 $self->{written} += $w; 633 $self->{written} += $w;
595 $l += $r; 634 $l += $w;
596 } 635 }
597 636
598 close $fh; 637 close $fh;
599 } 638 }
600} 639}
601 640
6021; 6411
642

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines