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

Diff Legend

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