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.5 by root, Fri Aug 10 15:58:04 2001 UTC vs.
Revision 1.43 by root, Wed Sep 12 20:29:43 2001 UTC

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

Diff Legend

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