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

Diff for /loncom/lonmaxima between versions 1.12 and 1.23

version 1.12, 2006/03/08 03:18:42 version 1.23, 2007/02/03 04:09: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 43  use LONCAPA::Configuration; Line 42  use LONCAPA::Configuration;
 use strict;  use strict;
   
 # global variables  # global variables
 my $STARTPORT              = 5664;     # port for first child's server  
 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 %usedmaximaports        = ();       # keys are the used maximaports  
 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
 my $pidfile;                           # file containg parent process pid  my $pidfile;                           # file containg parent process pid
 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 %usedmaximaports $status  
   use vars qw($PREFORK $MAX_CLIENTS_PER_CHILD %children $children $status
     $pidfile $port %perlvar $lastlog);      $pidfile $port %perlvar $lastlog);
     
 sub maximareply {  
     my ($cmd,$maximaclient,$maximapid) = @_;  
     my $reply='';  
     while (my $line=<$maximaclient>) {  
        $reply.=$line;  
     }  
     unless ($cmd=~/\;\n$/) { $cmd.=";\n"; }  
     print $maximaclient $cmd;  
     &status("Command sent to $maximapid");  
     while (my $line=<$maximaclient>) {  
        $reply.=$line;  
     }  
     &status("Command processed by $maximapid");  
     return $reply;  
 }  
    
 # ------------------------------------------------------------ Service routines   # ------------------------------------------------------------ Service routines 
 sub REAPER {                        # takes care of dead children   sub REAPER {                        # takes care of dead children 
                                     # and MAXIMA processes                                      # and MAXIMA processes
     $SIG{CHLD} = \&REAPER;      $SIG{CHLD} = \&REAPER;
     my $pid = wait;      my $pid = wait;
     $children--;      $children--;
     delete($usedmaximaports{$children{$pid}});  
     delete($children{$pid});      delete($children{$pid});
 }  }
     
Line 221  close(PIDSAVE); Line 202  close(PIDSAVE);
 # Install signal handlers.  # Install signal handlers.
 $SIG{CHLD} = \&REAPER;  $SIG{CHLD} = \&REAPER;
 $SIG{INT}  = $SIG{TERM} = \&HUNTSMAN;  $SIG{INT}  = $SIG{TERM} = \&HUNTSMAN;
    
 my $maximaport=$STARTPORT;   
 # Fork off our children.  # Fork off our children.
 for (1 .. $PREFORK) {  for (1 .. $PREFORK) {
     &make_new_child($server,$maximaport);      &make_new_child($server);
     $maximaport++;  
 }  }
     
 # And maintain the population.  # And maintain the population.
Line 235  while (1) { Line 214  while (1) {
     sleep;                          # wait for a signal (i.e., child's death)      sleep;                          # wait for a signal (i.e., child's death)
     for (my $i = $children; $i < $PREFORK; $i++) {      for (my $i = $children; $i < $PREFORK; $i++) {
         &status('Parent process, starting child');          &status('Parent process, starting child');
         my $newport;          &make_new_child($server);           # top up the child pool
         foreach $newport ($STARTPORT .. $STARTPORT+$PREFORK-1) {  
             if (!defined($usedmaximaports{$newport})) { last; }  
         }  
         &make_new_child($server,$newport);           # top up the child pool  
     }      }
 }  }
                                                                                                                                                                   
 sub make_new_child {  sub make_new_child {
     my ($server,$maximaport) = @_;      my ($server) = @_;
   
     # block signal for fork      # block signal for fork
     my $sigset = POSIX::SigSet->new(SIGINT);      my $sigset = POSIX::SigSet->new(SIGINT);
Line 257  sub make_new_child { Line 232  sub make_new_child {
         # Parent records the child's birth and returns.          # Parent records the child's birth and returns.
         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");
         $children{$pid} = $maximaport;          $children{$pid} = 1;
         $children++;          $children++;
         return;          return;
     } else {      } else {
Line 267  sub make_new_child { Line 242  sub make_new_child {
         # unblock signals          # unblock signals
         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");
           
         # open the MAXIMA port          &logthis('New process started');
         my $maximaserver = IO::Socket::INET->new(LocalPort => $maximaport,  
                                               Type      => SOCK_STREAM,          my $command=Expect->spawn('maxima');
                                               Proto     => 'tcp',          $command->log_stdout(0);
                                               Reuse     => 1,  
                                               Listen    => 10 )          &getmaximaoutput($command);
                         or die "making socket: $@\n";  
           for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
         # open MAXIMA to talk to that port             &status('Accepting connections');
         my ($cmd_in, $cmd_out, $cmd_err);             my $client = $server->accept()     or last;
         my $maximapid = open3($cmd_in, $cmd_out, $cmd_err, "maxima -s $maximaport");             print $command "kill(all);\n";
         $children{$maximapid} = 1;     &getmaximaoutput($command);
              &sync($command);
         my $prompt=<$cmd_out>;             while (my $cmd=<$client>) {
         &logthis("Maxima $maximapid: $prompt");                &status('Processing command');
                 print $command &unescape($cmd);
         &status("Waiting $maximapid on $maximaport");                my ($reply,$finished,$syntaxerr) = &getmaximaoutput($command);
         # Hopefully, MAXIMA calls us back                if ((!$finished) && (!$syntaxerr) && ($reply !~ /^Error\:/)) {
         my $maximaclient=$maximaserver->accept();                    ($reply,$finished,$syntaxerr) = &getmaximaoutput($command);
         &status("$maximapid on $maximaport connected.");                }
         &logthis("Maxima $maximapid on port $maximaport connected.");                print $client &escape($reply)."\n";
                 if ($reply=~/^Error\:/) {
         # Absorb initial prompts                        &logthis('Died through '.$reply);
         &logthis(&maximareply("0;\n",$maximaclient,$maximapid));                   $client->close();
                     $command->hard_close();     
         # Ready for action                     exit;
                 }      
         &process_requests($server,$maximaclient,$maximapid);        &sync($command);
                 &status('Waiting for commands');
              }
           }
   
         # tidy up gracefully and finish          # tidy up gracefully and finish
   
         if (ref($cmd_out)) { close($cmd_out); }          $command->soft_close();
         if (ref($cmd_err)) { close($cmd_err); }  
         if (ref($cmd_in)) { close($cmd_in); }  
   
         # 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
Line 310  sub make_new_child { Line 286  sub make_new_child {
     }      }
 }  }
   
 sub process_requests {  {
     my ($server,$maximaclient,$maximapid) = @_;      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 for '.$maximapid.' on '.$maximaport);        $counter++;
  my $client = $server->accept()     or last;   my $expect=$counter.time;
  while (my $cmd=<$client>) {   print $command "$expect;\n";
     &status('Processing command by '.$maximapid.' on '.$maximaport);   while (1) {
     print $client &escape((&maximareply(&unescape($cmd),$maximaclient,$maximapid))[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.12  
changed lines
  Added in v.1.23

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