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.27 by root, Wed Dec 5 02:02:23 2001 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines