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

Diff Legend

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