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

Diff Legend

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