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.18 by root, Sat Dec 1 01:37:24 2001 UTC vs.
Revision 1.25 by root, Tue Dec 4 03:43:54 2001 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines