loncom/lonmaxima - diff

Return to lonmaxima CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lonmaxima between versions 1.6 and 1.7

version 1.6, 2006/03/03 23:47:55	version 1.7, 2006/03/04 02:33:54
Line 52 my $pidfile; #	Line 52 my $pidfile; #
my $port; # path to UNIX socket file	my $port; # path to UNIX socket file
my %perlvar; # configuration file info	my %perlvar; # configuration file info
my $lastlog; # last string that was logged	my $lastlog; # last string that was logged
	my $maximapid; # PID of maxima process
	my $selector; # open3's selector
use vars qw($PREFORK $MAX_CLIENTS_PER_CHILD %children $children $status	use vars qw($PREFORK $MAX_CLIENTS_PER_CHILD %children $children $status
$pidfile $port %perlvar $lastlog);	$pidfile $port %perlvar $lastlog $maximapid $selector);

sub maximareply {	sub maximareply {
my ($cmd) = @_;	my ($cmd) = @_;
Line 65 sub maximareply {	Line 66 sub maximareply {
unless ($cmd=~/\;\n$/) { $cmd.=";\n"; }	unless ($cmd=~/\;\n$/) { $cmd.=";\n"; }

my ($cmd_in, $cmd_out, $cmd_err);	my ($cmd_in, $cmd_out, $cmd_err);
my $pid = open3($cmd_in, $cmd_out, $cmd_err, 'maxima');	$maximapid = open3($cmd_in, $cmd_out, $cmd_err, 'maxima');
$children{$pid} = 1;	$children{$maximapid} = 1;

print $cmd_in $cmd;	print $cmd_in $cmd;
close($cmd_in);	close($cmd_in);

&status("Command sent");	&status("Command sent");

my $selector = IO::Select->new();	$SIG{ALRM} = sub { kill 9 => $maximapid; };
	alarm(5);
	no strict 'refs';

	$selector = IO::Select->new();

$selector->add($cmd_err, $cmd_out);	$selector->add($cmd_err, $cmd_out);

while (my @ready = $selector->can_read()) {	while (my @ready = $selector->can_read()) {
Line 90 sub maximareply {	Line 96 sub maximareply {
$selector->remove($fh) if eof($fh);	$selector->remove($fh) if eof($fh);
}	}
}	}
	alarm(0);
	$SIG{ALRM} = 'DEFAULT';
close($cmd_out);	close($cmd_out);
close($cmd_err);	close($cmd_err);
	use strict 'refs';
&status("Command processed");	&status("Command processed");
return ($reply,$error,$exitstatus);	return ($reply,$error,$exitstatus);
}	}
Line 240 close(PIDSAVE);	Line 249 close(PIDSAVE);
&status('Starting');	&status('Starting');



# Fork off our children.	# Fork off our children.
for (1 .. $PREFORK) {	for (1 .. $PREFORK) {
&make_new_child($server);	&make_new_child($server);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.6
changed lines
	Added in v.1.7