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

Diff for /loncom/lonmaxima between versions 1.5 and 1.8

version 1.5, 2006/03/03 23:41:38 version 1.8, 2006/03/04 06:44:11
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);
     
Line 65  sub maximareply { Line 64  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');      my $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);
       no strict 'refs';
   
     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 (fileno($fh) == fileno($cmd_err)) {
  $error.=<$cmd_err>;   $error.=<$cmd_err>;
     } else {      } else {
  my $line = scalar <$cmd_out>;   my $line = scalar(<$cmd_out>);
                 if ($line=~/^(\(\%o|\s)/) {                  if ($line=~/^(\(\%o|\s)/) {
     $line=~s/^\(.*\)/     /;       $line=~s/^\(.*\)/     /; 
     $reply.=$line;       $reply.=$line; 
Line 90  sub maximareply { Line 94  sub maximareply {
     $selector->remove($fh) if eof($fh);      $selector->remove($fh) if eof($fh);
  }   }
     }      }
       alarm(0);
       $SIG{ALRM} = 'DEFAULT';
     close($cmd_out);      close($cmd_out);
     close($cmd_err);      close($cmd_err);
       use strict 'refs';
     &status("Command processed");      &status("Command processed");
     return ($reply,$error,$exitstatus);      return ($reply,$error,$exitstatus);
 }  }
Line 101  sub REAPER {                        # ta Line 108  sub REAPER {                        # ta
                                     # and MAXIMA processes                                      # and MAXIMA processes
     $SIG{CHLD} = \&REAPER;      $SIG{CHLD} = \&REAPER;
     my $pid = wait;      my $pid = wait;
     $children --;      $children--;
     delete $children{$pid};      delete($children{$pid});
 }  }
     
 sub HUNTSMAN {                      # signal handler for SIGINT  sub HUNTSMAN {                      # signal handler for SIGINT
     local($SIG{CHLD}) = 'IGNORE';   # we're going to kill our children      local($SIG{CHLD}) = 'IGNORE';   # we're going to kill our children
     kill 'INT' => keys %children;      kill('INT' => keys(%children));
     unlink($pidfile);      unlink($pidfile);
     unlink($port);      unlink($port);
     &logthis('---- Shutdown ----');      &logthis('---- Shutdown ----');
Line 197  if (-e $pidfile) { Line 204  if (-e $pidfile) {
     my $lfh=IO::File->new("$pidfile");      my $lfh=IO::File->new("$pidfile");
     my $pide=<$lfh>;      my $pide=<$lfh>;
     chomp($pide);      chomp($pide);
     if (kill 0 => $pide) { die "already running"; }      if (kill(0 => $pide)) { die "already running"; }
 }  }
   
 # ------------------------------------------------------- Listen to UNIX socket  # ------------------------------------------------------- Listen to UNIX socket
Line 208  $port = "$perlvar{'lonSockDir'}/maximaso Line 215  $port = "$perlvar{'lonSockDir'}/maximaso
 unlink($port);  unlink($port);
     
   
 my $server;  my $server = IO::Socket::UNIX->new(Local  => $port,
 unless (     Type   => SOCK_STREAM,
   $server = IO::Socket::UNIX->new(Local  => $port,     Listen => 10 );
                                   Type   => SOCK_STREAM,  if (!$server) {
                                   Listen => 10 )      my $st=120+int(rand(240));
    ) {  
        my $st=120+int(rand(240));      &logthis("<font color=blue>WARNING: ".
        &logthis(       "Can't make server socket ($st secs):  .. exiting</font>");
          "<font color=blue>WARNING: ".  
          "Can't make server socket ($st secs):  .. exiting</font>");      sleep($st);
        sleep($st);      exit;
        exit;  }
      };  
           
     
 # ---------------------------------------------------- Fork once and dissociate  # ---------------------------------------------------- Fork once and dissociate
     
 my $fpid=fork;  my $fpid=fork;
 exit if $fpid;  exit if $fpid;
 die "Couldn't fork: $!" unless defined ($fpid);  die("Couldn't fork: $!") unless defined($fpid);
     
 POSIX::setsid() or die "Can't start new session: $!";  POSIX::setsid() or die "Can't start new session: $!";
     
Line 239  print PIDSAVE "$$\n"; Line 245  print PIDSAVE "$$\n";
 close(PIDSAVE);  close(PIDSAVE);
 &logthis("<font color='red'>CRITICAL: ---------- Starting ----------</font>");  &logthis("<font color='red'>CRITICAL: ---------- Starting ----------</font>");
 &status('Starting');  &status('Starting');
    
    
   
   
             
   
 # Fork off our children.  # Fork off our children.
 for (1 .. $PREFORK) {  for (1 .. $PREFORK) {
     &make_new_child($server);      &make_new_child($server);
Line 269  sub make_new_child { Line 272  sub make_new_child {
     # block signal for fork      # block signal for fork
     my $sigset = POSIX::SigSet->new(SIGINT);      my $sigset = POSIX::SigSet->new(SIGINT);
     sigprocmask(SIG_BLOCK, $sigset)      sigprocmask(SIG_BLOCK, $sigset)
         or die "Can't block SIGINT for fork: $!\n";          or die("Can't block SIGINT for fork: $!\n");
             
     die "fork: $!" unless defined (my $pid = fork);      die("fork: $!") unless defined(my $pid = fork);
             
     if ($pid) {      if ($pid) {
         # 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} = 1;          $children{$pid} = 1;
         $children++;          $children++;
         return;          return;
Line 286  sub make_new_child { Line 289  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");
   
  &process_requests($server);   &process_requests($server);
   
Removed from v.1.5  
changed lines
  Added in v.1.8

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