ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.32 by root, Wed Aug 29 01:32:50 2001 UTC vs.
Revision 1.76 by root, Wed Jul 13 13:58:51 2005 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;
5 6
6use HTTP::Date; 7use HTTP::Date;
8use POSIX ();
9
10use Compress::Zlib ();
7 11
8no utf8; 12no utf8;
9use bytes; 13use bytes;
10
11our @wait_time = (0); # used to calculcate avg. waiting time
12 14
13# at least on my machine, this thingy serves files 15# at least on my machine, this thingy serves files
14# quite a bit faster than apache, ;) 16# quite a bit faster than apache, ;)
15# and quite a bit slower than thttpd :( 17# and quite a bit slower than thttpd :(
16 18
17$SIG{PIPE} = 'IGNORE'; 19$SIG{PIPE} = 'IGNORE';
18 20
19our $accesslog; 21our $accesslog;
22our $errorlog;
23
24our $NOW;
25our $HTTP_NOW;
26
27Event->timer(interval => 1, hard => 1, cb => sub {
28 $NOW = time;
29 $HTTP_NOW = time2str $NOW;
30})->now;
31
32if ($ERROR_LOG) {
33 use IO::Handle;
34 open $errorlog, ">>$ERROR_LOG"
35 or die "$ERROR_LOG: $!";
36 $errorlog->autoflush(1);
37}
20 38
21if ($ACCESS_LOG) { 39if ($ACCESS_LOG) {
22 use IO::Handle; 40 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG" 41 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!"; 42 or die "$ACCESS_LOG: $!";
… …
26} 44}
27 45
28sub slog { 46sub slog {
29 my $level = shift; 47 my $level = shift;
30 my $format = shift; 48 my $format = shift;
49 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
31 printf "---: $format\n", @_; 50 printf "$NOW: $format\n", @_;
51 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
32} 52}
33 53
34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $transfers = new Coro::Semaphore $MAX_TRANSFER || 50; 55our $httpevent = new Coro::Signal;
56
57our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10;
59
60our $tbf_top = new tbf rate => $TBF_RATE || 100000;
61
62my $unused_bytes = 0;
63my $unused_last = time;
64
65sub unused_bandwidth {
66 $unused_bytes += $_[0];
67 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
68 $unused_last = $NOW;
69 $unused_bytes = 0;
70 $queue_file->force_wake_next;
71 slog 1, "forced filetransfer due to unused bandwidth";
72 }
73}
36 74
37my @newcons; 75my @newcons;
38my @pool; 76my @pool;
39 77
40# one "execution thread" 78# one "execution thread"
41sub handler { 79sub handler {
42 while () { 80 while () {
43 my $new = pop @newcons;
44 if ($new) { 81 if (@newcons) {
45 eval { 82 eval {
46 conn->new(@$new)->handle; 83 conn->new(@{pop @newcons})->handle;
47 }; 84 };
48 slog 1, "$@" if $@ && !ref $@; 85 slog 1, "$@" if $@ && !ref $@;
86
87 $httpevent->broadcast; # only for testing, but doesn't matter much
88
49 $connections->up; 89 $connections->up;
50 } else { 90 } else {
51 last if @pool >= $MAX_POOL; 91 last if @pool >= $MAX_POOL;
52 push @pool, $Coro::current; 92 push @pool, $Coro::current;
53 schedule; 93 schedule;
54 } 94 }
55 } 95 }
96}
97
98sub listen_on {
99 my $listen = $_[0];
100
101 push @listen_sockets, $listen;
102
103 # the "main thread"
104 async {
105 slog 1, "accepting connections";
106 while () {
107 $connections->down;
108 push @newcons, [$listen->accept];
109 #slog 3, "accepted @$connections ".scalar(@pool);
110 if (@pool) {
111 (pop @pool)->ready;
112 } else {
113 async \&handler;
114 }
115 }
116 };
56} 117}
57 118
58my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
59 LocalAddr => $SERVER_HOST, 120 LocalAddr => $SERVER_HOST,
60 LocalPort => $SERVER_PORT, 121 LocalPort => $SERVER_PORT,
61 ReuseAddr => 1, 122 ReuseAddr => 1,
62 Listen => 50, 123 Listen => 50,
63 or die "unable to start server"; 124 or die "unable to start server";
64 125
65push @listen_sockets, $http_port; 126listen_on $http_port;
66 127
67our $NOW; 128if ($SERVER_PORT2) {
68our $HTTP_NOW; 129 my $http_port = new Coro::Socket
130 LocalAddr => $SERVER_HOST,
131 LocalPort => $SERVER_PORT2,
132 ReuseAddr => 1,
133 Listen => 50,
134 or die "unable to start server";
69 135
70Event->timer(interval => 1, hard => 1, cb => sub { 136 listen_on $http_port;
71 $NOW = time; 137}
72 $HTTP_NOW = time2str $NOW;
73});
74
75# the "main thread"
76async {
77 slog 1, "accepting connections";
78 while () {
79 $connections->down;
80 push @newcons, [$http_port->accept];
81 #slog 3, "accepted @$connections ".scalar(@pool);
82 if (@pool) {
83 (pop @pool)->ready;
84 } else {
85 async \&handler;
86 }
87
88 }
89};
90 138
91package conn; 139package conn;
92 140
93use Socket; 141use Socket;
94use HTTP::Date; 142use HTTP::Date;
95use Convert::Scalar 'weaken'; 143use Convert::Scalar 'weaken';
96use Linux::AIO; 144use Linux::AIO;
97 145
98Linux::AIO::min_parallel $::AIO_PARALLEL; 146Linux::AIO::min_parallel $::AIO_PARALLEL;
99
100my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
101 147
102Event->io(fd => Linux::AIO::poll_fileno, 148Event->io(fd => Linux::AIO::poll_fileno,
103 poll => 'r', async => 1, 149 poll => 'r', async => 1,
104 cb => \&Linux::AIO::poll_cb); 150 cb => \&Linux::AIO::poll_cb);
105 151
… …
123 169
124read_mimetypes; 170read_mimetypes;
125 171
126sub new { 172sub new {
127 my $class = shift; 173 my $class = shift;
174 my $fh = shift;
128 my $peername = shift; 175 my $peername = shift;
129 my $fh = shift;
130 my $self = bless { fh => $fh }, $class; 176 my $self = bless { fh => $fh }, $class;
131 my (undef, $iaddr) = unpack_sockaddr_in $peername 177 my (undef, $iaddr) = unpack_sockaddr_in $peername
132 or $self->err(500, "unable to decode peername"); 178 or $self->err(500, "unable to decode peername");
133 179
180 $self->{remote_addr} =
134 $self->{remote_addr} = inet_ntoa $iaddr; 181 $self->{remote_id} = inet_ntoa $iaddr;
182
135 $self->{time} = $::NOW; 183 $self->{time} = $::NOW;
136 184
137 # enter ourselves into various lists 185 weaken ($Coro::current->{conn} = $self);
138 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
139 186
140 $::conns++; 187 $::conns++;
188 $::maxconns = $::conns if $::conns > $::maxconns;
141 189
142 $self; 190 $self;
143} 191}
144 192
145sub DESTROY { 193sub DESTROY {
146 my $self = shift; 194 #my $self = shift;
147
148 $::conns--; 195 $::conns--;
149
150 $self->eoconn;
151 delete $conn{$self->{remote_addr}}{$self*1};
152} 196}
153 197
154# end of connection 198sub prune_cache {
155sub eoconn { 199 my $hash = $_[0];
156 my $self = shift; 200
157 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 201 for (keys %$hash) {
202 if (ref $hash->{$_} eq HASH::) {
203 prune_cache($hash->{$_});
204 unless (scalar keys %{$hash->{$_}}) {
205 delete $hash->{$_};
206 $d2++;
207 }
208 }
209 }
158} 210}
211
212sub prune_caches {
213 prune_cache \%conn;
214 prune_cache \%uri;
215
216 for (keys %blocked) {
217 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
218 }
219}
220
221Event->timer(interval => 60, cb => \&prune_caches);
159 222
160sub slog { 223sub slog {
161 my $self = shift; 224 my $self = shift;
162 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 225 main::slog($_[0], "$self->{remote_id}> $_[1]");
163} 226}
164 227
165sub response { 228sub response {
166 my ($self, $code, $msg, $hdr, $content) = @_; 229 my ($self, $code, $msg, $hdr, $content) = @_;
167 my $res = "HTTP/1.1 $code $msg\015\012"; 230 my $res = "HTTP/1.1 $code $msg\015\012";
231 my $GZ = "";
168 232
169 $self->{h}{connection} ||= $hdr->{Connection}; 233 if (exists $hdr->{Connection}) {
234 if ($hdr->{Connection} =~ /close/) {
235 $self->{h}{connection} = "close"
236 }
237 } else {
238 if ($self->{version} < 1.1) {
239 if ($self->{h}{connection} =~ /keep-alive/i) {
240 $hdr->{Connection} = "Keep-Alive";
241 } else {
242 $self->{h}{connection} = "close"
243 }
244 }
245 }
246
247 if ($self->{method} ne "HEAD"
248 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
249 && 400 < length $content
250 && $hdr->{"Content-Length"} == length $content
251 && !exists $hdr->{"Content-Encoding"}
252 ) {
253 my $orig = length $content;
254 $hdr->{"Content-Encoding"} = "gzip";
255 $content = Compress::Zlib::memGzip(\$content);
256 $hdr->{"Content-Length"} = length $content;
257 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
258 }
170 259
171 $res .= "Date: $HTTP_NOW\015\012"; 260 $res .= "Date: $HTTP_NOW\015\012";
261 $res .= "Server: $::NAME\015\012";
172 262
173 while (my ($h, $v) = each %$hdr) { 263 while (my ($h, $v) = each %$hdr) {
174 $res .= "$h: $v\015\012" 264 $res .= "$h: $v\015\012"
175 } 265 }
176 $res .= "\015\012"; 266 $res .= "\015\012";
177 267
178 $res .= $content if defined $content and $self->{method} ne "HEAD"; 268 $res .= $content if defined $content and $self->{method} ne "HEAD";
179 269
180 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 270 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
271 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
272 " \"$self->{h}{referer}\"\n";
181 273
182 print $accesslog $log if $accesslog; 274 print $::accesslog $log if $::accesslog;
183 print STDERR $log; 275 print STDERR $log;
184 276
185 $self->{written} += 277 $tbf_top->request(length $res, 1e6);
186 print {$self->{fh}} $res; 278 $self->{written} += print {$self->{fh}} $res;
187} 279}
188 280
189sub err { 281sub err {
190 my $self = shift; 282 my $self = shift;
191 my ($code, $msg, $hdr, $content) = @_; 283 my ($code, $msg, $hdr, $content) = @_;
192 284
193 unless (defined $content) { 285 unless (defined $content) {
194 $content = "$code $msg"; 286 $content = "$code $msg\n";
195 $hdr->{"Content-Type"} = "text/plain"; 287 $hdr->{"Content-Type"} = "text/plain";
196 $hdr->{"Content-Length"} = length $content; 288 $hdr->{"Content-Length"} = length $content;
197 } 289 }
198 $hdr->{"Connection"} = "close"; 290 $hdr->{"Connection"} = "close";
199 291
… …
224 } 316 }
225 317
226 $self->{h} = {}; 318 $self->{h} = {};
227 319
228 $fh->timeout($::RES_TIMEOUT); 320 $fh->timeout($::RES_TIMEOUT);
229 my $ip = $self->{remote_addr};
230
231 if ($blocked{$ip}) {
232 $self->err_blocked($blocked{$ip})
233 if $blocked{$ip} > $::NOW;
234
235 delete $blocked{$ip};
236 }
237
238 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
239 my $delay = 120;
240 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
241 if ($delay <= 0) {
242 $self->slog(2, "blocked ip $ip");
243 $self->err_blocked;
244 } else {
245 Coro::Event::do_timer(after => 3);
246 $delay -= 3;
247 }
248 }
249 }
250 321
251 $req =~ /^(?:\015\012)? 322 $req =~ /^(?:\015\012)?
252 (GET|HEAD) \040+ 323 (GET|HEAD) \040+
253 ([^\040]+) \040+ 324 ([^\040]+) \040+
254 HTTP\/([0-9]+\.[0-9]+) 325 HTTP\/([0-9]+\.[0-9]+)
… …
267 my (%hdr, $h, $v); 338 my (%hdr, $h, $v);
268 339
269 $hdr{lc $1} .= ",$2" 340 $hdr{lc $1} .= ",$2"
270 while $req =~ /\G 341 while $req =~ /\G
271 ([^:\000-\040]+): 342 ([^:\000-\040]+):
272 [\008\040]* 343 [\011\040]*
273 ((?: [^\015\012]+ | \015\012[\008\040] )*) 344 ((?: [^\015\012]+ | \015\012[\011\040] )*)
274 \015\012 345 \015\012
275 /gxc; 346 /gxc;
276 347
277 $req =~ /\G\015\012$/ 348 $req =~ /\G\015\012$/
278 or $self->err(400, "bad request"); 349 or $self->err(400, "bad request");
279 350
280 $self->{h}{$h} = substr $v, 1 351 $self->{h}{$h} = substr $v, 1
281 while ($h, $v) = each %hdr; 352 while ($h, $v) = each %hdr;
353 }
354
355 # remote id should be unique per user
356 my $id = $self->{remote_addr};
357
358 if (exists $self->{h}{"client-ip"}) {
359 $id .= "[".$self->{h}{"client-ip"}."]";
360 } elsif (exists $self->{h}{"x-forwarded-for"}) {
361 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
362 }
363
364 $self->{remote_id} = $id;
365
366 weaken (local $conn{$id}{$self*1} = $self);
367
368 if ($blocked{$id}) {
369 $self->err_blocked
370 if $blocked{$id}[0] > $::NOW;
371
372 delete $blocked{$id};
282 } 373 }
283 374
284 # find out server name and port 375 # find out server name and port
285 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 376 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
286 $host = $1; 377 $host = $1;
… …
290 381
291 if (defined $host) { 382 if (defined $host) {
292 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 383 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
293 } else { 384 } else {
294 ($self->{server_port}, $host) 385 ($self->{server_port}, $host)
295 = unpack_sockaddr_in $self->{fh}->getsockname 386 = unpack_sockaddr_in $self->{fh}->sockname
296 or $self->err(500, "unable to get socket name"); 387 or $self->err(500, "unable to get socket name");
297 $host = inet_ntoa $host; 388 $host = inet_ntoa $host;
298 } 389 }
299 390
300 $self->{server_name} = $host; 391 $self->{server_name} = $host;
301 392
302 # remote id should be unique per user
303 $self->{remote_id} = $self->{remote_addr};
304
305 if (exists $self->{h}{"client-ip"}) {
306 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
307 } elsif (exists $self->{h}{"x-forwarded-for"}) {
308 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
309 }
310
311 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 393 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
312 394
313 eval { 395 eval {
314 $self->map_uri; 396 $self->map_uri;
315 $self->respond; 397 $self->respond;
316 }; 398 };
317 399
318 $self->eoconn;
319
320 die if $@ && !ref $@; 400 die if $@ && !ref $@;
321 401
322 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 402 last if $self->{h}{connection} =~ /close/i;
403
404 $httpevent->broadcast;
323 405
324 $fh->timeout($::PER_TIMEOUT); 406 $fh->timeout($::PER_TIMEOUT);
325 } 407 }
408}
409
410sub block {
411 my $self = shift;
412
413 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
414 $self->slog(2, "blocked ip $self->{remote_id}");
415 $self->err_blocked;
326} 416}
327 417
328# uri => path mapping 418# uri => path mapping
329sub map_uri { 419sub map_uri {
330 my $self = shift; 420 my $self = shift;
… …
377 467
378sub respond { 468sub respond {
379 my $self = shift; 469 my $self = shift;
380 my $path = $self->{path}; 470 my $path = $self->{path};
381 471
382 stat $path 472 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
383 or $self->err(404, "not found"); 473 if ($::internal{$1}) {
384 474 $::internal{$1}->($self);
385 $self->{stat} = [stat _];
386
387 # idiotic netscape sends idiotic headers AGAIN
388 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
389 ? str2time $1 : 0;
390
391 if (-d _ && -r _) {
392 # directory
393 if ($path !~ /\/$/) {
394 # create a redirect to get the trailing "/"
395 # we don't try to avoid the :80
396 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
397 } else { 475 } else {
398 $ims < $self->{stat}[9] 476 $self->err(404, "not found");
477 }
478 } else {
479
480 stat $path
399 or $self->err(304, "not modified"); 481 or $self->err(404, "not found");
400 482
401 if (-r "$path/index.html") { 483 $self->{stat} = [stat _];
402 $self->{path} .= "/index.html"; 484
403 $self->handle_file; 485 # idiotic netscape sends idiotic headers AGAIN
486 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
487 ? str2time $1 : 0;
488
489 if (-d _ && -r _) {
490 # directory
491 if ($path !~ /\/$/) {
492 # create a redirect to get the trailing "/"
493 # we don't try to avoid the :80
494 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
404 } else { 495 } else {
496 $ims < $self->{stat}[9]
497 or $self->err(304, "not modified");
498
499 if (-r "$path/index.html") {
500 # replace directory "size" by index.html filesize
501 $self->{stat} = [stat ($self->{path} .= "/index.html")];
502 $self->handle_file($queue_index, $tbf_top);
503 } else {
405 $self->handle_dir; 504 $self->handle_dir;
406 } 505 }
407 } 506 }
408 } elsif (-f _ && -r _) { 507 } elsif (-f _ && -r _) {
409 -x _ and $self->err(403, "forbidden"); 508 -x _ and $self->err(403, "forbidden");
410 $self->handle_file; 509
510 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
511 my $timeout = $::NOW + 10;
512 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
513 if ($timeout < $::NOW) {
514 $self->block($::BLOCKTIME, "too many connections");
515 } else {
516 $httpevent->wait;
517 }
518 }
519 }
520
521 $self->handle_file($queue_file, $tbf_top);
411 } else { 522 } else {
412 $self->err(404, "not found"); 523 $self->err(404, "not found");
524 }
413 } 525 }
414} 526}
415 527
416sub handle_dir { 528sub handle_dir {
417 my $self = shift; 529 my $self = shift;
418 my $idx = $self->diridx; 530 my $idx = $self->diridx;
419 531
420 $self->response(200, "ok", 532 $self->response(200, "ok",
421 { 533 {
422 "Content-Type" => "text/html", 534 "Content-Type" => "text/html; charset=utf-8",
423 "Content-Length" => length $idx, 535 "Content-Length" => length $idx,
536 "Last-Modified" => time2str ($self->{stat}[9]),
424 }, 537 },
425 $idx); 538 $idx);
426} 539}
427 540
428sub handle_file { 541sub handle_file {
429 my $self = shift; 542 my ($self, $queue, $tbf) = @_;
430 my $length = -s _; 543 my $length = $self->{stat}[7];
431 my $hdr = { 544 my $hdr = {
432 "Last-Modified" => time2str ((stat _)[9]), 545 "Last-Modified" => time2str ((stat _)[9]),
546 "Accept-Ranges" => "bytes",
433 }; 547 };
434 548
435 my @code = (200, "ok"); 549 my @code = (200, "ok");
436 my ($l, $h); 550 my ($l, $h);
437 551
… …
447 } 561 }
448 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 562 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
449 } 563 }
450 $hdr->{"Content-Range"} = "bytes */$length"; 564 $hdr->{"Content-Range"} = "bytes */$length";
451 $hdr->{"Content-Length"} = $length; 565 $hdr->{"Content-Length"} = $length;
452 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
453 $self->err(416, "not satisfiable", $hdr, ""); 566 $self->err(416, "not satisfiable", $hdr, "");
454 567
455satisfiable: 568satisfiable:
456 # check for segmented downloads 569 # check for segmented downloads
457 if ($l && $::NO_SEGMENTED) { 570 if ($l && $::NO_SEGMENTED) {
458 my $delay = 180; 571 my $timeout = $::NOW + 15;
459 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 572 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
460 if ($delay <= 0) { 573 if ($timeout <= $::NOW) {
574 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
461 $self->err_segmented_download; 575 #$self->err_segmented_download;
462 } else { 576 } else {
463 Coro::Event::do_timer(after => 3); $delay -= 3; 577 $httpevent->wait;
464 } 578 }
465 } 579 }
466 } 580 }
467 581
468 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 582 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
480 594
481 $self->response(@code, $hdr, ""); 595 $self->response(@code, $hdr, "");
482 596
483 if ($self->{method} eq "GET") { 597 if ($self->{method} eq "GET") {
484 $self->{time} = $::NOW; 598 $self->{time} = $::NOW;
485
486 my $transfer = $::transfers->guard;
487 $self->{fh}->writable or return;
488
489 push @::wait_time, $::NOW - $self->{time};
490 shift @::wait_time if @wait_time > 25;
491 $self->{time} = $::NOW; 599 $self->{written} = 0;
600
601 my $current = $Coro::current;
492 602
493 my ($fh, $buf, $r); 603 my ($fh, $buf, $r);
494 my $current = $Coro::current; 604
495 open $fh, "<", $self->{path} 605 open $fh, "<", $self->{path}
496 or die "$self->{path}: late open failure ($!)"; 606 or die "$self->{path}: late open failure ($!)";
497 607
498 $h -= $l - 1; 608 $h -= $l - 1;
499 609
500 if (0) { 610 if (0) { # !AIO
501 if ($l) { 611 if ($l) {
502 sysseek $fh, $l, 0; 612 sysseek $fh, $l, 0;
503 } 613 }
504 } 614 }
615
616 my $transfer = $queue->start_transfer($h);
617 my $locked;
618 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
505 619
506 while ($h > 0) { 620 while ($h > 0) {
621 unless ($locked) {
622 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
623 $bufsize = $::BUFSIZE;
624 $self->{time} = $::NOW;
625 $self->{written} = 0;
626 }
627 }
628
629 if ($blocked{$self->{remote_id}}) {
630 $self->{h}{connection} = "close";
631 die bless {}, err::;
632 }
633
507 if (0) { 634 if (0) { # !AIO
508 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 635 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
509 or last; 636 or last;
510 } else { 637 } else {
511 undef $buf; 638 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
512 $aio_requests->down;
513 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
514 $buf, 0, sub { 639 $buf, 0, sub {
515 $r = $_[0]; 640 $r = $_[0];
516 $current->ready; 641 Coro::ready($current);
517 }); 642 });
518 &Coro::schedule; 643 &Coro::schedule;
519 $aio_requests->up;
520 last unless $r; 644 last unless $r;
521 } 645 }
522 my $w = $self->{fh}->syswrite($buf) 646
647 $tbf->request(length $buf);
648 my $w = syswrite $self->{fh}, $buf
523 or last; 649 or last;
524 $::written += $w; 650 $::written += $w;
525 $self->{written} += $w; 651 $self->{written} += $w;
526 $l += $r; 652 $l += $r;
527 } 653 }

Diff Legend

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