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

Diff Legend

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