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.84 by root, Sat Dec 8 21:01:16 2007 UTC vs.
Revision 1.93 by root, Sun Mar 21 00:21:14 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};
… …
49} 52}
50 53
51sub slog { 54sub slog {
52 my $level = shift; 55 my $level = shift;
53 my $format = shift; 56 my $format = shift;
57
58 $format = sprintf $format, @_ if @_;
59
54 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW); 60 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
55 printf "$NOW: $format\n", @_; 61 print "$NOW: $format\n";
56 printf $errorlog "$NOW: $format\n", @_ if $errorlog; 62 print $errorlog "$NOW: $format\n", @_ if $errorlog;
57} 63}
58 64
59our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 65our $connections = new Coro::Semaphore $::MAX_CONNECTS || 250;
60our $httpevent = new Coro::Signal; 66our $httpevent = new Coro::Signal;
61 67
62our $queue_file = new transferqueue $MAX_TRANSFERS; 68our $queue_file = new transferqueue $::MAX_TRANSFERS;
63our $queue_index = new transferqueue 10; 69our $queue_index = new transferqueue 10;
64 70
65our $tbf_top = new tbf rate => $TBF_RATE || 100000; 71our $tbf_top = new tbf rate => $::TBF_RATE || 100000;
66 72
67my $unused_bytes = 0; 73my $unused_bytes = 0;
68my $unused_last = time; 74my $unused_last = time;
69 75
70sub unused_bandwidth { 76sub unused_bandwidth {
71 $unused_bytes += $_[0]; 77 $unused_bytes += $_[0];
72 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) { 78 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
73 $unused_last = $NOW; 79 $unused_last = $NOW;
74 $unused_bytes = 0; 80 $unused_bytes = 0;
75 $queue_file->force_wake_next; 81 $queue_file->force_wake_next
76 slog 1, "forced filetransfer due to unused bandwidth"; 82 and slog 1, "forced filetransfer due to unused bandwidth";
77 }
78}
79
80my @newcons;
81my @pool;
82
83# one "execution thread"
84sub handler {
85 while () {
86 if (@newcons) {
87 eval {
88 conn->new (@{pop @newcons})->handle;
89 };
90 slog 1, "$@" if $@ && !ref $@;
91
92 $httpevent->broadcast; # only for testing, but doesn't matter much
93
94 $connections->up;
95 } else {
96 last if @pool >= $MAX_POOL;
97 push @pool, $Coro::current;
98 schedule;
99 }
100 } 83 }
101} 84}
102 85
103sub listen_on { 86sub listen_on {
104 my $listen = $_[0]; 87 my $listen = $_[0];
… …
108 # the "main thread" 91 # the "main thread"
109 async { 92 async {
110 slog 1, "accepting connections"; 93 slog 1, "accepting connections";
111 while () { 94 while () {
112 $connections->down; 95 $connections->down;
113 push @newcons, [$listen->accept]; 96 my @conn = $listen->accept;
114 #slog 3, "accepted @$connections ".scalar(@pool); 97 #slog 3, "accepted @$connections ".scalar(@pool);
115 if (@pool) { 98
116 (pop @pool)->ready; 99 async_pool {
117 } else { 100 eval {
118 async \&handler; 101 conn->new (@conn)->handle;
102 };
103 slog 1, "$@" if $@ && !ref $@;
104
105 $httpevent->broadcast; # only for testing, but doesn't matter much
106
107 $connections->up;
119 } 108 }
120 } 109 }
121 }; 110 };
122} 111}
123 112
124my $http_port = new Coro::Socket 113my $http_port = new Coro::Socket
125 LocalAddr => $SERVER_HOST, 114 LocalAddr => $::SERVER_HOST,
126 LocalPort => $SERVER_PORT, 115 LocalPort => $::SERVER_PORT,
127 ReuseAddr => 1, 116 ReuseAddr => 1,
128 Listen => 50, 117 Listen => 50,
129 or die "unable to start server"; 118 or die "unable to start server";
130 119
131listen_on $http_port; 120listen_on $http_port;
132 121
133if ($SERVER_PORT2) { 122if ($::SERVER_PORT2) {
134 my $http_port = new Coro::Socket 123 my $http_port = new Coro::Socket
135 LocalAddr => $SERVER_HOST, 124 LocalAddr => $::SERVER_HOST,
136 LocalPort => $SERVER_PORT2, 125 LocalPort => $::SERVER_PORT2,
137 ReuseAddr => 1, 126 ReuseAddr => 1,
138 Listen => 50, 127 Listen => 50,
139 or die "unable to start server"; 128 or die "unable to start server";
140 129
141 listen_on $http_port; 130 listen_on $http_port;
142} 131}
143 132
144package conn; 133package conn;
145 134
146use strict; 135use common::sense;
147use bytes;
148 136
149use Socket; 137use Socket;
150use HTTP::Date; 138use HTTP::Date;
151use Convert::Scalar 'weaken'; 139use Convert::Scalar 'weaken';
152use IO::AIO; 140use IO::AIO;
… …
424sub map_uri { 412sub map_uri {
425 my $self = shift; 413 my $self = shift;
426 my $host = $self->{server_name}; 414 my $host = $self->{server_name};
427 my $uri = $self->{uri}; 415 my $uri = $self->{uri};
428 416
417 $host =~ /[\/\\]/
418 and $self->err(400, "bad request");
419
429 # some massaging, also makes it more secure 420 # some massaging, also makes it more secure
430 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 421 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
431 $uri =~ s%//+%/%g; 422 $uri =~ s%//+%/%g;
432 $uri =~ s%/\.(?=/|$)%%g; 423 $uri =~ s%/\.(?=/|$)%%g;
433 1 while $uri =~ s%/[^/]+/\.\.(?=/|$)%%; 424 1 while $uri =~ s%/[^/]+/\.\.(?=/|$)%%;
… …
480 } else { 471 } else {
481 $self->err (404, "not found"); 472 $self->err (404, "not found");
482 } 473 }
483 } else { 474 } else {
484 475
485 stat $path 476 Coro::AIO::aio_stat $path
486 or $self->err (404, "not found"); 477 and $self->err (404, "not found");
487 478
488 $self->{stat} = [stat _]; 479 $self->{stat} = [stat _];
489 480
490 # idiotic netscape sends idiotic headers AGAIN 481 # idiotic netscape sends idiotic headers AGAIN
491 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/ 482 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
… …
552 }; 543 };
553 544
554 my @code = (200, "ok"); 545 my @code = (200, "ok");
555 my ($l, $h); 546 my ($l, $h);
556 547
557 if ($self->{h}{range} =~ /^bytes=(.*)$/) { 548 if ($self->{h}{range} =~ /^bytes=(.*)$/i) {
558 for (split /,/, $1) { 549 for (split /,/, $1) {
559 if (/^-(\d+)$/) { 550 if (/^-(\d+)$/) {
560 ($l, $h) = ($length - $1, $length - 1); 551 ($l, $h) = ($length - $1, $length - 1);
561 } elsif (/^(\d+)-(\d*)$/) { 552 } elsif (/^(\d+)-(\d*)$/) {
562 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 553 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
… …
601 592
602 if ($self->{method} eq "GET") { 593 if ($self->{method} eq "GET") {
603 $self->{time} = $::NOW; 594 $self->{time} = $::NOW;
604 $self->{written} = 0; 595 $self->{written} = 0;
605 596
606 open my $fh, "<", $self->{path} 597 my $fh = Coro::AIO::aio_open $self->{path}, Fcntl::O_RDONLY, 0
607 or die "$self->{path}: late open failure ($!)"; 598 or die "$self->{path}: late open failure ($!)";
608 599
609 $h -= $l - 1; 600 $h -= $l - 1;
610 601
611 my $transfer = $queue->start_transfer ($h); 602 my $transfer = $queue->start_transfer ($h);
612 my $locked; 603 my $locked;
613 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 604 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
614 605
615 while ($h > 0) { 606 while ($h > 0) {
607 Coro::cede;
608 my $transfer_lock = $TRANSFER_LOCK->guard ($self->{remote_id});
609
616 unless ($locked) { 610 unless ($locked) {
617 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) { 611 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) {
618 $bufsize = $::BUFSIZE; 612 $bufsize = $::BUFSIZE;
619 $self->{time} = $::NOW; 613 $self->{time} = $::NOW;
620 $self->{written} = 0; 614 $self->{written} = 0;
… …
628 622
629 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0 623 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
630 or last; 624 or last;
631 625
632 $tbf->request (length $buf); 626 $tbf->request (length $buf);
633 my $w = syswrite $self->{fh}, $buf 627 my $w = $self->{fh}->syswrite ($buf)
634 or last; 628 or last;
635 $::written += $w; 629 $::written += $w;
636 $self->{written} += $w; 630 $self->{written} += $w;
637 $l += $w; 631 $l += $w;
638 } 632 }

Diff Legend

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