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

Diff Legend

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