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

Diff Legend

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