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

Diff Legend

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