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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.89 by root, Sun Jan 24 20:44:34 2010 UTC vs.
Revision 1.90 by root, Wed Jan 27 20:06:57 2010 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::SemaphoreSet;
3use Coro::EV; 4use Coro::EV;
4use Coro::Socket; 5use Coro::Socket;
5use Coro::Signal; 6use Coro::Signal;
6use Coro::AIO (); 7use Coro::AIO ();
7 8
9use Fcntl;
8use HTTP::Date; 10use HTTP::Date;
9use POSIX (); 11use POSIX ();
10 12
11use Compress::Zlib (); 13use Compress::Zlib ();
12 14
13no utf8; 15use common::sense;
14use bytes;
15 16
16# at least on my machine, this thingy serves files 17# at least on my machine, this thingy serves files
17# quite a bit faster than apache, ;) 18# quite a bit faster than apache, ;)
18# and quite a bit slower than thttpd :( 19# and quite a bit slower than thttpd :(
19 20
20$SIG{PIPE} = 'IGNORE'; 21$SIG{PIPE} = 'IGNORE';
21 22
22our $accesslog; 23our $accesslog;
23our $errorlog; 24our $errorlog;
25our @listen_sockets;
24 26
25our $NOW; 27our $NOW;
26our $HTTP_NOW; 28our $HTTP_NOW;
27 29
28our $ERROR_LOG; 30our $ERROR_LOG;
29our $ACCESS_LOG; 31our $ACCESS_LOG;
32our $TRANSFER_LOCK = new Coro::SemaphoreSet; # lock to be acquired per ip
30 33
31our $update_time = EV::periodic 0, 1, undef, sub { 34our $update_time = EV::periodic 0, 1, undef, sub {
32 $NOW = time; 35 $NOW = time;
33 $HTTP_NOW = time2str $NOW; 36 $HTTP_NOW = time2str $NOW;
34}; 37};
… …
54 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW); 57 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
55 printf "$NOW: $format\n", @_; 58 printf "$NOW: $format\n", @_;
56 printf $errorlog "$NOW: $format\n", @_ if $errorlog; 59 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
57} 60}
58 61
59our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 62our $connections = new Coro::Semaphore $::MAX_CONNECTS || 250;
60our $httpevent = new Coro::Signal; 63our $httpevent = new Coro::Signal;
61 64
62our $queue_file = new transferqueue $MAX_TRANSFERS; 65our $queue_file = new transferqueue $::MAX_TRANSFERS;
63our $queue_index = new transferqueue 10; 66our $queue_index = new transferqueue 10;
64 67
65our $tbf_top = new tbf rate => $TBF_RATE || 100000; 68our $tbf_top = new tbf rate => $::TBF_RATE || 100000;
66 69
67my $unused_bytes = 0; 70my $unused_bytes = 0;
68my $unused_last = time; 71my $unused_last = time;
69 72
70sub unused_bandwidth { 73sub unused_bandwidth {
… …
103 } 106 }
104 }; 107 };
105} 108}
106 109
107my $http_port = new Coro::Socket 110my $http_port = new Coro::Socket
108 LocalAddr => $SERVER_HOST, 111 LocalAddr => $::SERVER_HOST,
109 LocalPort => $SERVER_PORT, 112 LocalPort => $::SERVER_PORT,
110 ReuseAddr => 1, 113 ReuseAddr => 1,
111 Listen => 50, 114 Listen => 50,
112 or die "unable to start server"; 115 or die "unable to start server";
113 116
114listen_on $http_port; 117listen_on $http_port;
115 118
116if ($SERVER_PORT2) { 119if ($::SERVER_PORT2) {
117 my $http_port = new Coro::Socket 120 my $http_port = new Coro::Socket
118 LocalAddr => $SERVER_HOST, 121 LocalAddr => $::SERVER_HOST,
119 LocalPort => $SERVER_PORT2, 122 LocalPort => $::SERVER_PORT2,
120 ReuseAddr => 1, 123 ReuseAddr => 1,
121 Listen => 50, 124 Listen => 50,
122 or die "unable to start server"; 125 or die "unable to start server";
123 126
124 listen_on $http_port; 127 listen_on $http_port;
125} 128}
126 129
127package conn; 130package conn;
128 131
129use strict; 132use common::sense;
130use bytes;
131 133
132use Socket; 134use Socket;
133use HTTP::Date; 135use HTTP::Date;
134use Convert::Scalar 'weaken'; 136use Convert::Scalar 'weaken';
135use IO::AIO; 137use IO::AIO;
… …
587 589
588 if ($self->{method} eq "GET") { 590 if ($self->{method} eq "GET") {
589 $self->{time} = $::NOW; 591 $self->{time} = $::NOW;
590 $self->{written} = 0; 592 $self->{written} = 0;
591 593
592 open my $fh, "<", $self->{path} 594 my $fh = Coro::AIO::aio_open $self->{path}, Fcntl::O_RDONLY, 0
593 or die "$self->{path}: late open failure ($!)"; 595 or die "$self->{path}: late open failure ($!)";
594 596
595 $h -= $l - 1; 597 $h -= $l - 1;
596 598
597 my $transfer = $queue->start_transfer ($h); 599 my $transfer = $queue->start_transfer ($h);
598 my $locked; 600 my $locked;
599 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 601 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
600 602
601 while ($h > 0) { 603 while ($h > 0) {
604 Coro::cede;
605 my $transfer_lock = $TRANSFER_LOCK->guard ($self->{remote_id});
606
602 unless ($locked) { 607 unless ($locked) {
603 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) { 608 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) {
604 $bufsize = $::BUFSIZE; 609 $bufsize = $::BUFSIZE;
605 $self->{time} = $::NOW; 610 $self->{time} = $::NOW;
606 $self->{written} = 0; 611 $self->{written} = 0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines