Diff for /loncom/lonmaxima between versions 1.12 and 1.42

version 1.12, 2006/03/08 03:18:42 version 1.42, 2013/07/04 11:44:44
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 $extra_children         = 0;
 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--;      if (exists($children{$pid})) {
     delete($usedmaximaports{$children{$pid}});   $children--;
     delete($children{$pid});   delete($children{$pid});
    if ($extra_children) {
       $extra_children--;
    }
       }    
 }  }
     
 sub HUNTSMAN {                      # signal handler for SIGINT  sub HUNTSMAN {                      # signal handler for SIGINT
Line 145  sub catchexception { Line 132  sub catchexception {
 }  }
   
   
   sub child_announce_death {
       $SIG{USR1} = \&child_announce_death;
       if ($extra_children < $PREFORK*10) {
    $extra_children++;
       }
   }
   
 # ---------------------------------------------------------------- Main program  # ---------------------------------------------------------------- Main program
 # -------------------------------- Set signal handlers to record abnormal exits  # -------------------------------- Set signal handlers to record abnormal exits
Line 152  sub catchexception { Line 145  sub catchexception {
     
 $SIG{'QUIT'}=\&catchexception;  $SIG{'QUIT'}=\&catchexception;
 $SIG{__DIE__}=\&catchexception;  $SIG{__DIE__}=\&catchexception;
   $SIG{USR1} = \&child_announce_death;
     
 # ---------------------------------- Read loncapa_apache.conf and loncapa.conf  # ---------------------------------- Read loncapa_apache.conf and loncapa.conf
 &status("Read loncapa.conf and loncapa_apache.conf");  &status("Read loncapa.conf and loncapa_apache.conf");
Line 221  close(PIDSAVE); Line 215  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.
 while (1) {  while (1) {
     &status('Parent process, sleeping');      &status('Parent process, sleeping');
     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+$extra_children; $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 245  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 {
         # Child can *not* return from this subroutine.          # Child can *not* return from this subroutine.
         $SIG{INT} = 'DEFAULT';      # make SIGINT kill us as it did before          
    my $ppid = getppid();
             
         # 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  
         my $maximaserver = IO::Socket::INET->new(LocalPort => $maximaport,  
                                               Type      => SOCK_STREAM,  
                                               Proto     => 'tcp',  
                                               Reuse     => 1,  
                                               Listen    => 10 )  
                         or die "making socket: $@\n";  
   
         # open MAXIMA to talk to that port  
         my ($cmd_in, $cmd_out, $cmd_err);  
         my $maximapid = open3($cmd_in, $cmd_out, $cmd_err, "maxima -s $maximaport");  
         $children{$maximapid} = 1;  
   
         my $prompt=<$cmd_out>;  
         &logthis("Maxima $maximapid: $prompt");  
   
         &status("Waiting $maximapid on $maximaport");  
         # Hopefully, MAXIMA calls us back  
         my $maximaclient=$maximaserver->accept();  
         &status("$maximapid on $maximaport connected.");  
         &logthis("Maxima $maximapid on port $maximaport connected.");  
   
         # Absorb initial prompts       
         &logthis(&maximareply("0;\n",$maximaclient,$maximapid));  
    
         # Ready for action    
   
         &process_requests($server,$maximaclient,$maximapid);  
   
         # tidy up gracefully and finish          &logthis('New process started');
   
         if (ref($cmd_out)) { close($cmd_out); }          my $command = new Expect();
         if (ref($cmd_err)) { close($cmd_err); }          $command->log_stdout(0);
         if (ref($cmd_in)) { close($cmd_in); }          #$command->log_file("$execdir/logs/lonmaxima.session.log");
           $command->spawn('maxima');
           &getmaximaoutput($command, 2); # wait for maxima to finish initialization
    # 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; 
    };
   
   
           for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
               &status('Accepting connections');
               my $client = $server->accept()     or last;
               &sync($command);
               print $command ("display2d:false;simp:true;kill(all);\n");
       &getmaximaoutput($command,2);
               &sync($command);
               my $syntaxerr = 0;
               while (my $cmd=<$client>) {
                   &status('Processing command');
                   print $command &unescape($cmd);
                   my ($reply,$syntaxerr) = &getmaximaoutput($command,1);
                   print $client &escape($reply)."\n";
                   if ($syntaxerr) {
                       last;
                   } elsif ($reply=~/^Error\:/) {
                       &logthis('Died through '.$reply);
       kill('USR1' => $ppid);
                       $client->close();
                       $command->hard_close();     
                       exit;
                   }
           &sync($command);
                   &status('Waiting for commands');
               }
           }
   
    kill('USR1' => $ppid);
    print $command ("quit();\n");
           # tidy up gracefully and finish
    sleep(15);
           $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
Line 310  sub make_new_child { Line 313  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,1);
       if (($output=~/\Q$expect\E/) || ($output=~/^Error\:/)) {
    return;
       }
  }   }
     }          }
   }
   
   sub getmaximaoutput {
       my ($command,$numcheck)=@_;
       my $regexp = '\(\%i\d+\)';
       my $syntaxerr=0;
       if ($numcheck) {
           if ($numcheck eq 2) {
       # command was the killall so should get a full reset on
       # command numbers
       $regexp = '(\(\%i(1)\)|[Ii]ncorrect syntax\:)';
    } elsif ($command->match() =~ /\(\%i(\d+)\)/) {
               my $nextmatch = $1+1;
               $regexp = '(\(\%i'.$nextmatch.'\)|[Ii]ncorrect syntax\:)';
           }
       }
       my $timeout = 20;
       my (undef,$error,$matched,$output) =
    $command->expect($timeout, -re => $regexp);
   
       if ($numcheck && lc($matched) eq 'incorrect syntax:') {
    $syntaxerr = 1;
    if (wantarray) {
       return ($matched,$syntaxerr);
    } else {
       return $matched;
    }
       }
       if ($error) {
    return 'Error: '.$error;
       }
       $output =~ s/\r+//gs; # Remove Windows-style linebreaks
       my $foundoutput=0;
       my $found_label=0;
       my $realoutput='';
       foreach my $line (split(/\n/,$output)) {
          if ($line=~/\;/) { $foundoutput=1; next; }
          if (!$foundoutput) { next; }
          if ($line=~/^[Ii]ncorrect syntax:/) { $syntaxerr = 1; next; }
          if ($line=~ /^(\(\%o\d+\))(.+)$/){
              my $label = $1;
              $line = $2;
              $label =~s/\S/ /g;
              $line=$label.$line;
      $found_label=1;
          }
          if ($found_label) {
      $realoutput.=$line."\n";
          }
       }
       if (wantarray) {
           return ($realoutput,$syntaxerr);
       } else {
           return $realoutput;
       }
 }  }

Removed from v.1.12  
changed lines
  Added in v.1.42


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