ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/Coro/myhttpd/httpd.pl
(Generate patch)

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

Diff Legend

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