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

Comparing Coro/myhttpd/access.pl (file contents):
Revision 1.16 by root, Fri Nov 30 05:11:23 2001 UTC vs.
Revision 1.23 by root, Mon Dec 3 15:16:42 2001 UTC

1package transferqueue; 1package transferqueue;
2 2
3sub new { 3sub new {
4 my $class = shift; 4 my $class = shift;
5 bless { 5 bless {
6 conns => $_[0], 6 slots => $_[0],
7 lastspb => 0,
8 avgspb => 0,
7 }, $class; 9 }, $class;
8} 10}
9 11
10sub start_transfer { 12sub start_transfer {
11 my $self = shift; 13 my $self = shift;
14 my $size = $_[0];
12 15
13 my $trans = bless [ $self ], transfer::; 16 my $transfer = bless {
14 Scalar::Util::weaken($trans->[0]); 17 queue => $self,
18 time => $::NOW,
19 size => $size,
20 coro => $Coro::current,
21 started => 0,
22 }, transfer::;
15 23
16 push @{$self->{wait}}, $trans; 24 push @{$self->{wait}}, $transfer;
17 Scalar::Util::weaken($self->{wait}[-1]);
18 25
19 --$self->{conns};
20 $self->wake_next; 26 $self->wake_next;
21 27
22 $trans; 28 $transfer;
29}
30
31sub sort {
32 my @queue = grep $_, @{$_[0]{wait}};
33
34 $_->{spb} = ($::NOW-$_->{time}) / ($_->{size} || 1) for @queue;
35
36 $_[0]{wait} = [sort { $b->{spb} <=> $a->{spb} } @queue];
37
38 Scalar::Util::weaken $_ for @{$_[0]{wait}};
23} 39}
24 40
25sub wake_next { 41sub wake_next {
26 my $self = shift; 42 my $self = shift;
27 43
28 if ($self->{conns} >= 0) { 44 $self->sort;
29 while(@{$self->{wait}}) { 45
46 while($self->{slots} > 0 && @{$self->{wait}}) {
30 my $transfer = shift @{$self->{wait}}; 47 my $transfer = shift @{$self->{wait}};
31 if ($transfer) { 48 if ($transfer) {
49 $self->{lastspb} = $transfer->{spb};
50 $self->{avgspb} ||= $transfer->{spb};
51 $self->{avgspb} = $self->{avgspb} * 0.95 + $transfer->{spb} * 0.05;
52 $self->{started}++;
32 $transfer->wake; 53 $transfer->wake;
33 last; 54 last;
34 }
35 } 55 }
36 } 56 }
37} 57}
38 58
39sub waiters { 59sub waiters {
40 map $_->[1], @{$_[0]{wait}}; 60 $_[0]->sort;
61 @{$_[0]{wait}};
41} 62}
42 63
43package transfer; 64package transfer;
44 65
45use Coro::Timer (); 66use Coro::Timer ();
46 67
47sub wake { 68sub wake {
48 my $self = shift; 69 my $self = shift;
70
49 $self->[2] = 1; 71 $self->{alloc} = 1;
50 ref $self->[1] and $self->[1]->ready; 72 $self->{queue}{slots}--;
73 $self->{wake} and $self->{wake}->ready;
51} 74}
52 75
53sub try { 76sub try {
54 my $self = shift; 77 my $self = shift;
55 78
56 unless ($self->[2]) { 79 $self->{alloc} || do {
57 my $timeout = Coro::Timer::timeout $_[0]; 80 my $timeout = Coro::Timer::timeout $_[0];
58 $self->[1] = $Coro::current; 81 local $self->{wake} = $self->{coro};
59 82
60 Coro::schedule; 83 Coro::schedule;
61 84
62 undef $self->[1]; 85 $self->{alloc};
63 } 86 }
64
65 return $self->[2];
66} 87}
67 88
68sub DESTROY { 89sub DESTROY {
69 my $self = shift; 90 my $self = shift;
70 $self->[0]{conns}++; 91
92 if ($self->{alloc}) {
93 $self->{queue}{slots}++;
71 $self->[0]->wake_next; 94 $self->{queue}->wake_next;
95 }
72} 96}
73 97
74package conn; 98package conn;
75 99
76our %blockuri; 100our %blockuri;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines