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

Diff Legend

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