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.77 by root, Sat Sep 17 20:21:11 2005 UTC vs.
Revision 1.91 by root, Thu Feb 4 22:35:47 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines