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

Diff for /loncom/lonmaxima between versions 1.6 and 1.16

version 1.6, 2006/03/03 23:47:55 version 1.16, 2006/03/08 22:30:11
Line 30 Line 30
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
    use Expect; 
 use IPC::Open3;  use IPC::Open3;
 use IO::Select;  use IO::Select;
 use IO::Socket;  use IO::Socket;
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
   
 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 $pid = open3($cmd_in, $cmd_out, $cmd_err, 'maxima');  
     $children{$pid} = 1;  
       
     print $cmd_in $cmd;  
     close($cmd_in);  
   
     &status("Command sent");  
   
     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);  
  }  
     }  
     close($cmd_out);  
     close($cmd_err);  
     &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 240  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 285  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);          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;
              while (my $cmd=<$client>) {
                 &status('Processing command');
                 print $command &unescape($cmd).";\n";
                 print $client &escape(&getmaximaoutput($command))."\n";
              }
           }
   
         # 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 296  sub make_new_child { Line 269  sub make_new_child {
     }      }
 }  }
   
 sub process_requests {  sub getmaximaoutput {
     my ($server) = @_;      my ($command)=@_;
     # handle connections until we've reached $MAX_CLIENTS_PER_CHILD      my (undef,undef,undef,$output)=$command->expect(20, -re => '\(\%i\d+\)');
     for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {      my $foundoutput=0;
  &status('Accepting connections');           my $realoutput='';
  my $client = $server->accept()     or last;      foreach my $line (split(/\n/,$output)) {
  while (my $cmd=<$client>) {         if ($line=~/\;/) { $foundoutput=1; next; }
     &status('Processing command');         if (!$foundoutput) { next; }
     print $client &escape((&maximareply(&unescape($cmd)))[0])."\n";         my ($label)=($line=~s/^(\(\%o\d+\))//);
  }         if ($label) {
     }                $label=~s/\S/ /g;
             $line=$label.$line;
          }
          $realoutput.=$line."\n";
       }
       return $realoutput;
 }  }
Removed from v.1.6  
changed lines
  Added in v.1.16

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