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.78 by root, Sun Dec 4 19:36:28 2005 UTC vs.
Revision 1.95 by root, Wed Apr 24 23:49:34 2013 UTC

1use AnyEvent ();
2
1use Coro; 3use Coro;
2use Coro::Semaphore; 4use Coro::Semaphore;
5use Coro::SemaphoreSet;
3use Coro::Event; 6use Coro::EV;
4use Coro::Socket; 7use Coro::Socket;
5use Coro::Signal; 8use Coro::Signal;
9use Coro::AIO ();
6 10
11use Fcntl;
7use HTTP::Date; 12use HTTP::Date;
8use POSIX (); 13use POSIX ();
9 14
10use Compress::Zlib (); 15use Compress::Zlib ();
11 16
12no utf8; 17use common::sense;
13use bytes;
14 18
15# at least on my machine, this thingy serves files 19# at least on my machine, this thingy serves files
16# quite a bit faster than apache, ;) 20# quite a bit faster than apache, ;)
17# and quite a bit slower than thttpd :( 21# and quite a bit slower than thttpd :(
18 22
19$SIG{PIPE} = 'IGNORE'; 23$SIG{PIPE} = 'IGNORE';
20 24
21our $accesslog; 25our $accesslog;
22our $errorlog; 26our $errorlog;
27our @listen_sockets;
23 28
24our $NOW; 29our $NOW;
25our $HTTP_NOW; 30our $HTTP_NOW;
26 31
27Event->timer(interval => 1, hard => 1, cb => sub { 32our $ERROR_LOG;
33our $ACCESS_LOG;
34our $TRANSFER_LOCK = new Coro::SemaphoreSet; # lock to be acquired per ip
35
36our $update_time = EV::periodic 0, 1, undef, sub {
28 $NOW = time; 37 $NOW = time;
29 $HTTP_NOW = time2str $NOW; 38 $HTTP_NOW = time2str $NOW;
30})->now; 39};
40$update_time->invoke;
31 41
32if ($ERROR_LOG) { 42if ($ERROR_LOG) {
33 use IO::Handle; 43 use IO::Handle;
34 open $errorlog, ">>$ERROR_LOG" 44 open $errorlog, ">>$ERROR_LOG"
35 or die "$ERROR_LOG: $!"; 45 or die "$ERROR_LOG: $!";
44} 54}
45 55
46sub slog { 56sub slog {
47 my $level = shift; 57 my $level = shift;
48 my $format = shift; 58 my $format = shift;
59
60 $format = sprintf $format, @_ if @_;
61
49 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW); 62 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
50 printf "$NOW: $format\n", @_; 63 print "$NOW: $format\n";
51 printf $errorlog "$NOW: $format\n", @_ if $errorlog; 64 print $errorlog "$NOW: $format\n", @_ if $errorlog;
52} 65}
53 66
54our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 67our $connections = new Coro::Semaphore $::MAX_CONNECTS || 250;
55our $httpevent = new Coro::Signal; 68our $httpevent = new Coro::Signal;
56 69
57our $queue_file = new transferqueue $MAX_TRANSFERS; 70our $queue_file = new transferqueue $::MAX_TRANSFERS;
58our $queue_index = new transferqueue 10; 71our $queue_index = new transferqueue 10;
59 72
60our $tbf_top = new tbf rate => $TBF_RATE || 100000; 73our $tbf_top = new tbf rate => $::TBF_RATE || 100000;
61 74
62my $unused_bytes = 0; 75my $unused_bytes = 0;
63my $unused_last = time; 76my $unused_last = time;
64 77
65sub unused_bandwidth { 78sub unused_bandwidth {
66 $unused_bytes += $_[0]; 79 $unused_bytes += $_[0];
67 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) { 80 if ($unused_last < $NOW - 30 && $unused_bytes / ($NOW - $unused_last) > 50000) {
68 $unused_last = $NOW; 81 $unused_last = $NOW;
69 $unused_bytes = 0; 82 $unused_bytes = 0;
70 $queue_file->force_wake_next; 83 $queue_file->force_wake_next
71 slog 1, "forced filetransfer due to unused bandwidth"; 84 and slog 1, "forced filetransfer due to unused bandwidth";
72 }
73}
74
75my @newcons;
76my @pool;
77
78# one "execution thread"
79sub handler {
80 while () {
81 if (@newcons) {
82 eval {
83 conn->new(@{pop @newcons})->handle;
84 };
85 slog 1, "$@" if $@ && !ref $@;
86
87 $httpevent->broadcast; # only for testing, but doesn't matter much
88
89 $connections->up;
90 } else {
91 last if @pool >= $MAX_POOL;
92 push @pool, $Coro::current;
93 schedule;
94 }
95 } 85 }
96} 86}
97 87
98sub listen_on { 88sub listen_on {
99 my $listen = $_[0]; 89 my $listen = $_[0];
103 # the "main thread" 93 # the "main thread"
104 async { 94 async {
105 slog 1, "accepting connections"; 95 slog 1, "accepting connections";
106 while () { 96 while () {
107 $connections->down; 97 $connections->down;
108 push @newcons, [$listen->accept]; 98 my @conn = $listen->accept;
109 #slog 3, "accepted @$connections ".scalar(@pool); 99 #slog 3, "accepted @$connections ".scalar(@pool);
110 if (@pool) { 100
111 (pop @pool)->ready; 101 async_pool {
112 } else { 102 eval {
113 async \&handler; 103 conn->new (@conn)->handle;
104 };
105 slog 1, "$@" if $@ && !ref $@;
106
107 $httpevent->broadcast; # only for testing, but doesn't matter much
108
109 $connections->up;
114 } 110 }
115 } 111 }
116 }; 112 };
117} 113}
118 114
119my $http_port = new Coro::Socket 115my $http_port = new Coro::Socket
120 LocalAddr => $SERVER_HOST, 116 LocalAddr => $::SERVER_HOST,
121 LocalPort => $SERVER_PORT, 117 LocalPort => $::SERVER_PORT,
122 ReuseAddr => 1, 118 ReuseAddr => 1,
123 Listen => 50, 119 Listen => 50,
124 or die "unable to start server"; 120 or die "unable to start server";
125 121
126listen_on $http_port; 122listen_on $http_port;
127 123
128if ($SERVER_PORT2) { 124if ($::SERVER_PORT2) {
129 my $http_port = new Coro::Socket 125 my $http_port = new Coro::Socket
130 LocalAddr => $SERVER_HOST, 126 LocalAddr => $::SERVER_HOST,
131 LocalPort => $SERVER_PORT2, 127 LocalPort => $::SERVER_PORT2,
132 ReuseAddr => 1, 128 ReuseAddr => 1,
133 Listen => 50, 129 Listen => 50,
134 or die "unable to start server"; 130 or die "unable to start server";
135 131
136 listen_on $http_port; 132 listen_on $http_port;
137} 133}
138 134
139package conn; 135package conn;
136
137use common::sense;
140 138
141use Socket; 139use Socket;
142use HTTP::Date; 140use HTTP::Date;
143use Convert::Scalar 'weaken'; 141use Convert::Scalar 'weaken';
144use IO::AIO; 142use IO::AIO;
143use AnyEvent::AIO;
145 144
146IO::AIO::min_parallel $::AIO_PARALLEL; 145IO::AIO::min_parallel $::AIO_PARALLEL;
147
148Event->io(fd => IO::AIO::poll_fileno,
149 poll => 'r', async => 1,
150 cb => \&IO::AIO::poll_cb);
151 146
152our %conn; # $conn{ip}{self} => connobj 147our %conn; # $conn{ip}{self} => connobj
153our %uri; # $uri{ip}{uri}{self} 148our %uri; # $uri{ip}{uri}{self}
154our %blocked; 149our %blocked;
155our %mimetype; 150our %mimetype;
156 151
157sub read_mimetypes { 152sub read_mimetypes {
158 local *M;
159 if (open M, "<mime_types") { 153 if (open my $fh, "<mime_types") {
160 while (<M>) { 154 while (<$fh>) {
161 if (/^([^#]\S+)\t+(\S+)$/) { 155 if (/^([^#]\S+)\t+(\S+)$/) {
162 $mimetype{lc $1} = $2; 156 $mimetype{lc $1} = $2;
163 } 157 }
164 } 158 }
165 } else { 159 } else {
173 my $class = shift; 167 my $class = shift;
174 my $fh = shift; 168 my $fh = shift;
175 my $peername = shift; 169 my $peername = shift;
176 my $self = bless { fh => $fh }, $class; 170 my $self = bless { fh => $fh }, $class;
177 my (undef, $iaddr) = unpack_sockaddr_in $peername 171 my (undef, $iaddr) = unpack_sockaddr_in $peername
178 or $self->err(500, "unable to decode peername"); 172 or $self->err (500, "unable to decode peername");
179 173
180 $self->{remote_addr} = 174 $self->{remote_addr} =
181 $self->{remote_id} = inet_ntoa $iaddr; 175 $self->{remote_id} = inet_ntoa $iaddr;
182 176
183 $self->{time} = $::NOW; 177 $self->{time} = $::NOW;
184 178
185 weaken ($Coro::current->{conn} = $self); 179 weaken ($Coro::current->{conn} = $self);
186 180
187 $::conns++; 181 ++$::conns;
188 $::maxconns = $::conns if $::conns > $::maxconns; 182 $::maxconns = $::conns if $::conns > $::maxconns;
189 183
190 $self; 184 $self
191} 185}
192 186
193sub DESTROY { 187sub DESTROY {
194 #my $self = shift; 188 my $self = shift;
189
195 $::conns--; 190 --$::conns;
196} 191}
197 192
198sub prune_cache { 193sub prune_cache {
199 my $hash = $_[0]; 194 my $hash = $_[0];
200 195
201 for (keys %$hash) { 196 for (keys %$hash) {
202 if (ref $hash->{$_} eq HASH::) { 197 if (ref $hash->{$_} eq HASH::) {
203 prune_cache($hash->{$_}); 198 prune_cache($hash->{$_});
204 unless (scalar keys %{$hash->{$_}}) { 199 unless (scalar keys %{$hash->{$_}}) {
205 delete $hash->{$_}; 200 delete $hash->{$_};
206 $d2++;
207 } 201 }
208 } 202 }
209 } 203 }
210} 204}
211 205
216 for (keys %blocked) { 210 for (keys %blocked) {
217 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW; 211 delete $blocked{$_} unless $blocked{$_}[0] > $::NOW;
218 } 212 }
219} 213}
220 214
221Event->timer(interval => 60, cb => \&prune_caches); 215our $PRUNE_WATCHER = AE::timer 60, 60, \&prune_caches;
222 216
223sub slog { 217sub slog {
224 my $self = shift; 218 my $self = shift;
225 main::slog($_[0], "$self->{remote_id}> $_[1]"); 219 main::slog($_[0], "$self->{remote_id}> $_[1]");
226} 220}
287 $hdr->{"Content-Type"} = "text/plain"; 281 $hdr->{"Content-Type"} = "text/plain";
288 $hdr->{"Content-Length"} = length $content; 282 $hdr->{"Content-Length"} = length $content;
289 } 283 }
290 $hdr->{"Connection"} = "close"; 284 $hdr->{"Connection"} = "close";
291 285
292 $self->response($code, $msg, $hdr, $content); 286 $self->response ($code, $msg, $hdr, $content);
293 287
294 die bless {}, err::; 288 die bless {}, err::
295} 289}
296 290
297sub handle { 291sub handle {
298 my $self = shift; 292 my $self = shift;
299 my $fh = $self->{fh}; 293 my $fh = $self->{fh};
300 294
301 my $host; 295 my $host;
302 296
303 $fh->timeout($::REQ_TIMEOUT); 297 $fh->timeout($::REQ_TIMEOUT);
304 while() { 298 while () {
305 $self->{reqs}++; 299 $self->{reqs}++;
306 300
307 # read request and parse first line 301 # read request and parse first line
308 my $req = $fh->readline("\015\012\015\012"); 302 my $req = $fh->readline("\015\012\015\012");
309 303
418# uri => path mapping 412# uri => path mapping
419sub map_uri { 413sub map_uri {
420 my $self = shift; 414 my $self = shift;
421 my $host = $self->{server_name}; 415 my $host = $self->{server_name};
422 my $uri = $self->{uri}; 416 my $uri = $self->{uri};
417
418 $host =~ /[\/\\]/
419 and $self->err(400, "bad request");
423 420
424 # some massaging, also makes it more secure 421 # some massaging, also makes it more secure
425 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 422 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
426 $uri =~ s%//+%/%g; 423 $uri =~ s%//+%/%g;
427 $uri =~ s%/\.(?=/|$)%%g; 424 $uri =~ s%/\.(?=/|$)%%g;
471 468
472 if ($self->{name} =~ s%^/internal/([^/]+)%%) { 469 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
473 if ($::internal{$1}) { 470 if ($::internal{$1}) {
474 $::internal{$1}->($self); 471 $::internal{$1}->($self);
475 } else { 472 } else {
476 $self->err(404, "not found"); 473 $self->err (404, "not found");
477 } 474 }
478 } else { 475 } else {
479 476
480 stat $path 477 Coro::AIO::aio_stat $path
481 or $self->err(404, "not found"); 478 and $self->err (404, "not found");
482 479
483 $self->{stat} = [stat _]; 480 $self->{stat} = [stat _];
484 481
485 # idiotic netscape sends idiotic headers AGAIN 482 # idiotic netscape sends idiotic headers AGAIN
486 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/ 483 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
489 if (-d _ && -r _) { 486 if (-d _ && -r _) {
490 # directory 487 # directory
491 if ($path !~ /\/$/) { 488 if ($path !~ /\/$/) {
492 # create a redirect to get the trailing "/" 489 # create a redirect to get the trailing "/"
493 # we don't try to avoid the :80 490 # we don't try to avoid the :80
494 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" }); 491 $self->err (301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
495 } else { 492 } else {
496 $ims < $self->{stat}[9] 493 $ims < $self->{stat}[9]
497 or $self->err(304, "not modified"); 494 or $self->err (304, "not modified");
498 495
499 if (-r "$path/index.html") { 496 if (-r "$path/index.html") {
500 # replace directory "size" by index.html filesize 497 # replace directory "size" by index.html filesize
501 $self->{stat} = [stat ($self->{path} .= "/index.html")]; 498 $self->{stat} = [stat ($self->{path} .= "/index.html")];
502 $self->handle_file($queue_index, $tbf_top); 499 $self->handle_file ($queue_index, $tbf_top);
503 } else { 500 } else {
504 $self->handle_dir; 501 $self->handle_dir;
505 } 502 }
506 } 503 }
507 } elsif (-f _ && -r _) { 504 } elsif (-f _ && -r _) {
508 -x _ and $self->err(403, "forbidden"); 505 -x _ and $self->err (403, "forbidden");
509 506
510 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) { 507 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
511 my $timeout = $::NOW + 10; 508 my $timeout = $::NOW + 10;
512 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) { 509 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
513 if ($timeout < $::NOW) { 510 if ($timeout < $::NOW) {
516 $httpevent->wait; 513 $httpevent->wait;
517 } 514 }
518 } 515 }
519 } 516 }
520 517
521 $self->handle_file($queue_file, $tbf_top); 518 $self->handle_file ($queue_file, $tbf_top);
522 } else { 519 } else {
523 $self->err(404, "not found"); 520 $self->err (404, "not found");
524 } 521 }
525 } 522 }
526} 523}
527 524
528sub handle_dir { 525sub handle_dir {
529 my $self = shift; 526 my $self = shift;
530 my $idx = $self->diridx; 527 my $idx = $self->diridx;
531 528
532 $self->response(200, "ok", 529 $self->response (200, "ok",
533 { 530 {
534 "Content-Type" => "text/html; charset=utf-8", 531 "Content-Type" => "text/html; charset=utf-8",
535 "Content-Length" => length $idx, 532 "Content-Length" => length $idx,
536 "Last-Modified" => time2str ($self->{stat}[9]), 533 "Last-Modified" => time2str ($self->{stat}[9]),
537 }, 534 },
547 }; 544 };
548 545
549 my @code = (200, "ok"); 546 my @code = (200, "ok");
550 my ($l, $h); 547 my ($l, $h);
551 548
552 if ($self->{h}{range} =~ /^bytes=(.*)$/) { 549 if ($self->{h}{range} =~ /^bytes=(.*)$/i) {
553 for (split /,/, $1) { 550 for (split /,/, $1) {
554 if (/^-(\d+)$/) { 551 if (/^-(\d+)$/) {
555 ($l, $h) = ($length - $1, $length - 1); 552 ($l, $h) = ($length - $1, $length - 1);
556 } elsif (/^(\d+)-(\d*)$/) { 553 } elsif (/^(\d+)-(\d*)$/) {
557 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 554 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
561 } 558 }
562 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 559 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
563 } 560 }
564 $hdr->{"Content-Range"} = "bytes */$length"; 561 $hdr->{"Content-Range"} = "bytes */$length";
565 $hdr->{"Content-Length"} = $length; 562 $hdr->{"Content-Length"} = $length;
566 $self->err(416, "not satisfiable", $hdr, ""); 563 $self->err (416, "not satisfiable", $hdr, "");
567 564
568satisfiable: 565satisfiable:
569 # check for segmented downloads 566 # check for segmented downloads
570 if ($l && $::NO_SEGMENTED) { 567 if ($l && $::NO_SEGMENTED) {
571 my $timeout = $::NOW + 15; 568 my $timeout = $::NOW + 60;
572 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 569 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
573 if ($timeout <= $::NOW) { 570 if ($timeout <= $::NOW) {
574 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
575 #$self->err_segmented_download; 571 $self->err_segmented_download;
576 } else { 572 } else {
577 $httpevent->wait; 573 $httpevent->wait;
578 } 574 }
579 } 575 }
580 } 576 }
590 586
591 $self->{path} =~ /\.([^.]+)$/; 587 $self->{path} =~ /\.([^.]+)$/;
592 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream"; 588 $hdr->{"Content-Type"} = $mimetype{lc $1} || "application/octet-stream";
593 $hdr->{"Content-Length"} = $length; 589 $hdr->{"Content-Length"} = $length;
594 590
595 $self->response(@code, $hdr, ""); 591 $self->response (@code, $hdr, "");
596 592
597 if ($self->{method} eq "GET") { 593 if ($self->{method} eq "GET") {
598 $self->{time} = $::NOW; 594 $self->{time} = $::NOW;
599 $self->{written} = 0; 595 $self->{written} = 0;
600 596
601 my $current = $Coro::current; 597 my $fh = Coro::AIO::aio_open $self->{path}, Fcntl::O_RDONLY, 0
602
603 my ($fh, $buf, $r);
604
605 open $fh, "<", $self->{path}
606 or die "$self->{path}: late open failure ($!)"; 598 or die "$self->{path}: late open failure ($!)";
607 599
608 $h -= $l - 1; 600 $h -= $l - 1;
609 601
610 if (0) { # !AIO
611 if ($l) {
612 sysseek $fh, $l, 0;
613 }
614 }
615
616 my $transfer = $queue->start_transfer($h); 602 my $transfer = $queue->start_transfer ($h);
617 my $locked; 603 my $locked;
618 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size 604 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
619 605
620 while ($h > 0) { 606 while ($h > 0) {
607 Coro::cede;
608 my $transfer_lock = $TRANSFER_LOCK->guard ($self->{remote_id});
609
621 unless ($locked) { 610 unless ($locked) {
622 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) { 611 if ($locked ||= $transfer->try ($::WAIT_INTERVAL)) {
623 $bufsize = $::BUFSIZE; 612 $bufsize = $::BUFSIZE;
624 $self->{time} = $::NOW; 613 $self->{time} = $::NOW;
625 $self->{written} = 0; 614 $self->{written} = 0;
626 } 615 }
627 } 616 }
629 if ($blocked{$self->{remote_id}}) { 618 if ($blocked{$self->{remote_id}}) {
630 $self->{h}{connection} = "close"; 619 $self->{h}{connection} = "close";
631 die bless {}, err::; 620 die bless {}, err::;
632 } 621 }
633 622
634 if (0) { # !AIO 623 Coro::AIO::aio_read $fh, $l, ($h > $bufsize ? $bufsize : $h), my $buf, 0
635 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
636 or last; 624 or last;
637 } else {
638 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
639 $buf, 0, sub {
640 $r = $_[0];
641 Coro::ready($current);
642 });
643 &Coro::schedule;
644 last unless $r;
645 }
646 625
626 # readahead to work around rijk disk issues
627 IO::AIO::aio_readahead $fh, $l + $bufsize, $bufsize;
628
647 $tbf->request(length $buf); 629 $tbf->request (length $buf);
648 my $w = syswrite $self->{fh}, $buf 630 my $w = $self->{fh}->syswrite ($buf)
649 or last; 631 or last;
650 $::written += $w; 632 $::written += $w;
651 $self->{written} += $w; 633 $self->{written} += $w;
652 $l += $r; 634 $l += $w;
653 } 635 }
654 636
655 close $fh; 637 close $fh;
656 } 638 }
657} 639}
658 640
6591 6411
642

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines