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.16 by root, Tue Aug 14 19:38:25 2001 UTC vs.
Revision 1.47 by root, Tue Nov 20 01:56:21 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 Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1],
41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1],
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;
… …
75use Linux::AIO; 119use Linux::AIO;
76 120
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', 124 poll => 'r', async => 1,
81 async => 1,
82 cb => \&Linux::AIO::poll_cb ); 125 cb => \&Linux::AIO::poll_cb);
83 126
84Event->add_hooks(prepare => sub {
85 &Coro::cede while &Coro::nready;
86 1e6;
87});
88
89our %conn; # $conn{ip}{fh} => connobj 127our %conn; # $conn{ip}{self} => connobj
128our %uri; # $uri{ip}{uri}{self}
90our %blocked; 129our %blocked;
91our %mimetype; 130our %mimetype;
92 131
93sub read_mimetypes { 132sub read_mimetypes {
94 local *M; 133 local *M;
… …
105 144
106read_mimetypes; 145read_mimetypes;
107 146
108sub new { 147sub new {
109 my $class = shift; 148 my $class = shift;
149 my $fh = shift;
110 my $peername = shift; 150 my $peername = shift;
111 my $fh = shift;
112 my $self = bless { fh => $fh }, $class; 151 my $self = bless { fh => $fh }, $class;
113 my (undef, $iaddr) = unpack_sockaddr_in $peername 152 my (undef, $iaddr) = unpack_sockaddr_in $peername
114 or $self->err(500, "unable to decode peername"); 153 or $self->err(500, "unable to decode peername");
115 154
116 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_addr} = inet_ntoa $iaddr;
117 $self->{time} = $::NOW; 156 $self->{time} = $::NOW;
118 157
119 # enter ourselves into various lists
120 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
121
122 $::conns++; 158 $::conns++;
123 159
124 $self; 160 $self;
125} 161}
126 162
127sub DESTROY { 163sub DESTROY {
128 my $self = shift; 164 my $self = shift;
129
130 $::conns--; 165 $::conns--;
166 $self->eoconn;
167}
131 168
169# end of connection
170sub eoconn {
171 my $self = shift;
172
173 # clean up hints
132 delete $conn{$self->{remote_addr}}{$self*1}; 174 delete $conn{$self->{remote_id}}{$self*1};
133 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 175 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
176
177 $httpevent->broadcast;
134} 178}
135 179
136sub slog { 180sub slog {
137 my $self = shift; 181 my $self = shift;
138 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
139} 183}
140 184
141sub response { 185sub response {
142 my ($self, $code, $msg, $hdr, $content) = @_; 186 my ($self, $code, $msg, $hdr, $content) = @_;
143 my $res = "HTTP/1.0 $code $msg\015\012"; 187 my $res = "HTTP/1.1 $code $msg\015\012";
144 188
145 $res .= "Connection: close\015\012"; 189 if (exists $hdr->{Connection}) {
146 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 190 if ($hdr->{Connection} =~ /close/) {
191 $self->{h}{connection} = "close"
192 }
193 } else {
194 if ($self->{version} < 1.1) {
195 if ($self->{h}{connection} =~ /keep-alive/i) {
196 $hdr->{Connection} = "Keep-Alive";
197 } else {
198 $self->{h}{connection} = "close"
199 }
200 }
201 }
202
203 $res .= "Date: $HTTP_NOW\015\012";
147 204
148 while (my ($h, $v) = each %$hdr) { 205 while (my ($h, $v) = each %$hdr) {
149 $res .= "$h: $v\015\012" 206 $res .= "$h: $v\015\012"
150 } 207 }
151 $res .= "\015\012"; 208 $res .= "\015\012";
152 209
153 $res .= $content if defined $content and $self->{method} ne "HEAD"; 210 $res .= $content if defined $content and $self->{method} ne "HEAD";
154 211
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
155 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 213 " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
214
215 print $accesslog $log if $accesslog;
216 print STDERR $log;
156 217
157 $self->{written} += 218 $self->{written} +=
158 print {$self->{fh}} $res; 219 print {$self->{fh}} $res;
159} 220}
160 221
161sub err { 222sub err {
162 my $self = shift; 223 my $self = shift;
163 my ($code, $msg, $hdr, $content) = @_; 224 my ($code, $msg, $hdr, $content) = @_;
164 225
165 unless (defined $content) { 226 unless (defined $content) {
166 $content = "$code $msg"; 227 $content = "$code $msg\n";
167 $hdr->{"Content-Type"} = "text/plain"; 228 $hdr->{"Content-Type"} = "text/plain";
168 $hdr->{"Content-Length"} = length $content; 229 $hdr->{"Content-Length"} = length $content;
169 } 230 }
231 $hdr->{"Connection"} = "close";
170 232
171 $self->response($code, $msg, $hdr, $content); 233 $self->response($code, $msg, $hdr, $content);
172 234
173 die bless {}, err::; 235 die bless {}, err::;
174} 236}
175 237
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 { 238sub handle {
202 my $self = shift; 239 my $self = shift;
203 my $fh = $self->{fh}; 240 my $fh = $self->{fh};
204 241
242 my $host;
243
244 $fh->timeout($::REQ_TIMEOUT);
205 #while() { 245 while() {
246 $self->{reqs}++;
247
248 # read request and parse first line
249 my $req = $fh->readline("\015\012\015\012");
250
251 unless (defined $req) {
252 if (exists $self->{version}) {
253 last;
254 } else {
255 $self->err(408, "request timeout");
256 }
257 }
258
206 $self->{h} = {}; 259 $self->{h} = {};
207 260
208 # read request and parse first line
209 $fh->timeout($::REQ_TIMEOUT);
210 my $req = $fh->readline("\015\012\015\012");
211 $fh->timeout($::RES_TIMEOUT); 261 $fh->timeout($::RES_TIMEOUT);
212
213 defined $req or
214 $self->err(408, "request timeout");
215
216 my $ip = $self->{remote_addr};
217
218 if ($blocked{$ip}) {
219 $self->err_blocked($blocked{$ip})
220 if $blocked{$ip} > $::NOW;
221
222 delete $blocked{$ip};
223 }
224
225 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
226 $self->slog(2, "blocked ip $ip");
227 $self->err_blocked;
228 }
229 262
230 $req =~ /^(?:\015\012)? 263 $req =~ /^(?:\015\012)?
231 (GET|HEAD) \040+ 264 (GET|HEAD) \040+
232 ([^\040]+) \040+ 265 ([^\040]+) \040+
233 HTTP\/([0-9]+\.[0-9]+) 266 HTTP\/([0-9]+\.[0-9]+)
234 \015\012/gx 267 \015\012/gx
235 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" }); 268 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
236 269
237 $2 ne "1.0"
238 or $self->err(506, "http protocol version not supported");
239
240 $self->{method} = $1; 270 $self->{method} = $1;
241 $self->{uri} = $2; 271 $self->{uri} = $2;
272 $self->{version} = $3;
273
274 $3 =~ /^1\./
275 or $self->err(506, "http protocol version $3 not supported");
242 276
243 # parse headers 277 # parse headers
244 { 278 {
245 my (%hdr, $h, $v); 279 my (%hdr, $h, $v);
246 280
… …
257 291
258 $self->{h}{$h} = substr $v, 1 292 $self->{h}{$h} = substr $v, 1
259 while ($h, $v) = each %hdr; 293 while ($h, $v) = each %hdr;
260 } 294 }
261 295
296 # remote id should be unique per user
297 my $id = $self->{remote_addr};
298
299 if (exists $self->{h}{"client-ip"}) {
300 $id .= "[".$self->{h}{"client-ip"}."]";
301 } elsif (exists $self->{h}{"x-forwarded-for"}) {
302 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
303 }
304
305 $self->{remote_id} = $id;
306
307 if ($blocked{$id}) {
308 $self->err_blocked($blocked{$id})
309 if $blocked{$id} > $::NOW;
310
311 delete $blocked{$id};
312 }
313
314 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
315 my $delay = $::PER_TIMEOUT + $::NOW + 15;
316 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
317 if ($delay < $::NOW) {
318 $self->slog(2, "blocked ip $id");
319 $self->err_blocked;
320 } else {
321 $httpevent->wait;
322 }
323 }
324 }
325
326 # find out server name and port
327 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
328 $host = $1;
329 } else {
330 $host = $self->{h}{host};
331 }
332
333 if (defined $host) {
262 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 334 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
335 } else {
336 ($self->{server_port}, $host)
337 = unpack_sockaddr_in $self->{fh}->sockname
338 or $self->err(500, "unable to get socket name");
339 $host = inet_ntoa $host;
340 }
263 341
342 $self->{server_name} = $host;
343
344 # enter ourselves into various lists
345 weaken ($conn{$id}{$self*1} = $self);
264 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 346 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
265 347
348 eval {
266 $self->map_uri; 349 $self->map_uri;
267 $self->respond; 350 $self->respond;
351 };
352
353 $self->eoconn;
354
355 die if $@ && !ref $@;
356
357 last if $self->{h}{connection} =~ /close/;
358
359 $httpevent->broadcast;
360
361 $fh->timeout($::PER_TIMEOUT);
268 #} 362 }
269} 363}
270 364
271# uri => path mapping 365# uri => path mapping
272sub map_uri { 366sub map_uri {
273 my $self = shift; 367 my $self = shift;
274 my $host = $self->{h}{host} || "default"; 368 my $host = $self->{server_name};
275 my $uri = $self->{uri}; 369 my $uri = $self->{uri};
276 370
277 # some massaging, also makes it more secure 371 # some massaging, also makes it more secure
278 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 372 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
279 $uri =~ s%//+%/%g; 373 $uri =~ s%//+%/%g;
… …
289 $self->{path} = "$::DOCROOT/$host$uri"; 383 $self->{path} = "$::DOCROOT/$host$uri";
290 384
291 $self->access_check; 385 $self->access_check;
292} 386}
293 387
294sub server_address {
295 my $self = shift;
296 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
297 or $self->err(500, "unable to get socket name");
298 ((inet_ntoa $iaddr), $port);
299}
300
301sub server_host {
302 my $self = shift;
303 if (exists $self->{h}{host}) {
304 return $self->{h}{host};
305 } else {
306 return (($self->server_address)[0]);
307 }
308}
309
310sub server_hostport {
311 my $self = shift;
312 my ($host, $port);
313 if (exists $self->{h}{host}) {
314 ($host, $port) = ($self->{h}{host}, $self->{server_port});
315 } else {
316 ($host, $port) = $self->server_address;
317 }
318 $port = $port == 80 ? "" : ":$port";
319 $host.$port;
320}
321
322sub _cgi { 388sub _cgi {
323 my $self = shift; 389 my $self = shift;
324 my $path = shift; 390 my $path = shift;
325 my $fh; 391 my $fh;
326 392
327 # no two-way xxx supported 393 # no two-way xxx supported
328 if (0 == fork) { 394 if (0 == fork) {
329 open STDOUT, ">&".fileno($self->{fh}); 395 open STDOUT, ">&".fileno($self->{fh});
330 if (chdir $::DOCROOT) { 396 if (chdir $::DOCROOT) {
331 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 397 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
332 $ENV{HTTP_HOST} = $self->server_host; 398 $ENV{HTTP_HOST} = $self->{server_name};
333 $ENV{HTTP_PORT} = $self->{server_host}; 399 $ENV{HTTP_PORT} = $self->{server_port};
334 $ENV{SCRIPT_NAME} = $self->{name}; 400 $ENV{SCRIPT_NAME} = $self->{name};
335 exec $path; 401 exec $path;
336 } 402 }
337 Coro::State::_exit(0); 403 Coro::State::_exit(0);
338 } else { 404 } else {
405 die;
339 } 406 }
407}
408
409sub server_hostport {
410 $_[0]{server_port} == 80
411 ? $_[0]{server_name}
412 : "$_[0]{server_name}:$_[0]{server_port}";
340} 413}
341 414
342sub respond { 415sub respond {
343 my $self = shift; 416 my $self = shift;
344 my $path = $self->{path}; 417 my $path = $self->{path};
… …
354 427
355 if (-d _ && -r _) { 428 if (-d _ && -r _) {
356 # directory 429 # directory
357 if ($path !~ /\/$/) { 430 if ($path !~ /\/$/) {
358 # create a redirect to get the trailing "/" 431 # create a redirect to get the trailing "/"
359 my $host = $self->server_hostport; 432 # we don't try to avoid the :80
360 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" }); 433 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
361 } else { 434 } else {
362 $ims < $self->{stat}[9] 435 $ims < $self->{stat}[9]
363 or $self->err(304, "not modified"); 436 or $self->err(304, "not modified");
364 437
365 if ($self->{method} eq "GET") {
366 if (-r "$path/index.html") { 438 if (-r "$path/index.html") {
367 $self->{path} .= "/index.html"; 439 # replace directory "size" by index.html filesize
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
368 $self->handle_file; 441 $self->handle_file;
369 } else { 442 } else {
370 $self->handle_dir; 443 $self->handle_dir;
371 }
372 } 444 }
373 } 445 }
374 } elsif (-f _ && -r _) { 446 } elsif (-f _ && -r _) {
375 -x _ and $self->err(403, "forbidden"); 447 -x _ and $self->err(403, "forbidden");
376 $self->handle_file; 448 $self->handle_file;
… …
385 457
386 $self->response(200, "ok", 458 $self->response(200, "ok",
387 { 459 {
388 "Content-Type" => "text/html", 460 "Content-Type" => "text/html",
389 "Content-Length" => length $idx, 461 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]),
390 }, 463 },
391 $idx); 464 $idx);
392} 465}
393 466
394sub handle_file { 467sub handle_file {
395 my $self = shift; 468 my $self = shift;
396 my $length = -s _; 469 my $length = $self->{stat}[7];
470 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
397 my $hdr = { 471 my $hdr = {
398 "Last-Modified" => time2str ((stat _)[9]), 472 "Last-Modified" => time2str ((stat _)[9]),
399 }; 473 };
400 474
401 my @code = (200, "ok"); 475 my @code = (200, "ok");
… …
409 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 483 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
410 } else { 484 } else {
411 ($l, $h) = (0, $length - 1); 485 ($l, $h) = (0, $length - 1);
412 goto ignore; 486 goto ignore;
413 } 487 }
414 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 488 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
415 } 489 }
416 $hdr->{"Content-Range"} = "bytes */$length"; 490 $hdr->{"Content-Range"} = "bytes */$length";
491 $hdr->{"Content-Length"} = $length;
417 $self->err(416, "not satisfiable", $hdr); 492 $self->err(416, "not satisfiable", $hdr, "");
418 493
419satisfiable: 494satisfiable:
420 # check for segmented downloads 495 # check for segmented downloads
421 if ($l && $::NO_SEGMENTED) { 496 if ($l && $::NO_SEGMENTED) {
497 my $delay = $::NOW + $::PER_TIMEOUT + 15;
422 if (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
423 Coro::Event::do_timer(after => 15); 499 if ($delay <= $::NOW) {
424 500 $self->err_segmented_download;
425 $self->err(400, "segmented downloads are not allowed"); 501 } else {
502 $httpevent->wait;
503 }
426 } 504 }
427 } 505 }
428 506
429 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 507 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
430 @code = (206, "partial content"); 508 @code = (206, "partial content");
… …
440 $hdr->{"Content-Length"} = $length; 518 $hdr->{"Content-Length"} = $length;
441 519
442 $self->response(@code, $hdr, ""); 520 $self->response(@code, $hdr, "");
443 521
444 if ($self->{method} eq "GET") { 522 if ($self->{method} eq "GET") {
523 $self->{time} = $::NOW;
524
525 my $fudge = $queue->[0]->waiters;
526 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
527
528 $queue->[1] *= $fudge;
529 my $transfer = $queue->[0]->guard;
530
531 if ($fudge != 1) {
532 $queue->[1] /= $fudge;
533 $queue->[1] = $queue->[1] * $::wait_factor
534 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
535 }
536 $self->{time} = $::NOW;
537
538 $self->{fh}->writable or return;
539
445 my ($fh, $buf, $r); 540 my ($fh, $buf, $r);
446 my $current = $Coro::current; 541 my $current = $Coro::current;
447 open $fh, "<", $self->{path} 542 open $fh, "<", $self->{path}
448 or die "$self->{path}: late open failure ($!)"; 543 or die "$self->{path}: late open failure ($!)";
449 544
450 $h -= $l - 1; 545 $h -= $l - 1;
451 546
547 if (0) {
548 if ($l) {
549 sysseek $fh, $l, 0;
550 }
551 }
552
452 while ($h > 0) { 553 while ($h > 0) {
554 if (0) {
555 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
556 or last;
557 } else {
453 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 558 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
454 $buf, 0, sub { 559 $buf, 0, sub {
455 $r = $_[0]; 560 $r = $_[0];
456 $current->ready; 561 Coro::ready($current);
457 }); 562 });
458 &Coro::schedule; 563 &Coro::schedule;
459 last unless $r; 564 last unless $r;
460 my $w = $self->{fh}->syswrite($buf) 565 }
566 my $w = syswrite $self->{fh}, $buf
461 or last; 567 or last;
462 $::written += $w; 568 $::written += $w;
463 $self->{written} += $w; 569 $self->{written} += $w;
464 $l += $r; 570 $l += $r;
465 } 571 }
466 }
467 572
468 close $fh; 573 close $fh;
574 }
469} 575}
470 576
4711; 5771;

Diff Legend

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