Changeset 14954 for misc/runpugs

Timestamp:

12/30/06 19:07:12 (23 months ago)

Author:

andara

Message:

[runpugs]
-be kind to feather: better management of preloaded sessions.
Please test the devel version: http://feather.perl6.nl:8080/runpugs/
-fixed non-interactive runpugs, now at
http://feather.perl6.nl:8080/cgi-bin/runp6script

Location:

misc/runpugs

Files:

• cgi-bin/runp6script (added)
• cgi-bin/runpugs2 (modified) (1 diff)
• data/runp6script.html (added)
• data/runpugs.html (modified) (1 diff)
• htdocs/index.html (modified) (3 diffs)
• htdocs/runpugs.css (modified) (1 diff)
• htdocs/runpugs/index.html (modified) (2 diffs)
• lib/Web/Terminal/Server3.pm (modified) (6 diffs)
• lib/Web/Terminal/Settings.pm (modified) (1 diff)
• perl/runpugs3.pl (modified) (1 diff)

misc/runpugs/cgi-bin/runpugs2

@@ -23 +23 @@
 use Web::Terminal::Settings;
 use Web::Terminal::Dispatcher;
-$Web::Terminal::Settings::port=2058;
+#$Web::Terminal::Settings::port=2058;
 #push (@INC, "$wwwpath$htmlpath$project");
 

misc/runpugs/data/runpugs.html

@@ -168 +168 @@
 href="http://feather.perl6.nl/~andara/runpugs/">read the documentation</a>.
 </p>
-<p class="copyright">&copy; Copyright 2006 by Wim Vanderbauwhede</p>
+<p class="copyright">&copy; Copyright 2006 by Wim.Vanderbauwhede. Contact me
+at gmail.com.</p>
 </div>
 </body>

misc/runpugs/htdocs/index.html

@@ -4 +4 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Run Perl 6 Now -- in your browser!</title>
+<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
+<link rel="icon" href="favicon.ico" type="image/x-icon">
 <link rel="stylesheet" type="text/css" href="runpugs.css">
 </head>
@@ -20 +22 @@
 <tt>runpugs</tt>:</p><ul><li>try the <a
 href="http://feather.perl6.nl:8080/runpugs/">interactive session</a>
-with <em>command history</em></li> <li>or <a
-href="http://feather.perl6.nl:8080/cgi-bin/runpugs2?ia=0">run a full Perl 6
-script</a> in <em>non-interactive</em> mode.</li></ul>
+with command history, fast startup and response and a persistent interface; </li> 
+<li>or <a
+href="http://feather.perl6.nl:8080/cgi-bin/runp6script">run a full Perl 6
+script</a> in <em>non-interactive</em> mode.</li>
+
+</ul>
 
 <h2>Instructions</h2>
@@ -74 +79 @@
 <code><a href="http://svn.pugscode.org/pugs/misc/runpugs">/misc/runpugs</a></code>.
 <p>Thank you for trying <tt>pugs</tt> and <tt>runpugs</tt>!</p>
-<p class="copyright">&copy; Copyright 2006 by Wim Vanderbauwhede</p>
+<p class="copyright">&copy; Copyright 2006 by Wim.Vanderbauwhede. Contact me
+at gmail.com</p>
 </div>
 </body></html>

misc/runpugs/htdocs/runpugs.css

@@ -76 +76 @@
 }
 #outputwindow {
-    height:20ex;
+    height:40ex;
 }
 #editorwindow {

misc/runpugs/htdocs/runpugs/index.html

@@ -16 +16 @@
 <input name="ia" value="1" type="hidden">
 <input name="action" value="runpugs" type="hidden">
-<input id="rel" value="0" name="reldev" checked="checked" type="radio"
+<input id="rel" value="0" name="reldev" type="radio"
 onClick="set_version()"><label for="rel">Release version</label>&nbsp;&nbsp;
-<input id="dev" value="1" name="reldev" type="radio" onClick="set_version()"><label for="dev">Development version</label>
+<input id="dev" value="1" name="reldev" checked="checked" type="radio" onClick="set_version()"><label for="dev">Development version</label>
 <div id="termwindow">
 <textarea id="cmd" name="cmd" rows="20" cols="80" wrap="virtual"
@@ -31 +31 @@
 <p>This live web terminal runs the <a href="http://www.pugscode.org/">Pugs</a>
 interpreter for <a href="http://dev.perl.org/perl%206/">Perl&nbsp;6</a>.
+<p>This is the development version, featuring asynchronous JavaScript,
+mod_perl and preloaded pugs sessions.</p>
 Please <a href="http://feather.perl6.nl/%7Eandara/runpugs/">read the documentation</a>.
 </p>
-<p class="copyright">&copy; Copyright 2006 by Wim Vanderbauwhede</p>
+<p class="copyright">&copy; Copyright 2006 by Wim.Vanderbauwhede. Contact me @ gmail.com<./p>
 </div>
 </body></html>

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

@@ -35 +35 @@
 #our $session_counter  = 0;
 my %sessions         = ();    # holds the session objects
-my @sessions_stack     = 1 .. $Web::Terminal::Settings::nsessions;
-my @sessions_stack_app = ();
+my @sessions_stack     = 1 .. $Web::Terminal::Settings::nsessions; # holds counters for new sessions
+my @sessions_stack_app = (); # holds counters for idle sessions per app
 my $v = 1 - $Web::Terminal::Settings::daemon;
 
@@ -188 +188 @@
         my $ia  = shift;
         my $cmd = shift;
+    if($ia!=0) {
         if (   scalar( keys %terminals ) > $Web::Terminal::Settings::nsessions
                 or scalar(@sessions_stack) == 0 )
@@ -270 +271 @@
                                         # Every time a free session is taken, create a new session
                     # if the number of free sessions is low
-                    if ( @{ $sessions_stack_app[$app] }<2) {
+                    if ( @{ $sessions_stack_app[$app] } < $Web::Terminal::Settings::npreloaded_sessions[$app]-1) {
                                         # we use a SIGUSR2 to the child for this
                                         kill 'USR2', $pid or die $!;
@@ -291 +292 @@
                 }
         }
+    } else { # non-interactive
+        print "Non-interactive $id\n" if $v;
+            print "$app $ia $id $cmd\n" if $v;
+                my $term = new
+            Web::Terminal::Server::Session(app=>$app,ia=>$ia,id=>$id,cmds=>$cmd);
+            $term->{called}=time;
+            $term->{ip}=$ip;
+            my $output= $term->{'output'};
+                $term->DESTROY();
+            return $output;
+    }
 }    # of termhandler
 
@@ -344 +356 @@
 
 sub timeout() {
-        my $now = time();
+        # Cleaning up timed-out sessions
+    my $now = time();
         for my $id ( keys %terminals ) {
                 if ( exists $terminals{$id} ) {
@@ -361 +374 @@
                 }
         }
+    # Keep the number of preloaded sessions low
+    # There is no reason to have more than npreloaded_sessions sessions preloaded and idle
+    #Clean up the @sessions_stack_app for each $app:
+
+    for my $app ( 0 .. @Web::Terminal::Settings::commands - 1 ) {
+        while(@{ $sessions_stack_app[$app] } >
+        $Web::Terminal::Settings::npreloaded_sessions[$app]+1){
+            my $idle_session_counter=shift @{ $sessions_stack_app[$app] };
+            # now actally kill that session!
+            push @sessions_stack, $idle_session_counter;
+            $sessions{$idle_session_counter}->DESTROY();
+            delete $sessions{$idle_session_counter};
+        }
+    }
 }
 

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

@@ -76 +76 @@
 our $tmp_path='/home/andara/apache/data/tmp/';
 our $log_path='/home/andara/apache/data/log/';
-our $daemon=0;
+our $daemon=1;
 our $port=2057;
 our $host='localhost';

misc/runpugs/perl/runpugs3.pl

@@ -98 +98 @@
     my $sessionid=shift;
     my $ip=shift;
-    my $dev=$query->param('reldev')||0;
-    $dev=$dev*1;
+    my $dev=$query->param('reldev');#||0;
+    if ($dev!=0){
+    $dev=1;
+    }
     my $devc='checked';
     my $relc='';