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.37 by root, Sun Sep 2 01:03:53 2001 UTC vs.
Revision 1.48 by root, Tue Nov 27 03:38:08 2001 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal;
5 6
6use HTTP::Date; 7use HTTP::Date;
8use POSIX ();
7 9
8no utf8; 10no utf8;
9use bytes; 11use bytes;
10 12
11# at least on my machine, this thingy serves files 13# at least on my machine, this thingy serves files
… …
28 my $format = shift; 30 my $format = shift;
29 printf "---: $format\n", @_; 31 printf "---: $format\n", @_;
30} 32}
31 33
32our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 34our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
35our $httpevent = new Coro::Signal;
33 36
34our $wait_factor = 0.95; 37our $wait_factor = 0.95;
35 38
36our @transfers = ( 39our @transfers = (
37 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL || 50), 1], 40 [(new Coro::Semaphore $MAX_TRANSFERS_SMALL), 1],
38 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE || 50), 1], 41 [(new Coro::Semaphore $MAX_TRANSFERS_LARGE), 1],
39); 42);
40 43
41my @newcons; 44my @newcons;
42my @pool; 45my @pool;
43 46
44# one "execution thread" 47# one "execution thread"
45sub handler { 48sub handler {
46 while () { 49 while () {
47 my $new = pop @newcons;
48 if ($new) { 50 if (@newcons) {
49 eval { 51 eval {
50 conn->new(@$new)->handle; 52 conn->new(@{pop @newcons})->handle;
51 }; 53 };
52 slog 1, "$@" if $@ && !ref $@; 54 slog 1, "$@" if $@ && !ref $@;
53 $connections->up; 55 $connections->up;
54 } else { 56 } else {
55 last if @pool >= $MAX_POOL; 57 last if @pool >= $MAX_POOL;
… …
57 schedule; 59 schedule;
58 } 60 }
59 } 61 }
60} 62}
61 63
64sub listen_on {
65 my $listen = $_[0];
66
67 push @listen_sockets, $listen;
68
69 # the "main thread"
70 async {
71 slog 1, "accepting connections";
72 while () {
73 $connections->down;
74 push @newcons, [$listen->accept];
75 #slog 3, "accepted @$connections ".scalar(@pool);
76 if (@pool) {
77 (pop @pool)->ready;
78 } else {
79 async \&handler;
80 }
81
82 }
83 };
84}
85
62my $http_port = new Coro::Socket 86my $http_port = new Coro::Socket
63 LocalAddr => $SERVER_HOST, 87 LocalAddr => $SERVER_HOST,
64 LocalPort => $SERVER_PORT, 88 LocalPort => $SERVER_PORT,
65 ReuseAddr => 1, 89 ReuseAddr => 1,
66 Listen => 50, 90 Listen => 50,
67 or die "unable to start server"; 91 or die "unable to start server";
68 92
69push @listen_sockets, $http_port; 93listen_on $http_port;
94
95if ($SERVER_PORT2) {
96 my $http_port = new Coro::Socket
97 LocalAddr => $SERVER_HOST,
98 LocalPort => $SERVER_PORT2,
99 ReuseAddr => 1,
100 Listen => 50,
101 or die "unable to start server";
102
103 listen_on $http_port;
104}
70 105
71our $NOW; 106our $NOW;
72our $HTTP_NOW; 107our $HTTP_NOW;
73 108
74Event->timer(interval => 1, hard => 1, cb => sub { 109Event->timer(interval => 1, hard => 1, cb => sub {
75 $NOW = time; 110 $NOW = time;
76 $HTTP_NOW = time2str $NOW; 111 $HTTP_NOW = time2str $NOW;
77})->now; 112})->now;
78
79# the "main thread"
80async {
81 slog 1, "accepting connections";
82 while () {
83 $connections->down;
84 push @newcons, [$http_port->accept];
85 #slog 3, "accepted @$connections ".scalar(@pool);
86 if (@pool) {
87 (pop @pool)->ready;
88 } else {
89 async \&handler;
90 }
91
92 }
93};
94 113
95package conn; 114package conn;
96 115
97use Socket; 116use Socket;
98use HTTP::Date; 117use HTTP::Date;
… …
125 144
126read_mimetypes; 145read_mimetypes;
127 146
128sub new { 147sub new {
129 my $class = shift; 148 my $class = shift;
149 my $fh = shift;
130 my $peername = shift; 150 my $peername = shift;
131 my $fh = shift;
132 my $self = bless { fh => $fh }, $class; 151 my $self = bless { fh => $fh }, $class;
133 my (undef, $iaddr) = unpack_sockaddr_in $peername 152 my (undef, $iaddr) = unpack_sockaddr_in $peername
134 or $self->err(500, "unable to decode peername"); 153 or $self->err(500, "unable to decode peername");
135 154
136 $self->{remote_addr} = inet_ntoa $iaddr; 155 $self->{remote_addr} = inet_ntoa $iaddr;
… …
141 $self; 160 $self;
142} 161}
143 162
144sub DESTROY { 163sub DESTROY {
145 my $self = shift; 164 my $self = shift;
146
147 $::conns--; 165 $::conns--;
148
149 $self->eoconn; 166 $self->eoconn;
150} 167}
151 168
152# end of connection 169# end of connection
153sub eoconn { 170sub eoconn {
154 my $self = shift; 171 my $self = shift;
155 172
156 # clean up hints 173 # clean up hints
157 delete $conn{$self->{remote_id}}{$self*1}; 174 delete $conn{$self->{remote_id}}{$self*1};
158 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1}; 175 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
176
177 $httpevent->broadcast;
159} 178}
160 179
161sub slog { 180sub slog {
162 my $self = shift; 181 my $self = shift;
163 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 182 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
… …
165 184
166sub response { 185sub response {
167 my ($self, $code, $msg, $hdr, $content) = @_; 186 my ($self, $code, $msg, $hdr, $content) = @_;
168 my $res = "HTTP/1.1 $code $msg\015\012"; 187 my $res = "HTTP/1.1 $code $msg\015\012";
169 188
170 $self->{h}{connection} ||= $hdr->{Connection}; 189 if (exists $hdr->{Connection}) {
190 if ($hdr->{Connection} =~ /close/) {
191 $self->{h}{connection} = "close"
192 }
193 } else {
194 if ($self->{version} < 1.1) {
195 if ($self->{h}{connection} =~ /keep-alive/i) {
196 $hdr->{Connection} = "Keep-Alive";
197 } else {
198 $self->{h}{connection} = "close"
199 }
200 }
201 }
171 202
172 $res .= "Date: $HTTP_NOW\015\012"; 203 $res .= "Date: $HTTP_NOW\015\012";
173 204
174 while (my ($h, $v) = each %$hdr) { 205 while (my ($h, $v) = each %$hdr) {
175 $res .= "$h: $v\015\012" 206 $res .= "$h: $v\015\012"
176 } 207 }
177 $res .= "\015\012"; 208 $res .= "\015\012";
178 209
179 $res .= $content if defined $content and $self->{method} ne "HEAD"; 210 $res .= $content if defined $content and $self->{method} ne "HEAD";
180 211
212 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
181 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 213 " $self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
182 214
183 print $accesslog $log if $accesslog; 215 print $accesslog $log if $accesslog;
184 print STDERR $log; 216 print STDERR $log;
185 217
186 $self->{written} += 218 $self->{written} +=
… …
278 310
279 delete $blocked{$id}; 311 delete $blocked{$id};
280 } 312 }
281 313
282 if (%{$conn{$id}} >= $::MAX_CONN_IP) { 314 if (%{$conn{$id}} >= $::MAX_CONN_IP) {
283 my $delay = $::PER_TIMEOUT + 15; 315 my $delay = $::PER_TIMEOUT + $::NOW + 15;
284 while (%{$conn{$id}} >= $::MAX_CONN_IP) { 316 while (%{$conn{$id}} >= $::MAX_CONN_IP) {
285 if ($delay <= 0) { 317 if ($delay < $::NOW) {
286 $self->slog(2, "blocked ip $id"); 318 $self->slog(2, "blocked ip $id");
287 $self->err_blocked; 319 $self->err_blocked;
288 } else { 320 } else {
289 Coro::Event::do_timer(after => 4); $delay -= 4; 321 $httpevent->wait;
290 } 322 }
291 } 323 }
292 } 324 }
293 325
294 # find out server name and port 326 # find out server name and port
… …
300 332
301 if (defined $host) { 333 if (defined $host) {
302 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 334 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
303 } else { 335 } else {
304 ($self->{server_port}, $host) 336 ($self->{server_port}, $host)
305 = unpack_sockaddr_in $self->{fh}->getsockname 337 = unpack_sockaddr_in $self->{fh}->sockname
306 or $self->err(500, "unable to get socket name"); 338 or $self->err(500, "unable to get socket name");
307 $host = inet_ntoa $host; 339 $host = inet_ntoa $host;
308 } 340 }
309 341
310 $self->{server_name} = $host; 342 $self->{server_name} = $host;
… …
320 352
321 $self->eoconn; 353 $self->eoconn;
322 354
323 die if $@ && !ref $@; 355 die if $@ && !ref $@;
324 356
325 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 357 last if $self->{h}{connection} =~ /close/;
358
359 $httpevent->broadcast;
326 360
327 $fh->timeout($::PER_TIMEOUT); 361 $fh->timeout($::PER_TIMEOUT);
328 } 362 }
329} 363}
330 364
… …
400 } else { 434 } else {
401 $ims < $self->{stat}[9] 435 $ims < $self->{stat}[9]
402 or $self->err(304, "not modified"); 436 or $self->err(304, "not modified");
403 437
404 if (-r "$path/index.html") { 438 if (-r "$path/index.html") {
405 $self->{path} .= "/index.html"; 439 # replace directory "size" by index.html filesize
440 $self->{stat}[7] = (stat ($self->{path} .= "/index.html"))[7];
406 $self->handle_file; 441 $self->handle_file;
407 } else { 442 } else {
408 $self->handle_dir; 443 $self->handle_dir;
409 } 444 }
410 } 445 }
… …
422 457
423 $self->response(200, "ok", 458 $self->response(200, "ok",
424 { 459 {
425 "Content-Type" => "text/html", 460 "Content-Type" => "text/html",
426 "Content-Length" => length $idx, 461 "Content-Length" => length $idx,
462 "Last-Modified" => time2str ((stat _)[9]),
427 }, 463 },
428 $idx); 464 $idx);
429} 465}
430 466
431sub handle_file { 467sub handle_file {
… …
456 $self->err(416, "not satisfiable", $hdr, ""); 492 $self->err(416, "not satisfiable", $hdr, "");
457 493
458satisfiable: 494satisfiable:
459 # check for segmented downloads 495 # check for segmented downloads
460 if ($l && $::NO_SEGMENTED) { 496 if ($l && $::NO_SEGMENTED) {
461 my $delay = $::PER_TIMEOUT + 15; 497 my $delay = $::NOW + $::PER_TIMEOUT + 15;
462 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) { 498 while (%{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
463 if ($delay <= 0) { 499 if ($delay <= $::NOW) {
464 $self->err_segmented_download; 500 $self->err_segmented_download;
465 } else { 501 } else {
466 Coro::Event::do_timer(after => 4); $delay -= 4; 502 $httpevent->wait;
467 } 503 }
468 } 504 }
469 } 505 }
470 506
471 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 507 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
488 524
489 my $fudge = $queue->[0]->waiters; 525 my $fudge = $queue->[0]->waiters;
490 $fudge = $fudge ? ($fudge+1)/$fudge : 1; 526 $fudge = $fudge ? ($fudge+1)/$fudge : 1;
491 527
492 $queue->[1] *= $fudge; 528 $queue->[1] *= $fudge;
493 my $transfer = $queue->[0]->guard;
494
495 if ($fudge != 1) {
496 $queue->[1] /= $fudge;
497 $queue->[1] = $queue->[1] * $::wait_factor
498 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
499 }
500 $self->{time} = $::NOW;
501
502 $self->{fh}->writable or return;
503 529
504 my ($fh, $buf, $r); 530 my ($fh, $buf, $r);
505 my $current = $Coro::current; 531 my $current = $Coro::current;
506 open $fh, "<", $self->{path} 532 open $fh, "<", $self->{path}
507 or die "$self->{path}: late open failure ($!)"; 533 or die "$self->{path}: late open failure ($!)";
… …
511 if (0) { 537 if (0) {
512 if ($l) { 538 if ($l) {
513 sysseek $fh, $l, 0; 539 sysseek $fh, $l, 0;
514 } 540 }
515 } 541 }
542
543 my $transfer; # transfer guard
544 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
516 545
517 while ($h > 0) { 546 while ($h > 0) {
547 unless ($transfer) {
548 if ($transfer ||= $queue->[0]->timed_guard($::WAIT_INTERVAL)) {
549 if ($fudge != 1) {
550 $queue->[1] /= $fudge;
551 $queue->[1] = $queue->[1] * $::wait_factor
552 + ($::NOW - $self->{time}) * (1 - $::wait_factor);
553 }
554 $bufsize = $::BUFSIZE;
555 $self->{time} = $::NOW;
556 }
557 }
558
518 if (0) { 559 if (0) {
519 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 560 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
520 or last; 561 or last;
521 } else { 562 } else {
522 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h), 563 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
523 $buf, 0, sub { 564 $buf, 0, sub {
524 $r = $_[0]; 565 $r = $_[0];
525 Coro::ready($current); 566 Coro::ready($current);
526 }); 567 });
527 &Coro::schedule; 568 &Coro::schedule;

Diff Legend

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