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

Diff Legend

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