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.57 by root, Mon Dec 3 05:40:09 2001 UTC vs.
Revision 1.92 by root, Tue Mar 9 16:46:23 2010 UTC

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

Diff Legend

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