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.21 by root, Fri Aug 17 03:33:00 2001 UTC vs.
Revision 1.51 by root, Thu Nov 29 01:50:41 2001 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 ();
5 9
6no utf8; 10no utf8;
7use bytes; 11use bytes;
8 12
9# at least on my machine, this thingy serves files 13# at least on my machine, this thingy serves files
10# quite a bit faster than apache, ;) 14# quite a bit faster than apache, ;)
11# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
12 16
13$SIG{PIPE} = 'IGNORE'; 17$SIG{PIPE} = 'IGNORE';
14 18
19our $accesslog;
20
21if ($ACCESS_LOG) {
22 use IO::Handle;
23 open $accesslog, ">>$ACCESS_LOG"
24 or die "$ACCESS_LOG: $!";
25 $accesslog->autoflush(1);
26}
27
15sub slog { 28sub slog {
16 my $level = shift; 29 my $level = shift;
17 my $format = shift; 30 my $format = shift;
18 printf "---: $format\n", @_; 31 printf "---: $format\n", @_;
19} 32}
20 33
21my $connections = new Coro::Semaphore $MAX_CONNECTS; 34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal;
36
37our $wait_factor = 0.95;
38
39our @transfers = (
40 (new transferqueue $MAX_TRANSFERS_SMALL),
41 (new transferqueue $MAX_TRANSFERS_LARGE),
42);
22 43
23my @newcons; 44my @newcons;
24my @pool; 45my @pool;
25 46
26# one "execution thread" 47# one "execution thread"
27sub handler { 48sub handler {
28 while () { 49 while () {
29 my $new = pop @newcons;
30 if ($new) { 50 if (@newcons) {
31 eval { 51 eval {
32 conn->new(@$new)->handle; 52 conn->new(@{pop @newcons})->handle;
33 }; 53 };
34 slog 1, "$@" if $@ && !ref $@; 54 slog 1, "$@" if $@ && !ref $@;
35 $connections->up; 55 $connections->up;
36 } else { 56 } else {
37 last if @pool >= $MAX_POOL; 57 last if @pool >= $MAX_POOL;
… …
39 schedule; 59 schedule;
40 } 60 }
41 } 61 }
42} 62}
43 63
64sub listen_on {
65 my $listen = $_[0];
66
67 push @listen_sockets, $listen;
68
69 # the "main thread"
70 async {
71 slog 1, "accepting connections";
72 while () {
73 $connections->down;
74 push @newcons, [$listen->accept];
75 #slog 3, "accepted @$connections ".scalar(@pool);
76 if (@pool) {
77 (pop @pool)->ready;
78 } else {
79 async \&handler;
80 }
81
82 }
83 };
84}
85
44my $http_port = new Coro::Socket 86my $http_port = new Coro::Socket
45 LocalAddr => $SERVER_HOST, 87 LocalAddr => $SERVER_HOST,
46 LocalPort => $SERVER_PORT, 88 LocalPort => $SERVER_PORT,
47 ReuseAddr => 1, 89 ReuseAddr => 1,
48 Listen => 50, 90 Listen => 50,
49 or die "unable to start server"; 91 or die "unable to start server";
50 92
51push @listen_sockets, $http_port; 93listen_on $http_port;
52 94
53# the "main thread" 95if ($SERVER_PORT2) {
54async { 96 my $http_port = new Coro::Socket
55 slog 1, "accepting connections"; 97 LocalAddr => $SERVER_HOST,
56 while () { 98 LocalPort => $SERVER_PORT2,
57 $connections->down; 99 ReuseAddr => 1,
58 push @newcons, [$http_port->accept]; 100 Listen => 50,
59 #slog 3, "accepted @$connections ".scalar(@pool); 101 or die "unable to start server";
102
103 listen_on $http_port;
104}
105
106our $NOW;
107our $HTTP_NOW;
108
109Event->timer(interval => 1, hard => 1, cb => sub {
60 $::NOW = time; 110 $NOW = time;
61 if (@pool) { 111 $HTTP_NOW = time2str $NOW;
62 (pop @pool)->ready; 112})->now;
63 } else {
64 async \&handler;
65 }
66
67 }
68};
69 113
70package conn; 114package conn;
71 115
72use Socket; 116use Socket;
73use HTTP::Date; 117use HTTP::Date;
… …
77Linux::AIO::min_parallel $::AIO_PARALLEL; 121Linux::AIO::min_parallel $::AIO_PARALLEL;
78 122
79Event->io(fd => Linux::AIO::poll_fileno, 123Event->io(fd => Linux::AIO::poll_fileno,
80 poll => 'r', async => 1, 124 poll => 'r', async => 1,
81 cb => \&Linux::AIO::poll_cb); 125 cb => \&Linux::AIO::poll_cb);
82my $scheduler = Event->idle(
83 max => 0, min => 0, prio => 6, parked => 1,
84 cb => \&Coro::schedule);
85 126
86our %conn; # $conn{ip}{fh} => connobj 127our %conn; # $conn{ip}{self} => connobj
128our %uri; # $uri{ip}{uri}{self}
87our %blocked; 129our %blocked;
88our %mimetype; 130our %mimetype;
89 131
90sub read_mimetypes { 132sub read_mimetypes {
91 local *M; 133 local *M;
… …
102 144
103read_mimetypes; 145read_mimetypes;
104 146
105sub new { 147sub new {
106 my $class = shift; 148 my $class = shift;
149 my $fh = shift;
107 my $peername = shift; 150 my $peername = shift;
108 my $fh = shift;
109 my $self = bless { fh => $fh }, $class; 151 my $self = bless { fh => $fh }, $class;
110 my (undef, $iaddr) = unpack_sockaddr_in $peername 152 my (undef, $iaddr) = unpack_sockaddr_in $peername
111 or $self->err(500, "unable to decode peername"); 153 or $self->err(500, "unable to decode peername");
112 154
155 $self->{remote_addr} =
113 $self->{remote_addr} = inet_ntoa $iaddr; 156 $self->{remote_id} = inet_ntoa $iaddr;
114 $self->{time} = $::NOW; 157 $self->{time} = $::NOW;
115 158
116 # enter ourselves into various lists 159 weaken ($Coro::current->{conn} = $self);
117 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
118 160
119 $::conns++; 161 $::conns++;
120 162
121 $self; 163 $self;
122} 164}
123 165
124sub DESTROY { 166sub DESTROY {
125 my $self = shift; 167 my $self = shift;
126
127 $::conns--; 168 $::conns--;
128
129 $self->eoconn; 169 $self->eoconn;
130 delete $conn{$self->{remote_addr}}{$self*1};
131} 170}
132 171
133# end of connection 172# end of connection
134sub eoconn { 173sub eoconn {
174 my $self = shift;
175
176 # clean up hints
177 delete $conn{$self->{remote_id}}{$self*1};
135 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 178 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
179
180 $httpevent->broadcast;
136} 181}
137 182
138sub slog { 183sub slog {
139 my $self = shift; 184 my $self = shift;
140 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 185 main::slog($_[0], "$self->{remote_id}> $_[1]");
141} 186}
142 187
143sub response { 188sub response {
144 my ($self, $code, $msg, $hdr, $content) = @_; 189 my ($self, $code, $msg, $hdr, $content) = @_;
145 my $res = "HTTP/1.1 $code $msg\015\012"; 190 my $res = "HTTP/1.1 $code $msg\015\012";
146 191
147 #$res .= "Connection: close\015\012"; 192 if (exists $hdr->{Connection}) {
148 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 193 if ($hdr->{Connection} =~ /close/) {
194 $self->{h}{connection} = "close"
195 }
196 } else {
197 if ($self->{version} < 1.1) {
198 if ($self->{h}{connection} =~ /keep-alive/i) {
199 $hdr->{Connection} = "Keep-Alive";
200 } else {
201 $self->{h}{connection} = "close"
202 }
203 }
204 }
205
206 $res .= "Date: $HTTP_NOW\015\012";
149 207
150 while (my ($h, $v) = each %$hdr) { 208 while (my ($h, $v) = each %$hdr) {
151 $res .= "$h: $v\015\012" 209 $res .= "$h: $v\015\012"
152 } 210 }
153 $res .= "\015\012"; 211 $res .= "\015\012";
154 212
155 $res .= $content if defined $content and $self->{method} ne "HEAD"; 213 $res .= $content if defined $content and $self->{method} ne "HEAD";
156 214
157 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 215 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
216 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
217 " \"$self->{h}{referer}\"\n";
218
219 print $accesslog $log if $accesslog;
220 print STDERR $log;
158 221
159 $self->{written} += 222 $self->{written} +=
160 print {$self->{fh}} $res; 223 print {$self->{fh}} $res;
161} 224}
162 225
163sub err { 226sub err {
164 my $self = shift; 227 my $self = shift;
165 my ($code, $msg, $hdr, $content) = @_; 228 my ($code, $msg, $hdr, $content) = @_;
166 229
167 unless (defined $content) { 230 unless (defined $content) {
168 $content = "$code $msg"; 231 $content = "$code $msg\n";
169 $hdr->{"Content-Type"} = "text/plain"; 232 $hdr->{"Content-Type"} = "text/plain";
170 $hdr->{"Content-Length"} = length $content; 233 $hdr->{"Content-Length"} = length $content;
171 } 234 }
172 $hdr->{"Connection"} = "close"; 235 $hdr->{"Connection"} = "close";
173 236
174 $self->response($code, $msg, $hdr, $content); 237 $self->response($code, $msg, $hdr, $content);
175 238
176 die bless {}, err::; 239 die bless {}, err::;
177} 240}
178 241
179sub err_blocked {
180 my $self = shift;
181 my $ip = $self->{remote_addr};
182 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
183
184 Coro::Event::do_timer(after => 20*rand);
185
186 $self->err(401, "too many connections",
187 {
188 "Content-Type" => "text/html",
189 "Retry-After" => $::BLOCKTIME,
190 "Warning" => "Please do NOT retry, you have been blocked",
191 "WWW-Authenticate" => "Basic realm=\"Please do NOT retry, you have been blocked\"",
192 },
193 <<EOF);
194<html><p>
195You have been blocked because you opened too many connections. You
196may retry at</p>
197
198 <p><blockquote>$time.</blockquote></p>
199
200<p>Until then, each new access will renew the block. You might want to have a
201look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
202</html>
203EOF
204}
205
206sub handle { 242sub handle {
207 my $self = shift; 243 my $self = shift;
208 my $fh = $self->{fh}; 244 my $fh = $self->{fh};
245
246 my $host;
209 247
210 $fh->timeout($::REQ_TIMEOUT); 248 $fh->timeout($::REQ_TIMEOUT);
211 while() { 249 while() {
212 $self->{reqs}++; 250 $self->{reqs}++;
213 251
… …
223 } 261 }
224 262
225 $self->{h} = {}; 263 $self->{h} = {};
226 264
227 $fh->timeout($::RES_TIMEOUT); 265 $fh->timeout($::RES_TIMEOUT);
228 my $ip = $self->{remote_addr};
229
230 if ($blocked{$ip}) {
231 $self->err_blocked($blocked{$ip})
232 if $blocked{$ip} > $::NOW;
233
234 delete $blocked{$ip};
235 }
236
237 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
238 $self->slog(2, "blocked ip $ip");
239 $self->err_blocked;
240 }
241 266
242 $req =~ /^(?:\015\012)? 267 $req =~ /^(?:\015\012)?
243 (GET|HEAD) \040+ 268 (GET|HEAD) \040+
244 ([^\040]+) \040+ 269 ([^\040]+) \040+
245 HTTP\/([0-9]+\.[0-9]+) 270 HTTP\/([0-9]+\.[0-9]+)
… …
270 295
271 $self->{h}{$h} = substr $v, 1 296 $self->{h}{$h} = substr $v, 1
272 while ($h, $v) = each %hdr; 297 while ($h, $v) = each %hdr;
273 } 298 }
274 299
300 # remote id should be unique per user
301 my $id = $self->{remote_addr};
302
303 if (exists $self->{h}{"client-ip"}) {
304 $id .= "[".$self->{h}{"client-ip"}."]";
305 } elsif (exists $self->{h}{"x-forwarded-for"}) {
306 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
307 }
308
309 $self->{remote_id} = $id;
310
311 if ($blocked{$id}) {
312 $self->err_blocked($blocked{$id})
313 if $blocked{$id} > $::NOW;
314
315 delete $blocked{$id};
316 }
317
318 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
319 my $delay = $::PER_TIMEOUT + $::NOW + 15;
320 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
321 if ($delay < $::NOW) {
322 $self->slog(2, "blocked ip $id");
323 $self->err_blocked;
324 } else {
325 $httpevent->wait;
326 }
327 }
328 }
329
330 # find out server name and port
331 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
332 $host = $1;
333 } else {
334 $host = $self->{h}{host};
335 }
336
337 if (defined $host) {
275 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 338 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
339 } else {
340 ($self->{server_port}, $host)
341 = unpack_sockaddr_in $self->{fh}->sockname
342 or $self->err(500, "unable to get socket name");
343 $host = inet_ntoa $host;
344 }
276 345
346 $self->{server_name} = $host;
347
348 # enter ourselves into various lists
349 weaken ($conn{$id}{$self*1} = $self);
277 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 350 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
278 351
352 eval {
279 $self->map_uri; 353 $self->map_uri;
280 $self->respond; 354 $self->respond;
355 };
281 356
282 $self->eoconn; 357 $self->eoconn;
283 358
359 die if $@ && !ref $@;
360
284 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 361 last if $self->{h}{connection} =~ /close/;
285 362
286 $self->slog(9, "persistent connection [".$self->{h}{"user-agent"}."][$self->{reqs}]"); 363 $httpevent->broadcast;
364
287 $fh->timeout($::PER_TIMEOUT); 365 $fh->timeout($::PER_TIMEOUT);
288 } 366 }
289} 367}
290 368
291# uri => path mapping 369# uri => path mapping
292sub map_uri { 370sub map_uri {
293 my $self = shift; 371 my $self = shift;
294 my $host = $self->{h}{host} || "default"; 372 my $host = $self->{server_name};
295 my $uri = $self->{uri}; 373 my $uri = $self->{uri};
296 374
297 # some massaging, also makes it more secure 375 # some massaging, also makes it more secure
298 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 376 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
299 $uri =~ s%//+%/%g; 377 $uri =~ s%//+%/%g;
… …
309 $self->{path} = "$::DOCROOT/$host$uri"; 387 $self->{path} = "$::DOCROOT/$host$uri";
310 388
311 $self->access_check; 389 $self->access_check;
312} 390}
313 391
314sub server_address {
315 my $self = shift;
316 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
317 or $self->err(500, "unable to get socket name");
318 ((inet_ntoa $iaddr), $port);
319}
320
321sub server_host {
322 my $self = shift;
323 if (exists $self->{h}{host}) {
324 return $self->{h}{host};
325 } else {
326 return (($self->server_address)[0]);
327 }
328}
329
330sub server_hostport {
331 my $self = shift;
332 my ($host, $port);
333 if (exists $self->{h}{host}) {
334 ($host, $port) = ($self->{h}{host}, $self->{server_port});
335 } else {
336 ($host, $port) = $self->server_address;
337 }
338 $port = $port == 80 ? "" : ":$port";
339 $host.$port;
340}
341
342sub _cgi { 392sub _cgi {
343 my $self = shift; 393 my $self = shift;
344 my $path = shift; 394 my $path = shift;
345 my $fh; 395 my $fh;
346 396
347 # no two-way xxx supported 397 # no two-way xxx supported
348 if (0 == fork) { 398 if (0 == fork) {
349 open STDOUT, ">&".fileno($self->{fh}); 399 open STDOUT, ">&".fileno($self->{fh});
350 if (chdir $::DOCROOT) { 400 if (chdir $::DOCROOT) {
351 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 401 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
352 $ENV{HTTP_HOST} = $self->server_host; 402 $ENV{HTTP_HOST} = $self->{server_name};
353 $ENV{HTTP_PORT} = $self->{server_host}; 403 $ENV{HTTP_PORT} = $self->{server_port};
354 $ENV{SCRIPT_NAME} = $self->{name}; 404 $ENV{SCRIPT_NAME} = $self->{name};
355 exec $path; 405 exec $path;
356 } 406 }
357 Coro::State::_exit(0); 407 Coro::State::_exit(0);
358 } else { 408 } else {
409 die;
359 } 410 }
411}
412
413sub server_hostport {
414 $_[0]{server_port} == 80
415 ? $_[0]{server_name}
416 : "$_[0]{server_name}:$_[0]{server_port}";
360} 417}
361 418
362sub respond { 419sub respond {
363 my $self = shift; 420 my $self = shift;
364 my $path = $self->{path}; 421 my $path = $self->{path};
365 422
366 stat $path 423 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
367 or $self->err(404, "not found"); 424 if ($::internal{$1}) {
368 425 $::internal{$1}->($self);
369 $self->{stat} = [stat _];
370
371 # idiotic netscape sends idiotic headers AGAIN
372 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
373 ? str2time $1 : 0;
374
375 if (-d _ && -r _) {
376 # directory
377 if ($path !~ /\/$/) {
378 # create a redirect to get the trailing "/"
379 my $host = $self->server_hostport;
380 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
381 } else { 426 } else {
427 $self->err(404, "not found");
428 }
429 } else {
430
431 stat $path
432 or $self->err(404, "not found");
433
434 $self->{stat} = [stat _];
435
436 # idiotic netscape sends idiotic headers AGAIN
437 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
438 ? str2time $1 : 0;
439
440 if (-d _ && -r _) {
441 # directory
442 if ($path !~ /\/$/) {
443 # create a redirect to get the trailing "/"
444 # we don't try to avoid the :80
445 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
446 } else {
382 $ims < $self->{stat}[9] 447 $ims < $self->{stat}[9]
383 or $self->err(304, "not modified"); 448 or $self->err(304, "not modified");
384 449
385 if ($self->{method} eq "GET") {
386 if (-r "$path/index.html") { 450 if (-r "$path/index.html") {
387 $self->{path} .= "/index.html"; 451 # replace directory "size" by index.html filesize
452 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
388 $self->handle_file; 453 $self->handle_file;
389 } else { 454 } else {
390 $self->handle_dir; 455 $self->handle_dir;
391 } 456 }
392 } 457 }
393 }
394 } elsif (-f _ && -r _) { 458 } elsif (-f _ && -r _) {
395 -x _ and $self->err(403, "forbidden"); 459 -x _ and $self->err(403, "forbidden");
396 $self->handle_file; 460 $self->handle_file;
397 } else { 461 } else {
398 $self->err(404, "not found"); 462 $self->err(404, "not found");
463 }
399 } 464 }
400} 465}
401 466
402sub handle_dir { 467sub handle_dir {
403 my $self = shift; 468 my $self = shift;
… …
405 470
406 $self->response(200, "ok", 471 $self->response(200, "ok",
407 { 472 {
408 "Content-Type" => "text/html", 473 "Content-Type" => "text/html",
409 "Content-Length" => length $idx, 474 "Content-Length" => length $idx,
475 #d# directories change all the time, so X-
476 "X-Last-Modified" => time2str ((stat _)[9]),
410 }, 477 },
411 $idx); 478 $idx);
412} 479}
413 480
414sub handle_file { 481sub handle_file {
415 my $self = shift; 482 my $self = shift;
416 my $length = -s _; 483 my $length = $self->{stat}[7];
484 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
417 my $hdr = { 485 my $hdr = {
418 "Last-Modified" => time2str ((stat _)[9]), 486 "Last-Modified" => time2str ((stat _)[9]),
419 }; 487 };
420 488
421 my @code = (200, "ok"); 489 my @code = (200, "ok");
… …
429 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 497 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
430 } else { 498 } else {
431 ($l, $h) = (0, $length - 1); 499 ($l, $h) = (0, $length - 1);
432 goto ignore; 500 goto ignore;
433 } 501 }
434 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 502 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
435 } 503 }
436 $hdr->{"Content-Range"} = "bytes */$length"; 504 $hdr->{"Content-Range"} = "bytes */$length";
437 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")"); 505 $hdr->{"Content-Length"} = $length;
438 $self->err(416, "not satisfiable", $hdr); 506 $self->err(416, "not satisfiable", $hdr, "");
439 507
440satisfiable: 508satisfiable:
441 # check for segmented downloads 509 # check for segmented downloads
442 if ($l && $::NO_SEGMENTED) { 510 if ($l && $::NO_SEGMENTED) {
511 my $delay = $::NOW + $::PER_TIMEOUT + 15;
443 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 512 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
444 Coro::Event::do_timer(after => 15); 513 if ($delay <= $::NOW) {
445 514 $self->err_segmented_download;
446 $self->err(400, "segmented downloads are not allowed"); 515 } else {
516 $httpevent->wait;
517 }
447 } 518 }
448 } 519 }
449 520
450 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 521 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
451 @code = (206, "partial content"); 522 @code = (206, "partial content");
… …
461 $hdr->{"Content-Length"} = $length; 532 $hdr->{"Content-Length"} = $length;
462 533
463 $self->response(@code, $hdr, ""); 534 $self->response(@code, $hdr, "");
464 535
465 if ($self->{method} eq "GET") { 536 if ($self->{method} eq "GET") {
537 $self->{time} = $::NOW;
538
539 my $current = $Coro::current;
540
466 my ($fh, $buf, $r); 541 my ($fh, $buf, $r);
467 my $current = $Coro::current; 542
468 open $fh, "<", $self->{path} 543 open $fh, "<", $self->{path}
469 or die "$self->{path}: late open failure ($!)"; 544 or die "$self->{path}: late open failure ($!)";
470 545
471 $h -= $l - 1; 546 $h -= $l - 1;
472 547
473 if (0) { 548 if (0) { # !AIO
474 if ($l) { 549 if ($l) {
475 sysseek $fh, $l, 0; 550 sysseek $fh, $l, 0;
476 } 551 }
477 } 552 }
553
554 my $transfer = $queue->start_transfer;
555 my $locked;
556 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
478 557
479 while ($h > 0) { 558 while ($h > 0) {
559 unless ($locked) {
560 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
561 $bufsize = $::BUFSIZE;
562 $self->{time} = $::NOW;
563 }
564 }
565
480 if (0) { 566 if (0) { # !AIO
481 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 567 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
482 or last; 568 or last;
483 } else { 569 } else {
484 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 570 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
485 $buf, 0, sub { 571 $buf, 0, sub {
486 $r = $_[0]; 572 $r = $_[0];
487 $current->ready; 573 Coro::ready($current);
488 $scheduler->now;
489 }); 574 });
490 &Coro::schedule; 575 &Coro::schedule;
491 last unless $r; 576 last unless $r;
492 } 577 }
493 my $w = $self->{fh}->syswrite($buf) 578 my $w = syswrite $self->{fh}, $buf
494 or last; 579 or last;
495 $::written += $w; 580 $::written += $w;
496 $self->{written} += $w; 581 $self->{written} += $w;
497 $l += $r; 582 $l += $r;
498 } 583 }
499 }
500 584
501 close $fh; 585 close $fh;
586 }
502} 587}
503 588
5041; 5891;

Diff Legend

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