--- lib/PXElator/httpd.pm	2009/07/30 12:10:53	53
+++ lib/PXElator/httpd.pm	2009/07/30 20:15:39	66
@@ -18,40 +18,57 @@
 #use JSON;
 use IO::Socket::INET;
 use Module::Refresh;
-use Parallel::ForkManager;
 
-our $port = 7777;
-our $debug = 1;
+our $pids = { httpd => $$ };
 
-my $pm = Parallel::ForkManager->new(10);
+sub DESTROY {
+	warn "pids ",dump( $pids );
+	foreach ( values %$pids ) {
+		warn "kill $_";
+		kill 1,$_ || kill 9, $_;
+	}
+}
 
-our $screen_pid;
+our $port = 7777;
+our $debug = 0;
 
 use server;
-our $url = "http://$server::ip:$port/";
+our $url = "http://$server::ip:$port";
 
 use html;
 
 sub static {
 	my ($client,$path) = @_;
 
-	$path = "tftp/$path";
+	my $full = "$server::base_dir/tftp/$path";
 
-	if ( ! -e $path ||  -d $path ) {
-		print $client "HTTP/1.0 404 $path not found\r\n";
-		return;
-	}
+	return if ! -f $full;
 
-	my $type = 'text/plain';
+	my $type = 'application/octet-stream';
 	$type = 'text/html' if $path =~ m{\.htm};
 	$type = 'application/javascript' if $path =~ m{\.js};
+	$type = 'text/plain' if $path =~ m{\.txt};
+
+	my $size = -s $full || return;
+
+	print $client "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nContent-Length: $size\r\nConnection: close\r\n\r\n";
+
+	open(my $fh, $full);
+	print "static $path $type $size\n";
 
-	print $client "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nContent-Length: ", -s $path,"\r\n\r\n";
-	open(my $html, $path);
-	while(<$html>) {
-		print $client $_;
+	my $block = 8192;
+	my $buff;
+	my $pos = 0;
+
+	while( my $len = read $fh, $buff, $block ) {
+		print $client $buff;
+		$pos += $len;
+		printf "%s %d/%d %.2f%%\r", $path, $pos, $size, $pos * 100 / $size;
 	}
-	close($html);
+	close($fh);
+	close($client);
+
+	print "$path $pos == $size OK\n";
 
 	return $path;
 }
@@ -59,7 +76,41 @@
 my $ok = "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n";
 
 use boolean;
+
 use screen;
+use kvm;
+
+$SIG{CHLD} = 'IGNORE';
+
+sub start_stop {
+	my $daemon = shift;
+	my $pid = $pids->{$daemon};
+
+	warn "start_stop $daemon pids: ",dump( $pids );
+
+	if ( $pid ) {
+		warn "kill 9 $pid";
+		kill 9, $pid;
+		$pids->{$daemon} = 'stopped';
+		return qq|$daemon pid $pid stopped|;
+	} else {
+		if ( $pid = fork ) {
+			# parent
+			$pids->{$daemon} = $pid;
+			warn "forked $daemon $pid";
+			return qq|$daemon pid $pid started|;
+		} elsif ( defined $pid ) {
+			# child
+			my $eval = $daemon . '::start(' . dump(@_) . ')';
+			warn "eval $eval";
+			eval $eval;
+			warn "can't start $daemon: $@" if $@;
+			exit;
+		} else {
+			die "fork error $!";
+		}
+	}
+}
 
 sub get_request {
 	my ( $client, $path, $param ) = @_;
@@ -70,40 +121,38 @@
 		warn "static $found" if $debug;
 	} elsif ( $path eq '/' ) {
 
-		my $screen = $screen_pid ? qq|stop <tt>$screen_pid</tt>| : 'start';
+		my $screen = $pids->{screen} ? qq|stop <tt>$pids->{screen}</tt>|	: 'start';
+		my $kvm    = $pids->{kvm}    ? qq|stop <tt>$pids->{kvm}</tt>|		:
+					 $pids->{screen} ? qq|start|							: qq|start screen first|;
+
+		my @rows = (
+			'ip',		html::tt( $server::ip ),
+			'netmask',	html::tt( $server::netmask ),
 
-		print $client $ok,
-		html::table( 2,
-			'pid',   $$,
-			'debug', qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
-			'screen', qq|<a href=/screen>$screen</a>|,
+			'debug',	qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
 		);
+		foreach my $name ( %$pids ) {
+			my $pid = $pids->{$name} || next;
+
+			my $html = qq|<a href=/$name>$pid</a>|;
+			$html   .= qq|<pre style="font-size: 10%">|
+					.  ( $debug ? read_file("/proc/$pid/status") : '' )
+					.  qq|</pre>| if $debug;
+
+			push @rows, ( $name => $html );
+		}
+
+		print $client $ok, html::table( 2, @rows );
 
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
 		print $client qq|HTTP/1.1 302 Found\r\nLocation: $url\r\nContent-type: text/html\r\n\r\n<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
-	} elsif ( $path =~ m{^/screen} ) {
-
-		if ( $screen_pid ) {
-			if ( ! kill $screen_pid ) {
-				warn "kill -9 $screen_pid";
-				if ( kill 9, $screen_pid ) {
-					print $client $ok, qq|screen pid $screen_pid stopped|;
-					$screen_pid = 0;
-				} else {
-					print $client $ok, qq|can't stop screen $screen_pid: $!|;
-				}
-			}
-		} else {
-			if ( $screen_pid = $pm->start ) {
-				print $client $ok, qq|screen started pid $screen_pid|;
-			} else {
-				screen::start;
-				$pm->finish;
-			}
-		}
-
+	} elsif ( $path =~ m{^/(screen|kvm)} ) {
+		print $client $ok, start_stop($1);
+ 	} elsif ( $path eq '/exit' ) {
+#		DESTROY;
+		exit 0;
 	} elsif ( $path =~ m{/boot} ) {
 		print $client qq{$ok
 #!gpxe
@@ -119,6 +168,8 @@
 
 }
 
+use browser;
+
 sub start {
 
 	my $server = IO::Socket::INET->new(
@@ -130,7 +181,9 @@
 
 	print "url $url\n";
 
-	system "/mnt/llin/rest/cvs/uzbl/uzbl -u $url &";
+	start_stop 'browser', $url;
+	start_stop 'screen';
+	start_stop 'kvm';
 
 	while (my $client = $server->accept()) {
 		$client->autoflush(1);
@@ -160,7 +213,8 @@
 		print $client qq{
 		<div style="font-size: 80%; color: #888">
 		<a href="">reload</a>
-		<a href="/">index</a>
+		<a href=/>index</a>
+		<a href=/exit>exit</a>
 		</div>
 		} if $client->connected;