--- lib/PXElator/httpd.pm	2009/07/30 21:31:30	67
+++ lib/PXElator/httpd.pm	2009/07/31 22:52:22	104
@@ -19,7 +19,8 @@
 use IO::Socket::INET;
 use Module::Refresh;
 
-our $pids = { httpd => $$ };
+our $pids;
+$pids = { httpd => $$ } unless defined $pids; # keep pids on refresh
 
 sub DESTROY {
 	warn "pids ",dump( $pids );
@@ -36,6 +37,9 @@
 our $url = "http://$server::ip:$port";
 
 use html;
+our $static_pids;
+
+use Time::HiRes qw/time/;
 
 sub static {
 	my ($client,$path) = @_;
@@ -44,6 +48,16 @@
 
 	return if ! -f $full;
 
+	my $start_t = time();
+
+	if ( my $pid = fork ) {
+		# parent
+		close($client);
+		print "http static child $pid\n";
+		$static_pids->{$pid} = $path;
+		return 1;
+	}
+
 	my $type = 'application/octet-stream';
 	$type = 'text/html' if $path =~ m{\.htm};
 	$type = 'application/javascript' if $path =~ m{\.js};
@@ -51,26 +65,33 @@
 
 	my $size = -s $full || return;
 
+	$client->autoflush(1);
+
 	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";
 
-	my $block = 8192;
+	my $block = 1400; # try not to fragment packages (pxelinux seems to have problems with it)
 	my $buff;
 	my $pos = 0;
 
+	print "static $path $type $size block: $block\n";
+
 	while( my $len = read $fh, $buff, $block ) {
 		print $client $buff;
 		$pos += $len;
-		printf "%s %d/%d %.2f%%\r", $path, $pos, $size, $pos * 100 / $size;
+		printf "%s %d/%d %.2f%% %.2f K/s\r"
+			, $path, $pos
+			, $size, $pos * 100 / $size
+			, ( $pos / 1024 ) / ( time() - $start_t )
+			;
 	}
 	close($fh);
 	close($client);
 
-	print "$path $pos == $size OK\n";
+	print "\n";
 
-	return $path;
+	exit;
 }
 
 use boolean;
@@ -84,22 +105,26 @@
 	my $daemon = shift;
 	my $pid = $pids->{$daemon};
 
-	warn "start_stop $daemon $pid pids: ",dump( $pids );
+	warn "start_stop $daemon $pid\n";
 
 	if ( $pid =~ m{^\d+$} ) {
-		warn "kill 9 $pid";
-		kill 9, $pid;
+		my $pstree = `pstree -p $pid`;
+		my @pids = $pstree =~ m{\((\d+)\)}g;
+		warn "pstree $pstree pids ",dump( @pids );
+		kill 1, $_ foreach reverse @pids;
 		$pids->{$daemon} = 'stopped';
 		return qq|$daemon pid $pid stopped|;
 	} else {
 		if ( $pid = fork ) {
 			# parent
 			$pids->{$daemon} = $pid;
-			warn "forked $daemon $pid";
+			warn "forked $daemon $pid\n";
 			return qq|$daemon pid $pid started|;
 		} elsif ( defined $pid ) {
 			# child
-			my $eval = $daemon . '::start(' . ( @_ ? dump(@_) : '' ) . ')';
+			my $invoke = 'start';
+			$invoke = $1 if $daemon =~ s{/(.+)}{};
+			my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
 			warn "eval $eval";
 			eval $eval;
 			warn "can't start $daemon: $@" if $@;
@@ -116,7 +141,7 @@
 sub get_request {
 	my ( $client, $path, $param ) = @_;
 
-	warn "get_request $client $path ",dump( $param );
+	warn "get_request $path ", $param ? dump( $param ) : '', "\n";
 
 	if ( my $found = static( $client,$path ) ) {
 		warn "static $found" if $debug;
@@ -132,27 +157,75 @@
 
 			'debug',	qq|<a href=/our/debug/| . boolean::toggle($debug) . qq|>$debug</a>|,
 		);
-		foreach my $name ( %$pids ) {
+
+		my $debug_proc = '';
+
+		warn 'pids: ', dump( $pids ) if $debug;
+		foreach my $name ( sort keys %$pids ) {
 			my $pid = $pids->{$name} || next;
+
+			my $html = qq|<a href=/start_stop/$name>$pid</a>|;
+
 			my $proc = "/proc/$pid/status";
 
-			my $html = qq|<a href=/$name>$pid</a>|;
-			$html   .= qq|<pre style="font-size: 10%">|
-					.  ( $debug && -e $proc ? read_file($proc) : '' )
-					.  qq|</pre>| if $debug;
+			if ( -e $proc ) {
+				if ( $debug ) {
+					$html .= qq| <a name=$pid href=#proc-$pid>?</a>|;
+
+					$debug_proc
+						.= qq|<a name=proc-$pid href=#$pid>$proc</a><pre style="font-size: 10%">|
+						.  read_file($proc)
+						.  qq|</pre>|
+						;
+				}
+
+				if ( $name->can('start_fork') ) {
+					$html .= qq| <a href=/start_stop/kvm/$_>$_</a>| foreach $name->start_fork;
+				}
+
+				if ( $name->can('actions') ) {
+					$html .= qq| <a href=/action/kvm/$_>$_</a>| foreach $name->actions;
+				}
+			}
 
 			push @rows, ( $name => $html );
 		}
 
-		print $client $ok, html::table( 2, @rows );
+		my $below_table = '';
+
+		warn 'static_pids: ', dump( $static_pids ) if $debug;
+		foreach my $pid ( keys %$static_pids ) {
+			my $path = $static_pids->{$pid};
+			if ( -d "/proc/$pid" ) {
+				push @rows, ( $path => qq|<a href=/kill/static/$pid>$pid</a>| );
+			} elsif ( $param->{clean_completed_downloads} ) {
+				delete $static_pids->{$pid}
+			} else {
+				push @rows, ( $path => "$pid competed" );
+				$below_table = qq|<a href="/?clean_completed_downloads=1">clean completed downloads</a>|;
+			}
+		}
+
+		print $client $ok
+			, html::table( 2, @rows )
+			, $below_table
+			, html::tabs( log::mac_changes )
+			, $debug_proc
+			;
 
 	} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
 		eval 'our $' . $1 . ' = ' . $2;
 		warn $@ if $@;
 		print $client $redirect, qq|<big>$1 = $2</big><br>Location: <a href="$url">$url</a>|;
 		server::debug( $debug ) if $1 eq 'debug';
-	} elsif ( $path =~ m{^/(screen|kvm)} ) {
+	} elsif ( $path =~ m{^/start_stop/((?:screen|kvm).*)} ) { # XXX we don't want to stop all classes
 		print $client $redirect, start_stop($1);
+	} elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) {
+		$1->$2();
+		print $client $redirect;
+	} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
+		print $client $redirect;
+		kill 1, $1 || kill 9, $2 && warn "killed $1";
  	} elsif ( $path eq '/exit' ) {
 #		DESTROY;
 		exit 0;
@@ -206,7 +279,6 @@
 				}
 				warn "param: ",dump( $param ) if $debug;
 			}
-			warn "path $path param: ",dump( $param );
 			get_request $client, $path, $param;
 		} else {
 			print $client "HTTP/1.0 500 No method\r\nConnection: close\r\nContent-type: text/plain\r\n\r\n500 $request";