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.47 by root, Tue Nov 20 01:56:21 2001 UTC vs.
Revision 1.48 by root, Tue Nov 27 03:38:08 2001 UTC

… …
35our $httpevent = new Coro::Signal; 35our $httpevent = new Coro::Signal;
36 36
37our $wait_factor = 0.95; 37our $wait_factor = 0.95;
38 38
39our @transfers = ( 39our @transfers = (
40 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 40 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL), 1],
41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE), 1],
42); 42);
43 43
44my @newcons; 44my @newcons;
45my @pool; 45my @pool;
46 46
… …
524 524
525 my $fudge = $queue->[0]->waiters; 525 my $fudge = $queue->[0]->waiters;
526 $fudge = $fudge ? ($fudge+1)/$fudge : 1; 526 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
527 527
528 $queue->[1] *= $fudge; 528 $queue->[1] *= $fudge;
529 my $transfer = $queue->[0]->guard;
530
531 if ($fudge != 1) {
532 $queue->[1] /= $fudge;
533 $queue->[1] = $queue->[1] * $::wait_factor
534 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
535 }
536 $self->{time} = $::NOW;
537
538 $self->{fh}->writable or return;
539 529
540 my ($fh, $buf, $r); 530 my ($fh, $buf, $r);
541 my $current = $Coro::current; 531 my $current = $Coro::current;
542 open $fh, "<", $self->{path} 532 open $fh, "<", $self->{path}
543 or die "$self->{path}: late open failure ($!)"; 533 or die "$self->{path}: late open failure ($!)";
… …
547 if (0) { 537 if (0) {
548 if ($l) { 538 if ($l) {
549 sysseek $fh, $l, 0; 539 sysseek $fh, $l, 0;
550 } 540 }
551 } 541 }
542
543 my $transfer; # transfer guard
544 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
552 545
553 while ($h > 0) { 546 while ($h > 0) {
547 unless ($transfer) {
548 if ($transfer ||= $queue->[0]->timed_guard($::WAIT_INTERVAL)) {
549 if ($fudge != 1) {
550 $queue->[1] /= $fudge;
551 $queue->[1] = $queue->[1] * $::wait_factor
552 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
553 }
554 $bufsize = $::BUFSIZE;
555 $self->{time} = $::NOW;
556 }
557 }
558
554 if (0) { 559 if (0) {
555 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 560 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
556 or last; 561 or last;
557 } else { 562 } else {
558 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 563 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
559 $buf, 0, sub { 564 $buf, 0, sub {
560 $r = $_[0]; 565 $r = $_[0];
561 Coro::ready($current); 566 Coro::ready($current);
562 }); 567 });
563 &Coro::schedule; 568 &Coro::schedule;

Diff Legend

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