--- loncom/lonmaxima 2007/05/15 17:28:32 1.28 +++ loncom/lonmaxima 2007/06/12 23:48:45 1.30 @@ -3,7 +3,7 @@ # The LearningOnline Network with CAPA # Connect to MAXIMA CAS # -# $Id: lonmaxima,v 1.28 2007/05/15 17:28:32 albertel Exp $ +# $Id: lonmaxima,v 1.30 2007/06/12 23:48:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -237,7 +237,7 @@ sub make_new_child { return; } else { # Child can *not* return from this subroutine. - $SIG{INT} = 'DEFAULT'; # make SIGINT kill us as it did before + # unblock signals sigprocmask(SIG_UNBLOCK, $sigset) @@ -246,14 +246,22 @@ sub make_new_child { &logthis('New process started'); my $command=Expect->spawn('maxima'); - $command->log_stdout(0); + # soft/hard_close can take awhile and we really + # don't care we just want it gone + $SIG{INT} = sub { + my $pid = $command->pid(); + kill('KILL'=>$pid); + exit; + }; + + $command->log_stdout(0); #$command->log_file("$execdir/logs/lonmaxima.session.log"); &getmaximaoutput($command); for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) { &status('Accepting connections'); my $client = $server->accept() or last; - print $command ("reset;display2d:false;kill(all);\n"); + print $command ("display2d:false;kill(all);\n"); &getmaximaoutput($command,2); &sync($command); my $syntaxerr = 0;