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.24 by root, Tue Dec 4 02:46:29 2001 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines