[BACK]Return to lonmaxima CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom

Diff for /loncom/lonmaxima between versions 1.8 and 1.24

version 1.8, 2006/03/04 06:44:11 version 1.24, 2007/02/08 06:28:30
Line 30 Line 30
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
    use Expect; 
 use IPC::Open3;  
 use IO::Select;  use IO::Select;
 use IO::Socket;  use IO::Socket;
 use IO::File;  use IO::File;
Line 44  use strict; Line 43  use strict;
   
 # global variables  # global variables
 my $PREFORK                = 5;        # number of children to maintain  my $PREFORK                = 5;        # number of children to maintain
 my $MAX_CLIENTS_PER_CHILD  = 5;        # number of clients each child should process  my $MAX_CLIENTS_PER_CHILD  = 50;       # number of clients each child should process
 my %children               = ();       # keys are current child process IDs  my %children               = ();       # keys are current child process IDs
 my $children               = 0;        # current number of children  my $children               = 0;        # current number of children
 my $status;                            # string for current status  my $status;                            # string for current status
Line 52  my $pidfile;                           # Line 51  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
   
 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);
     
 sub maximareply {  
     my ($cmd) = @_;  
     my $reply='';  
     my $error='';  
     my $exitstatus='';  
   
     unless ($cmd=~/\;\n$/) { $cmd.=";\n"; }  
   
     my ($cmd_in, $cmd_out, $cmd_err);  
     my $maximapid = open3($cmd_in, $cmd_out, $cmd_err, 'maxima');  
     $children{$maximapid} = 1;  
       
     print $cmd_in $cmd;  
     close($cmd_in);  
   
     &status("Command sent");  
   
     $SIG{ALRM} = sub { kill 9 => $maximapid; };   
     alarm(5);  
     no strict 'refs';  
   
     my $selector = IO::Select->new();  
   
     $selector->add($cmd_err, $cmd_out);  
       
     while (my @ready = $selector->can_read()) {  
  foreach my $fh (@ready) {  
     if (fileno($fh) == fileno($cmd_err)) {  
  $error.=<$cmd_err>;  
     } else {  
  my $line = scalar(<$cmd_out>);  
                 if ($line=~/^(\(\%o|\s)/) {  
     $line=~s/^\(.*\)/     /;   
     $reply.=$line;   
  }  
     }  
     $selector->remove($fh) if eof($fh);  
  }  
     }  
     alarm(0);  
     $SIG{ALRM} = 'DEFAULT';  
     close($cmd_out);  
     close($cmd_err);  
     use strict 'refs';  
     &status("Command processed");  
     return ($reply,$error,$exitstatus);  
 }  
    
 # ------------------------------------------------------------ Service routines   # ------------------------------------------------------------ Service routines 
 sub REAPER {                        # takes care of dead children   sub REAPER {                        # takes care of dead children 
                                     # and MAXIMA processes                                      # and MAXIMA processes
Line 247  close(PIDSAVE); Line 199  close(PIDSAVE);
 &status('Starting');  &status('Starting');
             
   
   # Install signal handlers.
   $SIG{CHLD} = \&REAPER;
   $SIG{INT}  = $SIG{TERM} = \&HUNTSMAN;
    
 # Fork off our children.  # Fork off our children.
 for (1 .. $PREFORK) {  for (1 .. $PREFORK) {
     &make_new_child($server);      &make_new_child($server);
 }  }
     
 # Install signal handlers.  
 $SIG{CHLD} = \&REAPER;  
 $SIG{INT}  = $SIG{TERM} = \&HUNTSMAN;  
    
 # And maintain the population.  # And maintain the population.
 while (1) {  while (1) {
     &status('Parent process, sleeping');      &status('Parent process, sleeping');
Line 291  sub make_new_child { Line 243  sub make_new_child {
         sigprocmask(SIG_UNBLOCK, $sigset)          sigprocmask(SIG_UNBLOCK, $sigset)
             or die("Can't unblock SIGINT for fork: $!\n");              or die("Can't unblock SIGINT for fork: $!\n");
   
  &process_requests($server);          &logthis('New process started');
   
           my $command=Expect->spawn('maxima');
           $command->log_stdout(0);
   
           &getmaximaoutput($command);
   
           for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
              &status('Accepting connections');
              my $client = $server->accept()     or last;
              print $command "kill(all);\n";
      &getmaximaoutput($command);
              &sync($command);
              while (my $cmd=<$client>) {
                 &status('Processing command');
                 print $command &unescape($cmd);
                 my ($reply,$finished,$syntaxerr);
                 while ((!$finished) && (!$syntaxerr) && ($reply !~ /^Error\:/)) {
                     ($reply,$finished,$syntaxerr) = &getmaximaoutput($command);
                 }
                 print $client &escape($reply)."\n";
                 if ($reply=~/^Error\:/) {
                    &logthis('Died through '.$reply);
                    $client->close();
                    $command->hard_close();     
                    exit;
                 }      
         &sync($command);
                 &status('Waiting for commands');
              }
           }
   
         # tidy up gracefully and finish          # tidy up gracefully and finish
   
           $command->soft_close();
   
         # this exit is VERY important, otherwise the child will become          # this exit is VERY important, otherwise the child will become
         # a producer of more and more children, forking yourself into          # a producer of more and more children, forking yourself into
         # process death.          # process death.
Line 302  sub make_new_child { Line 286  sub make_new_child {
     }      }
 }  }
   
 sub process_requests {  {
     my ($server) = @_;      my $counter;
     # handle connections until we've reached $MAX_CLIENTS_PER_CHILD      sub sync {
     for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {   my ($command)=@_;
  &status('Accepting connections');        $counter++;
  my $client = $server->accept()     or last;   my $expect=$counter.time;
  while (my $cmd=<$client>) {   print $command "$expect;\n";
     &status('Processing command');   while (1) {
     print $client &escape((&maximareply(&unescape($cmd)))[0])."\n";      my $output=&getmaximaoutput($command);
       if (($output=~/\Q$expect\E/) || ($output=~/^Error\:/)) {
    return;
       }
  }   }
     }          }
   }
   
   sub getmaximaoutput {
       my ($command)=@_;
       my (undef,$error,undef,$output)=$command->expect(20, -re => '^\(\%i\d+\)');
       if ($error) {
          return 'Error: '.$error;
       }
       $output =~ s/\r+//g; # Remove Windows-style linebreaks
       my $hasoutput=0;
       my $foundoutput=0;
       my $syntaxerr=0;
       my $realoutput='';
       foreach my $line (split(/\n/,$output)) {
          if ($line=~/\;/) { $foundoutput=1; next; }
          if (!$foundoutput) { next; }
          if ($line=~/^Incorrect syntax:/) { $syntaxerr = 1; next; }
          (my $label, $line) = ($line=~ /^(\(\%o\d+\))(.+)$/);
          if ($label) {
             $label=~s/\S/ /g;
             $line=$label.$line;
             $hasoutput = 1;
          }
          $realoutput.=$line."\n";
       }
       if (wantarray) {
           return ($realoutput,$hasoutput,$syntaxerr);
       } else {
           return $realoutput;
       }
 }  }
Removed from v.1.8  
changed lines
  Added in v.1.24

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