--- deliantra/server/ext/dm-support.ext	2006/12/15 19:29:18	1.1
+++ deliantra/server/ext/dm-support.ext	2007/11/14 08:09:46	1.16
@@ -1,7 +1,7 @@
 #! perl
 
+use Coro::Debug;
 use IO::Socket;
-use Storable qw/nfreeze thaw/;
 
 my %global; # for use by eval'ed commands
 
@@ -11,35 +11,87 @@
    binmode $fh, ":raw:perlio:utf8";
 
    my $buf;
-   my ($a,$b,$c,$d,%l,@l); # for use by shell users
+   my ($a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k, $l, $m, $n, $o, $p, $q, $r, $s, $t, $u, $v, $w, $x, $y, $z);
+   my (%l, @l); # for use by shell users
 
-   print $fh "Welcome\n> ";
+   print $fh <<EOF;
+Welcome!
+Remember that everything entered here will be in the main coro context within cf::!
+You can freely use \$a .. \$z and \@l and \%l
+
+Useful commands (note the '&'):
+
+reload_perl &
+reload_config &
+reload_regions &
+reload_facedata &
+reload_treasures &
+reload_archetypes &
+ext::help::reload &
+ext::books::reload &
+ext::map_tags::reload &
+ext::map_world::reload &
+print JSON::XS->new->pretty->encode({cf::mallinfo})
+EOF
+   print $fh "\n> ";
 
-   Event->io (fd => $fh, poll => 'r', data => cf::WF_AUTOCANCEL, cb => sub {
+   my $iow; $iow = EV::io $fh, EV::READ, sub {
       if (defined (my $cmd = <$fh>)) {
-         my $old_fh = select $fh;
+         $cmd =~ s/\s+$//;
 
          if ($cmd =~ /^\s*exit\b/i) {
-            print "will not exit() server.\n";
+            print $fh "will not exit() server.\n";
+         } elsif ($cmd =~ s/^coro\s+// or $cmd =~ /^(?:ps|bt\s)/) {
+            select $fh;
+            Coro::Debug::command $cmd;
+            select STDOUT;
          } else {
-            {
+            my $sub = sub {
                package cf;
-               eval $cmd;
+               select $fh;
+
+               # compile first, the execute, as Coro does not support switching in eval string
+               my $cb = eval "sub { $cmd }";
+
+               my $t1 = Time::HiRes::time;
+               my @res = $@ ? () : eval { $cb->() };
+               my $t2 = Time::HiRes::time;
+
+               print "\n",
+                     "command: '$cmd'\n",
+                     "execution time: ", $t2 - $t1, "\n";
+               warn "evaluation error: $@" if $@;
+               print "evaluation error: $@\n" if $@;
+               print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res;
+               print "\n> ";
+
+               select STDOUT;
+            };
+
+            if ($cmd =~ s/\s*&$//) {
+               cf::async {
+                  $Coro::current->desc ($cmd);
+                  $sub->()
+               };
+            } else {
+               $sub->();
             }
-            print $@ if $@;
          }
 
-         print "> ";
-         select $old_fh;
+         print $fh "\n> ";
       } else {
-         $_[0]->w->cancel;
+         undef $iow;
       }
-   });
+   };
 }
 
+our $LISTENER;
+
 # now a shell listening on a tcp-port - let the firewall decide access rights
 if ($cf::CFG{perl_shell}) {
    if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1) {
-      Event->io (fd => $listen, poll => 'r', data => cf::WF_AUTOCANCEL, cb => sub { tcp_serve $listen->accept });
+      $LISTENER = EV::io $listen, EV::READ, sub { tcp_serve $listen->accept };
    }
 }
+
+