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.19 by root, Thu Aug 16 16:40:07 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
83our %conn; # $conn{ip}{fh} => connobj 126our %conn; # $conn{ip}{self} => connobj
127our %uri; # $uri{ip}{uri}{self}
84our %blocked; 128our %blocked;
85our %mimetype; 129our %mimetype;
86 130
87sub read_mimetypes { 131sub read_mimetypes {
88 local *M; 132 local *M;
… …
99 143
100read_mimetypes; 144read_mimetypes;
101 145
102sub new { 146sub new {
103 my $class = shift; 147 my $class = shift;
148 my $fh = shift;
104 my $peername = shift; 149 my $peername = shift;
105 my $fh = shift;
106 my $self = bless { fh => $fh }, $class; 150 my $self = bless { fh => $fh }, $class;
107 my (undef, $iaddr) = unpack_sockaddr_in $peername 151 my (undef, $iaddr) = unpack_sockaddr_in $peername
108 or $self->err(500, "unable to decode peername"); 152 or $self->err(500, "unable to decode peername");
109 153
154 $self->{remote_addr} =
110 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_id} = inet_ntoa $iaddr;
111 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
112 157
113 # enter ourselves into various lists 158 weaken ($Coro::current->{conn} = $self);
114 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
115 159
116 $::conns++; 160 $::conns++;
117 161
118 $self; 162 $self;
119} 163}
120 164
121sub DESTROY { 165sub DESTROY {
122 my $self = shift; 166 my $self = shift;
123
124 $::conns--; 167 $::conns--;
125
126 $self->eoconn; 168 $self->eoconn;
127 delete $conn{$self->{remote_addr}}{$self*1};
128} 169}
129 170
130# end of connection 171# end of connection
131sub eoconn { 172sub eoconn {
173 my $self = shift;
174
175 # clean up hints
176 delete $conn{$self->{remote_id}}{$self*1};
132 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 177 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
178
179 $httpevent->broadcast;
133} 180}
134 181
135sub slog { 182sub slog {
136 my $self = shift; 183 my $self = shift;
137 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 184 main::slog($_[0], "$self->{remote_id}> $_[1]");
138} 185}
139 186
140sub response { 187sub response {
141 my ($self, $code, $msg, $hdr, $content) = @_; 188 my ($self, $code, $msg, $hdr, $content) = @_;
142 my $res = "HTTP/1.1 $code $msg\015\012"; 189 my $res = "HTTP/1.1 $code $msg\015\012";
143 190
144 #$res .= "Connection: close\015\012"; 191 if (exists $hdr->{Connection}) {
145 $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";
146 206
147 while (my ($h, $v) = each %$hdr) { 207 while (my ($h, $v) = each %$hdr) {
148 $res .= "$h: $v\015\012" 208 $res .= "$h: $v\015\012"
149 } 209 }
150 $res .= "\015\012"; 210 $res .= "\015\012";
151 211
152 $res .= $content if defined $content and $self->{method} ne "HEAD"; 212 $res .= $content if defined $content and $self->{method} ne "HEAD";
153 213
154 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;
155 220
156 $self->{written} += 221 $self->{written} +=
157 print {$self->{fh}} $res; 222 print {$self->{fh}} $res;
158} 223}
159 224
160sub err { 225sub err {
161 my $self = shift; 226 my $self = shift;
162 my ($code, $msg, $hdr, $content) = @_; 227 my ($code, $msg, $hdr, $content) = @_;
163 228
164 unless (defined $content) { 229 unless (defined $content) {
165 $content = "$code $msg"; 230 $content = "$code $msg\n";
166 $hdr->{"Content-Type"} = "text/plain"; 231 $hdr->{"Content-Type"} = "text/plain";
167 $hdr->{"Content-Length"} = length $content; 232 $hdr->{"Content-Length"} = length $content;
168 } 233 }
169 $hdr->{"Connection"} = "close"; 234 $hdr->{"Connection"} = "close";
170 235
171 $self->response($code, $msg, $hdr, $content); 236 $self->response($code, $msg, $hdr, $content);
172 237
173 die bless {}, err::; 238 die bless {}, err::;
174} 239}
175 240
176sub err_blocked {
177 my $self = shift;
178 my $ip = $self->{remote_addr};
179 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
180
181 Coro::Event::do_timer(after => 15);
182
183 $self->err(401, "too many connections",
184 {
185 "Content-Type" => "text/html",
186 "Retry-After" => $::BLOCKTIME
187 },
188 <<EOF);
189<html><p>
190You have been blocked because you opened too many connections. You
191may retry at</p>
192
193 <p><blockquote>$time.</blockquote></p>
194
195<p>Until then, each new access will renew the block. You might want to have a
196look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
197</html>
198EOF
199}
200
201sub handle { 241sub handle {
202 my $self = shift; 242 my $self = shift;
203 my $fh = $self->{fh}; 243 my $fh = $self->{fh};
244
245 my $host;
204 246
205 $fh->timeout($::REQ_TIMEOUT); 247 $fh->timeout($::REQ_TIMEOUT);
206 while() { 248 while() {
207 $self->{reqs}++; 249 $self->{reqs}++;
208 250
… …
218 } 260 }
219 261
220 $self->{h} = {}; 262 $self->{h} = {};
221 263
222 $fh->timeout($::RES_TIMEOUT); 264 $fh->timeout($::RES_TIMEOUT);
223 my $ip = $self->{remote_addr};
224
225 if ($blocked{$ip}) {
226 $self->err_blocked($blocked{$ip})
227 if $blocked{$ip} > $::NOW;
228
229 delete $blocked{$ip};
230 }
231
232 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
233 $self->slog(2, "blocked ip $ip");
234 $self->err_blocked;
235 }
236 265
237 $req =~ /^(?:\015\012)? 266 $req =~ /^(?:\015\012)?
238 (GET|HEAD) \040+ 267 (GET|HEAD) \040+
239 ([^\040]+) \040+ 268 ([^\040]+) \040+
240 HTTP\/([0-9]+\.[0-9]+) 269 HTTP\/([0-9]+\.[0-9]+)
… …
243 272
244 $self->{method} = $1; 273 $self->{method} = $1;
245 $self->{uri} = $2; 274 $self->{uri} = $2;
246 $self->{version} = $3; 275 $self->{version} = $3;
247 276
248 $3 eq "1.0" or $3 eq "1.1" 277 $3 =~ /^1\./
249 or $self->err(506, "http protocol version $3 not supported"); 278 or $self->err(506, "http protocol version $3 not supported");
250 279
251 # parse headers 280 # parse headers
252 { 281 {
253 my (%hdr, $h, $v); 282 my (%hdr, $h, $v);
… …
265 294
266 $self->{h}{$h} = substr $v, 1 295 $self->{h}{$h} = substr $v, 1
267 while ($h, $v) = each %hdr; 296 while ($h, $v) = each %hdr;
268 } 297 }
269 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) {
270 $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 }
271 344
345 $self->{server_name} = $host;
346
347 # enter ourselves into various lists
348 weaken ($conn{$id}{$self*1} = $self);
272 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 349 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
273 350
351 eval {
274 $self->map_uri; 352 $self->map_uri;
275 $self->respond; 353 $self->respond;
354 };
276 355
277 $self->eoconn; 356 $self->eoconn;
278 357
358 die if $@ && !ref $@;
359
279 last if $self->{h}{connection} =~ /close/ || $self->{version} lt "1.1"; 360 last if $self->{h}{connection} =~ /close/;
280 361
281 $self->slog(9, "persistent connection [".$self->{h}{"user-agent"}."][$self->{reqs}]"); 362 $httpevent->broadcast;
363
282 $fh->timeout($::PER_TIMEOUT); 364 $fh->timeout($::PER_TIMEOUT);
283 } 365 }
284} 366}
285 367
286# uri => path mapping 368# uri => path mapping
287sub map_uri { 369sub map_uri {
288 my $self = shift; 370 my $self = shift;
289 my $host = $self->{h}{host} || "default"; 371 my $host = $self->{server_name};
290 my $uri = $self->{uri}; 372 my $uri = $self->{uri};
291 373
292 # some massaging, also makes it more secure 374 # some massaging, also makes it more secure
293 $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;
294 $uri =~ s%//+%/%g; 376 $uri =~ s%//+%/%g;
… …
304 $self->{path} = "$::DOCROOT/$host$uri"; 386 $self->{path} = "$::DOCROOT/$host$uri";
305 387
306 $self->access_check; 388 $self->access_check;
307} 389}
308 390
309sub server_address {
310 my $self = shift;
311 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
312 or $self->err(500, "unable to get socket name");
313 ((inet_ntoa $iaddr), $port);
314}
315
316sub server_host {
317 my $self = shift;
318 if (exists $self->{h}{host}) {
319 return $self->{h}{host};
320 } else {
321 return (($self->server_address)[0]);
322 }
323}
324
325sub server_hostport {
326 my $self = shift;
327 my ($host, $port);
328 if (exists $self->{h}{host}) {
329 ($host, $port) = ($self->{h}{host}, $self->{server_port});
330 } else {
331 ($host, $port) = $self->server_address;
332 }
333 $port = $port == 80 ? "" : ":$port";
334 $host.$port;
335}
336
337sub _cgi { 391sub _cgi {
338 my $self = shift; 392 my $self = shift;
339 my $path = shift; 393 my $path = shift;
340 my $fh; 394 my $fh;
341 395
342 # no two-way xxx supported 396 # no two-way xxx supported
343 if (0 == fork) { 397 if (0 == fork) {
344 open STDOUT, ">&".fileno($self->{fh}); 398 open STDOUT, ">&".fileno($self->{fh});
345 if (chdir $::DOCROOT) { 399 if (chdir $::DOCROOT) {
346 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 400 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
347 $ENV{HTTP_HOST} = $self->server_host; 401 $ENV{HTTP_HOST} = $self->{server_name};
348 $ENV{HTTP_PORT} = $self->{server_host}; 402 $ENV{HTTP_PORT} = $self->{server_port};
349 $ENV{SCRIPT_NAME} = $self->{name}; 403 $ENV{SCRIPT_NAME} = $self->{name};
350 exec $path; 404 exec $path;
351 } 405 }
352 Coro::State::_exit(0); 406 Coro::State::_exit(0);
353 } else { 407 } else {
408 die;
354 } 409 }
410}
411
412sub server_hostport {
413 $_[0]{server_port} == 80
414 ? $_[0]{server_name}
415 : "$_[0]{server_name}:$_[0]{server_port}";
355} 416}
356 417
357sub respond { 418sub respond {
358 my $self = shift; 419 my $self = shift;
359 my $path = $self->{path}; 420 my $path = $self->{path};
360 421
361 stat $path 422 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
362 or $self->err(404, "not found"); 423 if ($::internal{$1}) {
363 424 $::internal{$1}->($self);
364 $self->{stat} = [stat _];
365
366 # idiotic netscape sends idiotic headers AGAIN
367 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
368 ? str2time $1 : 0;
369
370 if (-d _ && -r _) {
371 # directory
372 if ($path !~ /\/$/) {
373 # create a redirect to get the trailing "/"
374 my $host = $self->server_hostport;
375 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" });
376 } 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 {
377 $ims < $self->{stat}[9] 446 $ims < $self->{stat}[9]
378 or $self->err(304, "not modified"); 447 or $self->err(304, "not modified");
379 448
380 if ($self->{method} eq "GET") {
381 if (-r "$path/index.html") { 449 if (-r "$path/index.html") {
382 $self->{path} .= "/index.html"; 450 # replace directory "size" by index.html filesize
451 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
383 $self->handle_file; 452 $self->handle_file($queue_index);
384 } else { 453 } else {
385 $self->handle_dir; 454 $self->handle_dir;
386 } 455 }
387 } 456 }
388 }
389 } elsif (-f _ && -r _) { 457 } elsif (-f _ && -r _) {
390 -x _ and $self->err(403, "forbidden"); 458 -x _ and $self->err(403, "forbidden");
391 $self->handle_file; 459 $self->handle_file(-s _ >= $::TRANSFER_SMALL ? $queue_large : $queue_small);
392 } else { 460 } else {
393 $self->err(404, "not found"); 461 $self->err(404, "not found");
462 }
394 } 463 }
395} 464}
396 465
397sub handle_dir { 466sub handle_dir {
398 my $self = shift; 467 my $self = shift;
… …
400 469
401 $self->response(200, "ok", 470 $self->response(200, "ok",
402 { 471 {
403 "Content-Type" => "text/html", 472 "Content-Type" => "text/html",
404 "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]),
405 }, 476 },
406 $idx); 477 $idx);
407} 478}
408 479
409sub handle_file { 480sub handle_file {
410 my $self = shift; 481 my ($self, $queue) = @_;
411 my $length = -s _; 482 my $length = $self->{stat}[7];
412 my $hdr = { 483 my $hdr = {
413 "Last-Modified" => time2str ((stat _)[9]), 484 "Last-Modified" => time2str ((stat _)[9]),
414 }; 485 };
415 486
416 my @code = (200, "ok"); 487 my @code = (200, "ok");
… …
424 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 495 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
425 } else { 496 } else {
426 ($l, $h) = (0, $length - 1); 497 ($l, $h) = (0, $length - 1);
427 goto ignore; 498 goto ignore;
428 } 499 }
429 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 500 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
430 } 501 }
431 $hdr->{"Content-Range"} = "bytes */$length"; 502 $hdr->{"Content-Range"} = "bytes */$length";
503 $hdr->{"Content-Length"} = $length;
432 $self->err(416, "not satisfiable", $hdr); 504 $self->err(416, "not satisfiable", $hdr, "");
433 505
434satisfiable: 506satisfiable:
435 # check for segmented downloads 507 # check for segmented downloads
436 if ($l && $::NO_SEGMENTED) { 508 if ($l && $::NO_SEGMENTED) {
509 my $delay = $::NOW + $::PER_TIMEOUT + 15;
437 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 510 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
438 Coro::Event::do_timer(after => 15); 511 if ($delay <= $::NOW) {
439 512 $self->err_segmented_download;
440 $self->err(400, "segmented downloads are not allowed"); 513 } else {
514 $httpevent->wait;
515 }
441 } 516 }
442 } 517 }
443 518
444 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 519 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
445 @code = (206, "partial content"); 520 @code = (206, "partial content");
… …
455 $hdr->{"Content-Length"} = $length; 530 $hdr->{"Content-Length"} = $length;
456 531
457 $self->response(@code, $hdr, ""); 532 $self->response(@code, $hdr, "");
458 533
459 if ($self->{method} eq "GET") { 534 if ($self->{method} eq "GET") {
535 $self->{time} = $::NOW;
536
537 my $current = $Coro::current;
538
460 my ($fh, $buf, $r); 539 my ($fh, $buf, $r);
461 my $current = $Coro::current; 540
462 open $fh, "<", $self->{path} 541 open $fh, "<", $self->{path}
463 or die "$self->{path}: late open failure ($!)"; 542 or die "$self->{path}: late open failure ($!)";
464 543
465 $h -= $l - 1; 544 $h -= $l - 1;
466 545
467 if (0) { 546 if (0) { # !AIO
468 if ($l) { 547 if ($l) {
469 sysseek $fh, $l, 0; 548 sysseek $fh, $l, 0;
470 } 549 }
471 } 550 }
551
552 my $transfer = $queue->start_transfer;
553 my $locked;
554 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
472 555
473 while ($h > 0) { 556 while ($h > 0) {
557 unless ($locked) {
558 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
559 $bufsize = $::BUFSIZE;
560 $self->{time} = $::NOW;
561 }
562 }
563
474 if (0) { 564 if (0) { # !AIO
475 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 565 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
476 or last; 566 or last;
477 } else { 567 } else {
478 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 568 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
479 $buf, 0, sub { 569 $buf, 0, sub {
480 $r = $_[0]; 570 $r = $_[0];
481 $current->ready; 571 Coro::ready($current);
482 }); 572 });
483 &Coro::schedule; 573 &Coro::schedule;
484 last unless $r; 574 last unless $r;
485 } 575 }
486 my $w = $self->{fh}->syswrite($buf) 576 my $w = syswrite $self->{fh}, $buf
487 or last; 577 or last;
488 $::written += $w; 578 $::written += $w;
489 $self->{written} += $w; 579 $self->{written} += $w;
490 $l += $r; 580 $l += $r;
491 } 581 }
492 }
493 582
494 close $fh; 583 close $fh;
584 }
495} 585}
496 586
4971; 5871;

Diff Legend

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