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

Diff for /loncom/lonmaxima between versions 1.6 and 1.11

version 1.6, 2006/03/03 23:47:55 version 1.11, 2006/03/04 15:47:26
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
   my $maximapid;                         # PID of Maxima process
 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 $maximapid);
     
 sub maximareply {  sub maximareply {
     my ($cmd) = @_;      my ($cmd) = @_;
Line 65  sub maximareply { Line 65  sub maximareply {
     unless ($cmd=~/\;\n$/) { $cmd.=";\n"; }      unless ($cmd=~/\;\n$/) { $cmd.=";\n"; }
   
     my ($cmd_in, $cmd_out, $cmd_err);      my ($cmd_in, $cmd_out, $cmd_err);
     my $pid = open3($cmd_in, $cmd_out, $cmd_err, 'maxima');      $maximapid = open3($cmd_in, $cmd_out, $cmd_err, 'maxima');
     $children{$pid} = 1;      $children{$maximapid} = 1;
           
     print $cmd_in $cmd;      print $cmd_in $cmd;
     close($cmd_in);      close($cmd_in);
   
     &status("Command sent");      &status("Command sent");
   
       $SIG{ALRM} = sub { kill(9 => $maximapid); }; 
       alarm(5);
   
     my $selector = IO::Select->new();      my $selector = IO::Select->new();
   
     $selector->add($cmd_err, $cmd_out);      $selector->add($cmd_err, $cmd_out);
           
     while (my @ready = $selector->can_read()) {      while (my @ready = $selector->can_read()) {
  foreach my $fh (@ready) {   foreach my $fh (@ready) {
     if (fileno($fh) == fileno($cmd_err)) {      if (ref($fh) 
    && ref($cmd_err)
    && fileno($fh) == fileno($cmd_err)) {
  $error.=<$cmd_err>;   $error.=<$cmd_err>;
     } else {      } else {
  my $line = scalar(<$cmd_out>);   my $line = scalar(<$cmd_out>);
Line 90  sub maximareply { Line 96  sub maximareply {
     $selector->remove($fh) if eof($fh);      $selector->remove($fh) if eof($fh);
  }   }
     }      }
     close($cmd_out);      alarm(0);
     close($cmd_err);      $SIG{ALRM} = 'DEFAULT';
       if (ref($cmd_out)) { close($cmd_out); }
       if (ref($cmd_err)) { close($cmd_err); }
   
     &status("Command processed");      &status("Command processed");
     return ($reply,$error,$exitstatus);      return ($reply,$error,$exitstatus);
 }  }
Line 240  close(PIDSAVE); Line 249  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');
Removed from v.1.6  
changed lines
  Added in v.1.11

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