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.40 by root, Mon Sep 3 00:06:06 2001 UTC vs.
Revision 1.77 by root, Sat Sep 17 20:21:11 2005 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 14
11# at least on my machine, this thingy serves files 15# at least on my machine, this thingy serves files
13# and quite a bit slower than thttpd :( 17# and quite a bit slower than thttpd :(
14 18
15$SIG{PIPE} = 'IGNORE'; 19$SIG{PIPE} = 'IGNORE';
16 20
17our $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}
18 38
19if ($ACCESS_LOG) { 39if ($ACCESS_LOG) {
20 use IO::Handle; 40 use IO::Handle;
21 open $accesslog, ">>$ACCESS_LOG" 41 open $accesslog, ">>$ACCESS_LOG"
22 or die "$ACCESS_LOG: $!"; 42 or die "$ACCESS_LOG: $!";
24} 44}
25 45
26sub slog { 46sub slog {
27 my $level = shift; 47 my $level = shift;
28 my $format = shift; 48 my $format = shift;
49 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
29 printf "---: $format\n", @_; 50 printf "$NOW: $format\n", @_;
51 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
30} 52}
31 53
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
55our $httpevent = new Coro::Signal;
33 56
34our $wait_factor = 0.95; 57our $queue_file = new transferqueue $MAX_TRANSFERS;
58our $queue_index = new transferqueue 10;
35 59
36our @transfers = ( 60our $tbf_top = new tbf rate => $TBF_RATE || 100000;
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 61
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 62my $unused_bytes = 0;
39); 63my $unused_last = time;
64
65sub unused_bandwidth {
66 $unused_bytes += $_[0];
67 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
68 $unused_last = $NOW;
69 $unused_bytes = 0;
70 $queue_file->force_wake_next;
71 slog 1, "forced filetransfer due to unused bandwidth";
72 }
73}
40 74
41my @newcons; 75my @newcons;
42my @pool; 76my @pool;
43 77
44# one "execution thread" 78# one "execution thread"
47 if (@newcons) { 81 if (@newcons) {
48 eval { 82 eval {
49 conn->new(@{pop @newcons})->handle; 83 conn->new(@{pop @newcons})->handle;
50 }; 84 };
51 slog 1, "$@" if $@ && !ref $@; 85 slog 1, "$@" if $@ && !ref $@;
86
87 $httpevent->broadcast; # only for testing, but doesn't matter much
88
52 $connections->up; 89 $connections->up;
53 } else { 90 } else {
54 last if @pool >= $MAX_POOL; 91 last if @pool >= $MAX_POOL;
55 push @pool, $Coro::current; 92 push @pool, $Coro::current;
56 schedule; 93 schedule;
73 if (@pool) { 110 if (@pool) {
74 (pop @pool)->ready; 111 (pop @pool)->ready;
75 } else { 112 } else {
76 async \&handler; 113 async \&handler;
77 } 114 }
78
79 } 115 }
80 }; 116 };
81} 117}
82 118
83my $http_port = new Coro::Socket 119my $http_port = new Coro::Socket
87 Listen => 50, 123 Listen => 50,
88 or die "unable to start server"; 124 or die "unable to start server";
89 125
90listen_on $http_port; 126listen_on $http_port;
91 127
128if ($SERVER_PORT2) {
92my $http_port = new Coro::Socket 129 my $http_port = new Coro::Socket
93 LocalAddr => $SERVER_HOST, 130 LocalAddr => $SERVER_HOST,
94 LocalPort => $SERVER_PORT2, 131 LocalPort => $SERVER_PORT2,
95 ReuseAddr => 1, 132 ReuseAddr => 1,
96 Listen => 50, 133 Listen => 50,
97 or die "unable to start server"; 134 or die "unable to start server";
98 135
99listen_on $http_port; 136 listen_on $http_port;
100 137}
101our $NOW;
102our $HTTP_NOW;
103
104Event->timer(interval => 1, hard => 1, cb => sub {
105 $NOW = time;
106 $HTTP_NOW = time2str $NOW;
107})->now;
108 138
109package conn; 139package conn;
110 140
111use Socket; 141use Socket;
112use HTTP::Date; 142use HTTP::Date;
113use Convert::Scalar 'weaken'; 143use Convert::Scalar 'weaken';
114use Linux::AIO; 144use IO::AIO;
115 145
116Linux::AIO::min_parallel $::AIO_PARALLEL; 146IO::AIO::min_parallel $::AIO_PARALLEL;
117 147
118Event->io(fd => Linux::AIO::poll_fileno, 148Event->io(fd => IO::AIO::poll_fileno,
119 poll => 'r', async => 1, 149 poll => 'r', async => 1,
120 cb => \&Linux::AIO::poll_cb); 150 cb => \&IO::AIO::poll_cb);
121 151
122our %conn; # $conn{ip}{self} => connobj 152our %conn; # $conn{ip}{self} => connobj
123our %uri; # $uri{ip}{uri}{self} 153our %uri; # $uri{ip}{uri}{self}
124our %blocked; 154our %blocked;
125our %mimetype; 155our %mimetype;
139 169
140read_mimetypes; 170read_mimetypes;
141 171
142sub new { 172sub new {
143 my $class = shift; 173 my $class = shift;
174 my $fh = shift;
144 my $peername = shift; 175 my $peername = shift;
145 my $fh = shift;
146 my $self = bless { fh => $fh }, $class; 176 my $self = bless { fh => $fh }, $class;
147 my (undef, $iaddr) = unpack_sockaddr_in $peername 177 my (undef, $iaddr) = unpack_sockaddr_in $peername
148 or $self->err(500, "unable to decode peername"); 178 or $self->err(500, "unable to decode peername");
149 179
180 $self->{remote_addr} =
150 $self->{remote_addr} = inet_ntoa $iaddr; 181 $self->{remote_id} = inet_ntoa $iaddr;
182
151 $self->{time} = $::NOW; 183 $self->{time} = $::NOW;
152 184
185 weaken ($Coro::current->{conn} = $self);
186
153 $::conns++; 187 $::conns++;
188 $::maxconns = $::conns if $::conns > $::maxconns;
154 189
155 $self; 190 $self;
156} 191}
157 192
158sub DESTROY { 193sub DESTROY {
159 my $self = shift; 194 #my $self = shift;
160 $::conns--; 195 $::conns--;
161 $self->eoconn;
162} 196}
163 197
164# end of connection 198sub prune_cache {
165sub eoconn { 199 my $hash = $_[0];
166 my $self = shift;
167 200
168 # clean up hints 201 for (keys %$hash) {
169 delete $conn{$self->{remote_id}}{$self*1}; 202 if (ref $hash->{$_} eq HASH::) {
170 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 203 prune_cache($hash->{$_});
204 unless (scalar keys %{$hash->{$_}}) {
205 delete $hash->{$_};
206 $d2++;
207 }
208 }
209 }
171} 210}
211
212sub prune_caches {
213 prune_cache \%conn;
214 prune_cache \%uri;
215
216 for (keys %blocked) {
217 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
218 }
219}
220
221Event->timer(interval => 60, cb => \&prune_caches);
172 222
173sub slog { 223sub slog {
174 my $self = shift; 224 my $self = shift;
175 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 225 main::slog($_[0], "$self->{remote_id}> $_[1]");
176} 226}
177 227
178sub response { 228sub response {
179 my ($self, $code, $msg, $hdr, $content) = @_; 229 my ($self, $code, $msg, $hdr, $content) = @_;
180 my $res = "HTTP/1.1 $code $msg\015\012"; 230 my $res = "HTTP/1.1 $code $msg\015\012";
231 my $GZ = "";
181 232
182 $self->{h}{connection} ||= $hdr->{Connection}; 233 if (exists $hdr->{Connection}) {
234 if ($hdr->{Connection} =~ /close/) {
235 $self->{h}{connection} = "close"
236 }
237 } else {
238 if ($self->{version} < 1.1) {
239 if ($self->{h}{connection} =~ /keep-alive/i) {
240 $hdr->{Connection} = "Keep-Alive";
241 } else {
242 $self->{h}{connection} = "close"
243 }
244 }
245 }
246
247 if ($self->{method} ne "HEAD"
248 && $self->{h}{"accept-encoding"} =~ /\bgzip\b/
249 && 400 < length $content
250 && $hdr->{"Content-Length"} == length $content
251 && !exists $hdr->{"Content-Encoding"}
252 ) {
253 my $orig = length $content;
254 $hdr->{"Content-Encoding"} = "gzip";
255 $content = Compress::Zlib::memGzip(\$content);
256 $hdr->{"Content-Length"} = length $content;
257 $GZ = sprintf "GZ%02d", 100 - 100*((length $content) / $orig);
258 }
183 259
184 $res .= "Date: $HTTP_NOW\015\012"; 260 $res .= "Date: $HTTP_NOW\015\012";
261 $res .= "Server: $::NAME\015\012";
185 262
186 while (my ($h, $v) = each %$hdr) { 263 while (my ($h, $v) = each %$hdr) {
187 $res .= "$h: $v\015\012" 264 $res .= "$h: $v\015\012"
188 } 265 }
189 $res .= "\015\012"; 266 $res .= "\015\012";
190 267
191 $res .= $content if defined $content and $self->{method} ne "HEAD"; 268 $res .= $content if defined $content and $self->{method} ne "HEAD";
192 269
193 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 270 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW).
271 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.$GZ.
272 " \"$self->{h}{referer}\"\n";
194 273
195 print $accesslog $log if $accesslog; 274 print $::accesslog $log if $::accesslog;
196 print STDERR $log; 275 print STDERR $log;
197 276
198 $self->{written} += 277 $tbf_top->request(length $res, 1e6);
199 print {$self->{fh}} $res; 278 $self->{written} += print {$self->{fh}} $res;
200} 279}
201 280
202sub err { 281sub err {
203 my $self = shift; 282 my $self = shift;
204 my ($code, $msg, $hdr, $content) = @_; 283 my ($code, $msg, $hdr, $content) = @_;
259 my (%hdr, $h, $v); 338 my (%hdr, $h, $v);
260 339
261 $hdr{lc $1} .= ",$2" 340 $hdr{lc $1} .= ",$2"
262 while $req =~ /\G 341 while $req =~ /\G
263 ([^:\000-\040]+): 342 ([^:\000-\040]+):
264 [\008\040]* 343 [\011\040]*
265 ((?: [^\015\012]+ | \015\012[\008\040] )*) 344 ((?: [^\015\012]+ | \015\012[\011\040] )*)
266 \015\012 345 \015\012
267 /gxc; 346 /gxc;
268 347
269 $req =~ /\G\015\012$/ 348 $req =~ /\G\015\012$/
270 or $self->err(400, "bad request"); 349 or $self->err(400, "bad request");
282 $id .= "[".$self->{h}{"x-forwarded-for"}."]"; 361 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
283 } 362 }
284 363
285 $self->{remote_id} = $id; 364 $self->{remote_id} = $id;
286 365
366 weaken (local $conn{$id}{$self*1} = $self);
367
287 if ($blocked{$id}) { 368 if ($blocked{$id}) {
288 $self->err_blocked($blocked{$id}) 369 $self->err_blocked
289 if $blocked{$id} > $::NOW; 370 if $blocked{$id}[0] > $::NOW;
290 371
291 delete $blocked{$id}; 372 delete $blocked{$id};
292 }
293
294 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
295 my $delay = $::PER_TIMEOUT + 15;
296 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
297 if ($delay <= 0) {
298 $self->slog(2, "blocked ip $id");
299 $self->err_blocked;
300 } else {
301 Coro::Event::do_timer(after => 4); $delay -= 4;
302 }
303 }
304 } 373 }
305 374
306 # find out server name and port 375 # find out server name and port
307 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 376 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
308 $host = $1; 377 $host = $1;
312 381
313 if (defined $host) { 382 if (defined $host) {
314 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 383 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
315 } else { 384 } else {
316 ($self->{server_port}, $host) 385 ($self->{server_port}, $host)
317 = unpack_sockaddr_in $self->{fh}->getsockname 386 = unpack_sockaddr_in $self->{fh}->sockname
318 or $self->err(500, "unable to get socket name"); 387 or $self->err(500, "unable to get socket name");
319 $host = inet_ntoa $host; 388 $host = inet_ntoa $host;
320 } 389 }
321 390
322 $self->{server_name} = $host; 391 $self->{server_name} = $host;
323 392
324 # enter ourselves into various lists
325 weaken ($conn{$id}{$self*1} = $self);
326 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self); 393 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
327 394
328 eval { 395 eval {
329 $self->map_uri; 396 $self->map_uri;
330 $self->respond; 397 $self->respond;
331 }; 398 };
332 399
333 $self->eoconn;
334
335 die if $@ && !ref $@; 400 die if $@ && !ref $@;
336 401
337 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 402 last if $self->{h}{connection} =~ /close/i;
403
404 $httpevent->broadcast;
338 405
339 $fh->timeout($::PER_TIMEOUT); 406 $fh->timeout($::PER_TIMEOUT);
340 } 407 }
408}
409
410sub block {
411 my $self = shift;
412
413 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
414 $self->slog(2, "blocked ip $self->{remote_id}");
415 $self->err_blocked;
341} 416}
342 417
343# uri => path mapping 418# uri => path mapping
344sub map_uri { 419sub map_uri {
345 my $self = shift; 420 my $self = shift;
392 467
393sub respond { 468sub respond {
394 my $self = shift; 469 my $self = shift;
395 my $path = $self->{path}; 470 my $path = $self->{path};
396 471
397 stat $path 472 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
398 or $self->err(404, "not found"); 473 if ($::internal{$1}) {
399 474 $::internal{$1}->($self);
400 $self->{stat} = [stat _];
401
402 # idiotic netscape sends idiotic headers AGAIN
403 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
404 ? str2time $1 : 0;
405
406 if (-d _ && -r _) {
407 # directory
408 if ($path !~ /\/$/) {
409 # create a redirect to get the trailing "/"
410 # we don't try to avoid the :80
411 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
412 } else { 475 } else {
413 $ims < $self->{stat}[9] 476 $self->err(404, "not found");
477 }
478 } else {
479
480 stat $path
414 or $self->err(304, "not modified"); 481 or $self->err(404, "not found");
415 482
416 if (-r "$path/index.html") { 483 $self->{stat} = [stat _];
417 $self->{path} .= "/index.html"; 484
418 $self->handle_file; 485 # idiotic netscape sends idiotic headers AGAIN
486 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
487 ? str2time $1 : 0;
488
489 if (-d _ && -r _) {
490 # directory
491 if ($path !~ /\/$/) {
492 # create a redirect to get the trailing "/"
493 # we don't try to avoid the :80
494 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
419 } else { 495 } else {
496 $ims < $self->{stat}[9]
497 or $self->err(304, "not modified");
498
499 if (-r "$path/index.html") {
500 # replace directory "size" by index.html filesize
501 $self->{stat} = [stat ($self->{path} .= "/index.html")];
502 $self->handle_file($queue_index, $tbf_top);
503 } else {
420 $self->handle_dir; 504 $self->handle_dir;
421 } 505 }
422 } 506 }
423 } elsif (-f _ && -r _) { 507 } elsif (-f _ && -r _) {
424 -x _ and $self->err(403, "forbidden"); 508 -x _ and $self->err(403, "forbidden");
425 $self->handle_file; 509
510 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
511 my $timeout = $::NOW + 10;
512 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
513 if ($timeout < $::NOW) {
514 $self->block($::BLOCKTIME, "too many connections");
515 } else {
516 $httpevent->wait;
517 }
518 }
519 }
520
521 $self->handle_file($queue_file, $tbf_top);
426 } else { 522 } else {
427 $self->err(404, "not found"); 523 $self->err(404, "not found");
524 }
428 } 525 }
429} 526}
430 527
431sub handle_dir { 528sub handle_dir {
432 my $self = shift; 529 my $self = shift;
433 my $idx = $self->diridx; 530 my $idx = $self->diridx;
434 531
435 $self->response(200, "ok", 532 $self->response(200, "ok",
436 { 533 {
437 "Content-Type" => "text/html", 534 "Content-Type" => "text/html; charset=utf-8",
438 "Content-Length" => length $idx, 535 "Content-Length" => length $idx,
536 "Last-Modified" => time2str ($self->{stat}[9]),
439 }, 537 },
440 $idx); 538 $idx);
441} 539}
442 540
443sub handle_file { 541sub handle_file {
444 my $self = shift; 542 my ($self, $queue, $tbf) = @_;
445 my $length = $self->{stat}[7]; 543 my $length = $self->{stat}[7];
446 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
447 my $hdr = { 544 my $hdr = {
448 "Last-Modified" => time2str ((stat _)[9]), 545 "Last-Modified" => time2str ((stat _)[9]),
546 "Accept-Ranges" => "bytes",
449 }; 547 };
450 548
451 my @code = (200, "ok"); 549 my @code = (200, "ok");
452 my ($l, $h); 550 my ($l, $h);
453 551
468 $self->err(416, "not satisfiable", $hdr, ""); 566 $self->err(416, "not satisfiable", $hdr, "");
469 567
470satisfiable: 568satisfiable:
471 # check for segmented downloads 569 # check for segmented downloads
472 if ($l && $::NO_SEGMENTED) { 570 if ($l && $::NO_SEGMENTED) {
473 my $delay = $::PER_TIMEOUT + 15; 571 my $timeout = $::NOW + 15;
474 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 572 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
475 if ($delay <= 0) { 573 if ($timeout <= $::NOW) {
574 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
476 $self->err_segmented_download; 575 #$self->err_segmented_download;
477 } else { 576 } else {
478 Coro::Event::do_timer(after => 4); $delay -= 4; 577 $httpevent->wait;
479 } 578 }
480 } 579 }
481 } 580 }
482 581
483 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 582 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
495 594
496 $self->response(@code, $hdr, ""); 595 $self->response(@code, $hdr, "");
497 596
498 if ($self->{method} eq "GET") { 597 if ($self->{method} eq "GET") {
499 $self->{time} = $::NOW; 598 $self->{time} = $::NOW;
500
501 my $fudge = $queue->[0]->waiters;
502 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
503
504 $queue->[1] *= $fudge;
505 my $transfer = $queue->[0]->guard;
506
507 if ($fudge != 1) {
508 $queue->[1] /= $fudge;
509 $queue->[1] = $queue->[1] * $::wait_factor
510 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
511 }
512 $self->{time} = $::NOW; 599 $self->{written} = 0;
513 600
514 $self->{fh}->writable or return; 601 my $current = $Coro::current;
515 602
516 my ($fh, $buf, $r); 603 my ($fh, $buf, $r);
517 my $current = $Coro::current; 604
518 open $fh, "<", $self->{path} 605 open $fh, "<", $self->{path}
519 or die "$self->{path}: late open failure ($!)"; 606 or die "$self->{path}: late open failure ($!)";
520 607
521 $h -= $l - 1; 608 $h -= $l - 1;
522 609
523 if (0) { 610 if (0) { # !AIO
524 if ($l) { 611 if ($l) {
525 sysseek $fh, $l, 0; 612 sysseek $fh, $l, 0;
526 } 613 }
527 } 614 }
615
616 my $transfer = $queue->start_transfer($h);
617 my $locked;
618 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
528 619
529 while ($h > 0) { 620 while ($h > 0) {
621 unless ($locked) {
622 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
623 $bufsize = $::BUFSIZE;
624 $self->{time} = $::NOW;
625 $self->{written} = 0;
626 }
627 }
628
629 if ($blocked{$self->{remote_id}}) {
630 $self->{h}{connection} = "close";
631 die bless {}, err::;
632 }
633
530 if (0) { 634 if (0) { # !AIO
531 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 635 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
532 or last; 636 or last;
533 } else { 637 } else {
534 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 638 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
535 $buf, 0, sub { 639 $buf, 0, sub {
536 $r = $_[0]; 640 $r = $_[0];
537 Coro::ready($current); 641 Coro::ready($current);
538 }); 642 });
539 &Coro::schedule; 643 &Coro::schedule;
540 last unless $r; 644 last unless $r;
541 } 645 }
646
647 $tbf->request(length $buf);
542 my $w = syswrite $self->{fh}, $buf 648 my $w = syswrite $self->{fh}, $buf
543 or last; 649 or last;
544 $::written += $w; 650 $::written += $w;
545 $self->{written} += $w; 651 $self->{written} += $w;
546 $l += $r; 652 $l += $r;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines