--- loncom/lonmaxima 2007/08/03 18:18:05 1.32
+++ loncom/lonmaxima 2007/11/09 18:54:46 1.36
@@ -3,7 +3,7 @@
# The LearningOnline Network with CAPA
# Connect to MAXIMA CAS
#
-# $Id: lonmaxima,v 1.32 2007/08/03 18:18:05 albertel Exp $
+# $Id: lonmaxima,v 1.36 2007/11/09 18:54:46 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -44,6 +44,7 @@ use strict;
# global variables
my $PREFORK = 5; # number of children to maintain
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 = 0; # current number of children
my $status; # string for current status
@@ -60,8 +61,13 @@ sub REAPER { # ta
# and MAXIMA processes
$SIG{CHLD} = \&REAPER;
my $pid = wait;
- $children--;
- delete($children{$pid});
+ if (exists($children{$pid})) {
+ $children--;
+ delete($children{$pid});
+ if ($extra_children) {
+ $extra_children--;
+ }
+ }
}
sub HUNTSMAN { # signal handler for SIGINT
@@ -126,6 +132,12 @@ sub catchexception {
}
+sub child_announce_death {
+ $SIG{USR1} = \&child_announce_death;
+ if ($extra_children < $PREFORK*10) {
+ $extra_children++;
+ }
+}
# ---------------------------------------------------------------- Main program
# -------------------------------- Set signal handlers to record abnormal exits
@@ -133,6 +145,7 @@ sub catchexception {
$SIG{'QUIT'}=\&catchexception;
$SIG{__DIE__}=\&catchexception;
+$SIG{USR1} = \&child_announce_death;
# ---------------------------------- Read loncapa_apache.conf and loncapa.conf
&status("Read loncapa.conf and loncapa_apache.conf");
@@ -212,7 +225,7 @@ for (1 .. $PREFORK) {
while (1) {
&status('Parent process, sleeping');
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');
&make_new_child($server); # top up the child pool
}
@@ -238,6 +251,7 @@ sub make_new_child {
} else {
# Child can *not* return from this subroutine.
+ my $ppid = getppid();
# unblock signals
sigprocmask(SIG_UNBLOCK, $sigset)
@@ -256,7 +270,7 @@ sub make_new_child {
$command->log_stdout(0);
#$command->log_file("$execdir/logs/lonmaxima.session.log");
- &getmaximaoutput($command);
+ &sync($command);
for (my $i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
&status('Accepting connections');
@@ -274,6 +288,7 @@ sub make_new_child {
last;
} elsif ($reply=~/^Error\:/) {
&logthis('Died through '.$reply);
+ kill('USR1' => $ppid);
$client->close();
$command->hard_close();
exit;
@@ -283,8 +298,10 @@ sub make_new_child {
}
}
+ 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
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.