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

Diff Legend

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