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

Comparing cvsroot/Coro/myhttpd/access.pl (file contents):
Revision 1.16 by root, Fri Nov 30 05:11:23 2001 UTC vs.
Revision 1.21 by root, Mon Dec 3 05:52:37 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 }, transfer::;
15 22
16 push @{$self->{wait}}, $trans; 23 push @{$self->{wait}}, $transfer;
17 Scalar::Util::weaken($self->{wait}[-1]); 24 Scalar::Util::weaken($self->{wait}[-1]);
18 25
19 --$self->{conns};
20 $self->wake_next; 26 $self->wake_next;
21 27
22 $trans; 28 $trans;
23} 29}
24 30
25sub wake_next { 31sub wake_next {
26 my $self = shift; 32 my $self = shift;
27 33
28 if ($self->{conns} >= 0) { 34 $self->sort;
29 while(@{$self->{wait}}) { 35
36 while($self->{slots} && @{$self->{wait}}) {
30 my $transfer = shift @{$self->{wait}}; 37 my $transfer = shift @{$self->{wait}};
31 if ($transfer) { 38 if ($transfer) {
39 $self->{lastspb} = $transfer->{spb};
40 $self->{avgspb} ||= $transfer->{spb};
41 $self->{avgspb} = $self->{avgspb} * 0.95 + $transfer->{spb} * 0.05;
32 $transfer->wake; 42 $transfer->wake;
33 last; 43 last;
34 }
35 } 44 }
36 } 45 }
37} 46}
38 47
48sub sort {
49 my @queue = grep $_, @{$_[0]{wait}};
50
51 $_->{spb} = ($::NOW-$_->{time}) / ($_->{size} || 1) for @queue;
52
53 $_[0]{wait} = [sort { $b->{spb} <=> $a->{spb} } @queue];
54}
55
39sub waiters { 56sub waiters {
40 map $_->[1], @{$_[0]{wait}}; 57 $_[0]->sort;
58 @{$_[0]{wait}};
41} 59}
42 60
43package transfer; 61package transfer;
44 62
45use Coro::Timer (); 63use Coro::Timer ();
46 64
47sub wake { 65sub wake {
48 my $self = shift; 66 my $self = shift;
67
49 $self->[2] = 1; 68 $self->{alloc} = 1;
50 ref $self->[1] and $self->[1]->ready; 69 $self->{queue}{slots}--;
70 $self->{wake} and $self->{wake}->ready;
51} 71}
52 72
53sub try { 73sub try {
54 my $self = shift; 74 my $self = shift;
55 75
56 unless ($self->[2]) { 76 $self->{alloc} || do {
57 my $timeout = Coro::Timer::timeout $_[0]; 77 my $timeout = Coro::Timer::timeout $_[0];
58 $self->[1] = $Coro::current; 78 local $self->{wake} = $self->{coro};
59 79
60 Coro::schedule; 80 Coro::schedule;
61 81
62 undef $self->[1]; 82 $self->{alloc};
63 } 83 }
64
65 return $self->[2];
66} 84}
67 85
68sub DESTROY { 86sub DESTROY {
69 my $self = shift; 87 my $self = shift;
70 $self->[0]{conns}++; 88
89 if ($self->{alloc}) {
90 $self->{queue}{slots}++;
71 $self->[0]->wake_next; 91 $self->{queue}->wake_next;
92 }
72} 93}
73 94
74package conn; 95package conn;
75 96
76our %blockuri; 97our %blockuri;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines