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

Diff Legend

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