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

Diff Legend

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