Changeset 16218 for misc/runpugs

Timestamp:

05/07/07 16:26:38 (19 months ago)

Author:

andara

Message:

[runpugs]
- Session.pm: now with Moose
- Session startup handling now more robust
- Repl.pm: a very simple mini-REPL for testing

Location:

misc/runpugs

Files:

• bin/multi_client_model.pl (modified) (4 diffs)
• bin/perl_repl.pl (added)
• bin/termdispatcher.pl (modified) (1 diff)
• bin/termserv.pl (modified) (1 diff)
• bin/test_session.pl (added)
• bin/test_session_dispatcher.pl (added)
• lib/Repl.pm (added)
• lib/Web/Terminal/Server.pm (modified) (7 diffs)
• lib/Web/Terminal/Server/Session.pm (modified) (14 diffs)
• lib/Web/Terminal/Settings.pm (modified) (3 diffs)

misc/runpugs/bin/multi_client_model.pl

@@ -6 +6 @@
 use strict;
 
-use threads;           # pull in threading routines
+#use threads;           # pull in threading routines
 
 use lib '../lib/';
@@ -19 +19 @@
 our $nclients_serial=500;
 
+#for my $i (0..$n_threads-1) {
+#       $threads[$i]=threads->create("client_session",$i);
+#}
+
+# program exits when first thread exits
+my $pid;
 for my $i (0..$n_threads-1) {
-        $threads[$i]=threads->create("client_session",$i);
-}
-
-# program exits when first thread exits
-$threads[0]->join(); 
+        if($pid=fork()) {
+                print "Spawned $i\n"; 
+        } elsif (defined $pid) { # Child
+                        print "Running $i\n";
+                        &client_session($i);
+                        exit(0);
+                } else {
+                        die "Fork failed!";
+                }
+}
+print "Parent: done creating clients.";
+sleep 3600;
+#$threads[0]->join(); 
 
 
@@ -108 +122 @@
 print "$i:WARNING2: $cmd<>$reply\n";# if $v;
 #if ($reply eq '0') {
-system("./killall_perl");
+#system("./killall_perl");
+kill 9,getppid();
 exit() ;
 #}
@@ -118 +133 @@
 } elsif ($abort) {
 &send_cmd(':A',$id,$ip,$app);
-} #�therwise do nothing, server should time the session out
+} #�otherwise do nothing, server should time the session out
 my $w_log= rand($w_max_log)+$w_min_log;
 my $wait=int(2**$w_log);
 print "\n$i:Waiting for $wait seconds...\n" if $v;
 sleep $wait; 
-} #�nd of nclients_serial loop
+} #�end of nclients_serial loop
 
 }

misc/runpugs/bin/termdispatcher.pl

@@ -6 +6 @@
 #
 use lib '../lib/';
-use WebTerminal::Dispatcher;
+use Web::Terminal::Settings;
+use Web::Terminal::Dispatcher;
+#$Web::Terminal::Settings::port=2058;
 
 
 my $id=$ARGV[0]||-1;
-my $cmd=$ARGV[1] || 'my $a='.$id.';say "Hello, $a";';
-#my $cmd='my $a='.$id.';say "Hello, $a";';
-my $prompt='pugs> ';
+my $cmd=$ARGV[1] || 'print "hello\n";say "there";print 4';
 print "Sending msg $id: $cmd\n";
 my $ip="127.0.0.1";
-my $dev=1;
-my $reply = &WebTerminal::Dispatcher::send($id,$ip,$dev,$prompt.$cmd);
+(my $reply,my $prompt,my $histref) =
+&Web::Terminal::Dispatcher::send($id,$ip,1,1,$cmd);
 print $reply;
+print "\nHistory\n";
+for my $entry (@{$histref}) {
+print "\t$entry\n";
+}
 

misc/runpugs/bin/termserv.pl

@@ -1 +1 @@
 #!/usr/bin/perl
+use strict;
+use warnings;
+#BEGIN {
+#$ENV{PERLIO}= ":utf8";
+#}
+#use utf8;
+
 use warnings;
 use strict;
-use utf8;
+
 use lib '../lib/';
-use WebTerminal::Server;
-my $host = 'localhost';
-my $port = 2057;
+use Web::Terminal::Server;
+use  Web::Terminal::Settings;
+$Web::Terminal::Settings::port=2059;
 $ENV{PUGS_SAFEMODE}=1;
-&WebTerminal::Server::run($host,$port);
+my $v=1-$Web::Terminal::Settings::daemon;
+print "Starting server\n" if $v;
+&Web::Terminal::Server::run();
 

misc/runpugs/lib/Web/Terminal/Server.pm

@@ -458 +458 @@
 sub create_session {
         my $app = shift;
-my $session_number=-3;
+        my $session_number=-3;
         if ( $n_sessions[$app] < $n_max[$app] ) {
                 # Yes, there is room to create a new session
@@ -476 +476 @@
                 } else {
                         # Something went wrong, failed to create a new session
+                        print "Something went wrong, failed to create a new session:\n";
+                        print $new_session->{'error'};
+                        print $new_session->{'output'};
+                        
                         # push session number back onto stack
                         push @{ $session_numbers_stack[$app] }, $session_number;
@@ -484 +488 @@
                 $session_number= -2;        # max nsessions reached
         }
-        print "+++ Created session  $session_number ($app): tot:$n_sessions[$app]; active: $n_active_sessions[$app];inactive: $n_inactive_sessions[$app]\n" if $v;
-        print "+++ Actual occupancy $session_number ($app): tot:",scalar keys %{$sessions[$app]},"; active: ", scalar keys %{$active_sessions[$app]},";inactive: ",scalar @{$inactive_sessions[$app]}," ;free: ",scalar @{$session_numbers_stack[$app]},"\n" if $v;
+        print "\n+++ Created session $session_number ($app): tot:$n_sessions[$app]; active: $n_active_sessions[$app];inactive: $n_inactive_sessions[$app]\n" if $v;
+        print "+++ Occupancy for $session_number ($app): tot:",scalar keys %{$sessions[$app]},"; active: ", scalar keys %{$active_sessions[$app]},";inactive: ",scalar @{$inactive_sessions[$app]}," ;free: ",scalar @{$session_numbers_stack[$app]},"\n" if $v;
         assert($n_sessions[$app]==$n_inactive_sessions[$app]+$n_active_sessions[$app]);
         assert(scalar(keys %{$sessions[$app]})==scalar( keys %{$active_sessions[$app]})+scalar( @{$inactive_sessions[$app]}));
@@ -660 +664 @@
 sub init_sessions {
         for my $app ( 0 .. @Web::Terminal::Settings::commands - 1 ) {
+
                 @{ $session_numbers_stack[$app] } = 1 .. $n_max[$app];
                 $n_inactive_sessions[$app] = 0;
@@ -668 +673 @@
                   
 if (&sane($app)) {
+                        print "Creating sessions for $app\n" if $v;
                 for my $i ( 1 .. $Web::Terminal::Settings::npreloaded_sessions[$app] ) {
             my $ret = &create_session($app);
-                        print $ret>0?'OK: $ret':'NOK',': #sesssions: ', scalar( @{ $inactive_sessions[$app] } ), ' for app ',
+                        print $ret>0?'OK: $ret':"NOK: $ret",': #sesssions: ', scalar( @{ $inactive_sessions[$app] } ), ' for app ',
                           $app, "\n"
                           if $v;
                 }
         assert(scalar(@{ $inactive_sessions[$app] })==$Web::Terminal::Settings::npreloaded_sessions[$app]);
-        }
-    }
+        } else {
+                print "App $app is not sane. Skipped.\n" if $v; 
+}
+}
 }    # END of init_sessions()
 #------------------------------------------------------------------------------
-# check if command is sane (FSDO sane)
+# Check if command is sane (FSDO sane)
+# This should be part of settings. 
 sub sane {
     my $app=shift;
     my $cmd=$Web::Terminal::Settings::commands[$app];
     $cmd=~s/^.*nice\s+//; # de-nice
+    if ($cmd !~/pugs/) {
+        return 1;
+    } else {
     my $reply=`PUGS_SAFEMODE=1 $cmd -e \"print 42\" 2>/dev/null`;
     if ($reply==42) {
@@ -689 +701 @@
     } else {
         return 0;
-    }
+    }}
 }
 #-------------------------------------------------------------------------------
@@ -755 +767 @@
                           Web::Terminal::Dispatcher::send( 0, '127.0.0.1', 1, 1,
                                                                           'Web::Terminal::Server::Sessions.clean-up' );
-                        print "call_clean_up() call returned: cleaned up <$ret> sessions\n" if $v;
+                                                                  if ($v) {
+                                                                          if($ret=~/[a-z]/) {
+                        print "call_clean_up() call returned: $ret\n";
+                                                                          } else {
+                        print "call_clean_up() call returned: cleaned up <$ret> sessions\n";
+                }
+                }
                           #( $ret < 1 ) ? "Nothing to clean up" : "OK", "\n" if $v;
                 

misc/runpugs/lib/Web/Terminal/Server/Session.pm

@@ -3 +3 @@
 use vars qw( $VERSION );
 $VERSION='0.3.0';
-use strict;
-use utf8;
+use Moose;
+#use strict;
+#use utf8;
 use lib '.','../../..';
 use Web::Terminal::Settings;
@@ -14 +15 @@
 $SIG{CHLD}='IGNORE';
 
-my $v=(1-$Web::Terminal::Settings::daemon)*(1-$Web::Terminal::Settings::test);
-## Constructor
-sub new {
-        my $invocant = shift;
-        my $class    = ref($invocant) || $invocant;
-        my $self     = {@_};
+my $v=0*(1-$Web::Terminal::Settings::daemon)*(1-$Web::Terminal::Settings::test);
+
     my $prompt ='/'.$Web::Terminal::Settings::prompt.'/';
-    $self->{'prompt'}=$prompt;
-    $self->{'error'}=0;
-    $self->{'recent'}=[];
-    print "Starting pugs session for ",$self->{'id'},"\n" if $v; 
+    has 'prompt' => (is=>'rw',isa=>'Str', default => $prompt);
+    has 'error' => (is=>'rw',isa=>'Int',default=>0);
+        has 'output' => (is=>'rw',isa=>'Str');    
+    has 'recent'=> (is=>'rw',isa=>'ArrayRef',default=>sub {[]});
+    has 'id' => (is=>'ro',isa=>'Str');
+    has 'ip' => (is=>'ro',isa=>'Str');
+    has 'app' => (is=>'ro',isa=>'Int');
+    has 'ia' => (is=>'ro',isa=>'Int');
+    has 'cmds' => (is=>'ro',isa=>'Str');
+        has 'pugs' => (is=>'rw',isa=>'Str');
+    has 'pty' => (is=>'rw',isa=>'Any');
+    has 'pid' => (is=>'rw',isa=>'Int');
+    
+    sub BUILD {
+        my $self=shift;
+    print "Starting pugs session for ",$self->id,"\n" if $v; 
         ## Start pugs
-    my $app=$self->{'app'};
+    my $app=$self->app;
     my $command=$Web::Terminal::Settings::commands[$app];
     if (not $Web::Terminal::Settings::test) {
-    if ($self->{'ia'}==0) {
+    if ($self->ia==0) {
         #1. Create a file with the content of $cmd using $id.p6 for name, store in data
-        my $id=$self->{'id'};
-        open(P6,">$Web::Terminal::Settings::tmp_path/$id.p6") or ($self->{'error'}=1);
-        if($self->{'error'}==0) {
-        print P6 $self->{'cmds'};
+        my $id=$self->id;
+        open(P6,">$Web::Terminal::Settings::tmp_path/$id.p6") or $self->error(1);
+        if($self->error==0) {
+        print P6 $self->cmds;
         close P6;
             $command.=" $Web::Terminal::Settings::tmp_path/$id.p6";
@@ -40 +49 @@
     }
         ( $self->{'pty'},$self->{'pid'} ) = &spawn($command);    # spawn() defined below
-    if ( $self->{'pty'}==-1 and  $self->{'pid'}==0) {
+    if ( $self->pty==-1 and  $self->pid==0) {
         print "There was a problem starting pugs. Please try again later.\n"
         if $v;
-        $self->{'output'}= "\nThere was a problem starting pugs. Please try again later.";
-        $self->{'error'}=1;
-        if ($self->{'ia'}==0) {
-            my $id=$self->{'id'};
+        $self->output("\nThere was a problem starting pugs. Please try again later.");
+        $self->error(1);
+        if ($self->ia==0) {
+            my $id=$self->id;
             unlink "$Web::Terminal::Settings::tmp_path/$id.p6";
         }
     } else {
         ## Create a Net::Telnet object to perform I/O on pugs's tty.
+        print "Pugs started successfully. Creating Net::Telnet object as session handler...\n" if $v;
         use Net::Telnet;
         $self->{'pugs'} = new Net::Telnet(
-                -fhopen => $self->{'pty'},
+                -fhopen => $self->pty,
                 -timeout => $Web::Terminal::Settings::timeout_call,
                 -prompt => $prompt,
@@ -64 +74 @@
         $self->{'pugs'} ="Test flag is set -- no session started for $command.";
     }
-        bless($self,$class);
+        print "Reading Pugs startup message...\n" if $v;
     my $m=$self->readlines();
       if ($self->{'error'}==1 and not $Web::Terminal::Settings::test) {
@@ -78 +88 @@
           $self->{'pugs'}->close();
         }
-        $self->{'output'}= $m; 
-
+        $self->{'output'}= $m;
+        print "\nStatus is ",($self->{'error'}==1)?'ERROR':'OK',"\n" if $v; 
+print "Returning with output:\n",$m,"\n\n" if $v;
         return $self;
 } # END of new() constructor method
+
+
+
+### Constructor
+#sub new {
+#       my $invocant = shift;
+#       my $class    = ref($invocant) || $invocant;
+#       my $self     = {@_};
+#    my $prompt ='/'.$Web::Terminal::Settings::prompt.'/';
+#    $self->{'prompt'}=$prompt;
+#    $self->{'error'}=0;
+#    $self->{'recent'}=[];
+#    print "Starting pugs session for ",$self->{'id'},"\n" if $v; 
+#       ## Start pugs
+#    my $app=$self->{'app'};
+#    my $command=$Web::Terminal::Settings::commands[$app];
+#    if (not $Web::Terminal::Settings::test) {
+#    if ($self->{'ia'}==0) {
+#        #1. Create a file with the content of $cmd using $id.p6 for name, store in data
+#        my $id=$self->{'id'};
+#        open(P6,">$Web::Terminal::Settings::tmp_path/$id.p6") or ($self->{'error'}=1);
+#        if($self->{'error'}==0) {
+#        print P6 $self->{'cmds'};
+#        close P6;
+#            $command.=" $Web::Terminal::Settings::tmp_path/$id.p6";
+#        }
+#    }
+#       ( $self->{'pty'},$self->{'pid'} ) = &spawn($command);    # spawn() defined below
+#    if ( $self->{'pty'}==-1 and  $self->{'pid'}==0) {
+#        print "There was a problem starting pugs. Please try again later.\n"
+#        if $v;
+#        $self->{'output'}= "\nThere was a problem starting pugs. Please try again later.";
+#        $self->{'error'}=1;
+#        if ($self->{'ia'}==0) {
+#            my $id=$self->{'id'};
+#            unlink "$Web::Terminal::Settings::tmp_path/$id.p6";
+#        }
+#    } else {
+#       ## Create a Net::Telnet object to perform I/O on pugs's tty.
+#       print "Pugs started successfully. Creating Net::Telnet object as session handler...\n" if $v;
+#       use Net::Telnet;
+#       $self->{'pugs'} = new Net::Telnet(
+#               -fhopen => $self->{'pty'},
+#               -timeout => $Web::Terminal::Settings::timeout_call,
+#               -prompt => $prompt,
+#               -telnetmode      => 0,
+#               -cmd_remove_mode => 0,
+#       );
+#    }
+#    } else {
+#       $self->{'pid'}=42;
+#       $self->{'pugs'} ="Test flag is set -- no session started for $command.";
+#    }
+#       bless($self,$class);
+#       print "Reading Pugs startup message...\n" if $v;
+#    my $m=$self->readlines();
+#    #my $m=$self->write('');
+#      if ($self->{'error'}==1 and not $Web::Terminal::Settings::test) {
+#          # should close the TTY
+#          $self->{'pty'}->close() unless ($self->{'pty'}==-1);
+#          $self->{'pugs'}->close();
+#      }
+#        if ($self->{'ia'}==0 and not $Web::Terminal::Settings::test) {
+#        my $id=$self->{'id'};
+#        unlink "$Web::Terminal::Settings::tmp_path/$id.p6";
+#          # should close the TTY
+#          $self->{'pty'}->close() unless ($self->{'pty'}==-1);
+#          $self->{'pugs'}->close();
+#        }
+#       $self->{'output'}= $m;
+#       print "\nStatus is ",($self->{'error'}==1)?'ERROR':'OK',"\n" if $v; 
+#print "Returning with output:\n",$m,"\n\n" if $v;
+#       return $self;
+#} # END of new() constructor method
 #------------------------------------------------------------------------------
 sub DESTROY {
     my $obj = shift;
     if (not $Web::Terminal::Settings::test) {
+        if (defined $obj->{'pty'}) {
     $obj->{'pty'}->close();
      $obj->{'pty'}->close_slave();
+        }
+        if (defined $obj->{'pugs'}) {
       $obj->{'pugs'}->close();
-      if($obj->{'pid'}>10){
+        }
+      if(defined $obj->{'pid'} and $obj->{'pid'}>10){
           kill 9,$obj->{'pid'};
       }
@@ -114 +203 @@
     $pugs->errmode(sub {kill 9,$obj->{'pid'};});
 
-        $pugs->print($cmd);
+        $pugs->print($cmd) unless $cmd eq '';
         while ($i<$Web::Terminal::Settings::nlines) {
                 my $line = $pugs->getline;
@@ -156 +245 @@
 #------------------------------------------------------------------------------
 # Could be considered private;
-# TODO: unifiy with write()
+# Only used by the constructor
+# The tacit assumption is that the MOTD is never too long
 sub readlines {
         my $obj = shift;
         my $ps = '';
-        my $i     = 1;
+#       my $i     = 1;
         my $lline = '';
         if (not $Web::Terminal::Settings::test) {
     my $pugs=$obj->{'pugs'};
     $pugs->errmode(sub {kill 9,$obj->{'pid'}; });
-        while ($i<$Web::Terminal::Settings::nlines) {
-    my $char='';
+#        my $prev=0;
+#       while ($i<$Web::Terminal::Settings::nlines) {
+#    my $char='';
     my $line='';
-    my $j=0;
-    while ($char ne "\n" and ($j<$Web::Terminal::Settings::nchars)) {
-    $char=$pugs->get();
-    $j++;
-    last if $char eq '';
-    $line.=$char;
-    last if $line eq $Web::Terminal::Settings::prompt;
-    }
-        print $line if $v;
-        if ($j>=$Web::Terminal::Settings::nchars-1) {
-        $line.="Generated output is limited to $Web::Terminal::Settings::nchars characters. Aborted.\n";
-       $obj->{pugs}->close();
-        kill 9, $obj->{'pid'};
-        $obj->{'error'}=1;
-        $lline .= $line;
-        last;
-        }
+#    my $j=0;
+
+#    while ($char ne "\n" and ($j<$Web::Terminal::Settings::nchars)) {
+#    #$char=$pugs->get();#
+#    $char=getc $obj->{'pty'};
+#    #if ($prev>0) {
+#    #print ord($char),"\t:char\n" if $v;
+#    #}
+#    #if (ord($char)!=27) {             
+#    $j++;
+#    last if $char eq '';
+#    $line.=$char;
+#   # print "{$line}\n";
+#    last if $line =~/${Web::Terminal::Settings::prompt}$/;
+#    #} else {die;$prev=1;}
+#    }
+  
+        ($line, $ps)=$pugs->waitfor(String=>$Web::Terminal::Settings::prompt);
+          $pugs->buffer_empty(); # maybe redundant, but play safe   
+#       my @chars=split('',$line);
+#       for my $char(@chars) {
+#               print ord($char),"\n";
+#       }
+          
+        #$line=~s/....$//;
+       #print "L:<",$line,">" if $v;
+        #print "P:<",$ps,">" if $v;
+     #   if ($line=~/Prelude/i){$prev++};
+     #die if (($line=~/${Web::Terminal::Settings::prompt}/) and ($prev>1));
+    
+#        if ($j>=$Web::Terminal::Settings::nchars-1) {
+#        $line.="Generated output is limited to $Web::Terminal::Settings::nchars characters. Aborted.\n";
+#       $obj->{pugs}->close();
+#        kill 9, $obj->{'pid'};
+#        $obj->{'error'}=1;
+#        $lline .= $line;
+#        last;
+#        }
         my $msg=$pugs->errmsg;
             if($msg=~/timed/) {
@@ -200 +312 @@
         }
         $msg='';
-        if ( ($line =~ /$Web::Terminal::Settings::prompt_pattern/ or
-        ($line=~/$Web::Terminal::Settings::quit_pattern/)) and $i > 1 ) { $ps = $1; last }
+#        if ( ($line =~ /$Web::Terminal::Settings::prompt_pattern/ or
+#        ($line=~/$Web::Terminal::Settings::quit_pattern/)) and $i > 1 ) { $ps = $1; last }
                 $lline .= $line unless $line =~
         /$Web::Terminal::Settings::prompt_pattern/;
-                $i++;
+#               $i++;
         last if $line eq '';
-        }
-   if ($i>=$Web::Terminal::Settings::nlines-1) {
-       $obj->{pugs}->close();
-        kill 9, $obj->{'pid'};
-        $lline.="Generated output is limited to $Web::Terminal::Settings::nlines lines. Aborted.\n";
-        $obj->{'error'}=1;
-    }
+#       }
+#   if ($i>=$Web::Terminal::Settings::nlines-1) {
+#       $obj->{pugs}->close();
+#        kill 9, $obj->{'pid'};
+#        $lline.="Generated output is limited to $Web::Terminal::Settings::nlines lines. Aborted.\n";
+#        $obj->{'error'}=1;
+#    }
+    
         } else {
                 $lline="Test flag is set -- readlines() called.";
@@ -235 +348 @@
       };
       #
-    binmode $pty, ":utf8"; 
+    #binmode $pty, ":utf8"; 
         ## Execute the program in another process.
         unless ( $pid = fork ) {    # child process
@@ -250 +363 @@
                 ## Associate process with a new controlling terminal.
                 $tty    = $pty->slave;
-        binmode $tty, ":utf8";
+        #binmode $tty, ":utf8";
                 $tty_fd = $tty->fileno;
                 close $pty;
@@ -258 +371 @@
                 open STDOUT, ">&$tty_fd" or ($error=1);#die $!;
                 open STDERR, ">&STDOUT"  or ($error=1);#die $!;
-        binmode STDIN, ":utf8";
-        binmode STDOUT, ":utf8";
-        binmode STDERR, ":utf8";
+        #binmode STDIN, ":utf8";
+        #binmode STDOUT, ":utf8";
+        #binmode STDERR, ":utf8";
                 close $tty;
 
@@ -285 +398 @@
 Web::Terminal::Server::Session -- Session object to encapsulate terminal
 application.
-Requires Net::Telnet.
+Requires Net::Telnet, Moose.
 
 =head1 SYNOPSIS
@@ -305 +418 @@
 This module provides a Session object. The object encapsulates the
 actual terminal session. The session is configured via L<Settings.pm>.
-The object's C<new> method takes following arguments:
+The object's constructor takes following arguments:
     id: a string identifying the session
     app: an integer indicating the version of the terminal application to
@@ -330 +443 @@
 =head1 COPYRIGHT
 
-Copyright (c) 2006. Wim Vanderbauwhede. All rights reserved.
+Copyright (c) 2006,2007 Wim Vanderbauwhede. All rights reserved.
 
 This program is free software; you can redistribute it and/or modify

misc/runpugs/lib/Web/Terminal/Settings.pm

@@ -66 +66 @@
 my $rel_root='/home/andara/pugs-rel';
 my $dev_root='/home/andara/pugs-dev';
+my $rel_lib="-I$rel_root/blib6/lib";
+my $dev_lib="-I$dev_root/blib6/lib";
+
+$ulimit='';
+$nice='';#/bin/nice';
+$pugs='/usr/bin/pugs';
+$rel_root='/usr/bin';
+$dev_root='/usr/bin';
+$rel_lib='';
+$dev_lib='';
 
 our @commands=(
-"$ulimit $nice $rel_root/pugs -I$rel_root/blib6/lib",
-"$ulimit $nice $dev_root/pugs -I$dev_root/blib6/lib"
+"$ulimit $nice $rel_root/pugs $rel_lib",
+"$ulimit $nice $dev_root/pugs $dev_lib",
+"perl ./perl_repl.pl"
 );
 
@@ -75 +86 @@
 our $appname='runpugs';
 our $prompt='pugs> ';
+#$prompt='perl> ';
 our $prompt_pattern='(^(pugs|\.\.\.\.)>\s+)';
 our $quit_pattern='^Leaving\ pugs\.';
@@ -99 +111 @@
 
 our $restart_parent=0; # restart parent server from child if 1
-our $server="$bin_path/termserv4.pl"; # used to restart parent server from child
+our $server="$bin_path/termserv.pl"; # used to restart parent server from child
 
 our $nsessions=50; # obsolete
-our @n_max=(20,50);
+our @n_max=(20,50,5);
 our $nsessions_ip=10; 
-our @npreloaded_sessions=(5,10); 
+our @npreloaded_sessions=(5,10,2); 
 our @n_inactive_max=@npreloaded_sessions;
-our @n_inactive_min=(2,5);
+our @n_inactive_min=(2,5,0);
 
 our $timeout_idle=90; # was 600
-our $timeout_call=30; #  was 30