ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/dm-support.ext
(Generate patch)

Comparing deliantra/server/ext/dm-support.ext (file contents):
Revision 1.8 by root, Tue Aug 28 19:30:09 2007 UTC vs.
Revision 1.30 by root, Tue May 4 21:45:42 2010 UTC

1#! perl 1#! perl
2 2
3use Coro::Debug;
3use IO::Socket; 4use IO::Socket;
4use Storable qw/nfreeze thaw/;
5 5
6my %global; # for use by eval'ed commands 6my %global; # for use by eval'ed commands
7 7
8sub tcp_serve($) { 8sub tcp_serve($) {
9 my ($fh) = @_; 9 my ($fh) = @_;
10
11 select $fh;
12 10
13 binmode $fh, ":raw:perlio:utf8"; 11 binmode $fh, ":raw:perlio:utf8";
14 12
15 my $buf; 13 my $buf;
16 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); 14 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);
17 my (%l, @l); # for use by shell users 15 my (%l, @l); # for use by shell users
18 16
19 print <<EOF; 17 print $fh <<EOF;
20Welcome! 18Welcome!
21Remember that everything entered here will be in the main coro context within cf::! 19Remember that everything entered here will be in the main coro context within cf::!
22You can freely use \$a .. \$z and \@l and \%l 20You can freely use \$a .. \$z and \@l and \%l
23 21
24Useful commands (note the '&'): 22Useful commands (note the '&'):
25 23
26reload_perl & 24reload_perl &
25reload_sound &
27reload_config & 26reload_config &
28reload_regions & 27reload_regions &
29reload_facedata & 28reload_facedata &
30reload_treasures & 29reload_treasures &
31reload_archetypes & 30reload_archetypes &
31reload_resources &
32ext::help::reload & 32ext::help::reload &
33ext::books::reload & 33ext::books::reload &
34ext::map_tags::reload &
34ext::map_world::reload & 35ext::map_world::reload &
36# ext::map_scheduler::loadall & # debugging only!
37while (EV::TIMEOUT & Coro::EV::timed_io_once \$fh, EV::READ, 1) { Coro::Debug::command "ps" } &
38({mallinfo})
39({objinfo})
35EOF 40EOF
36 print "\n> "; 41 print $fh "\n> ";
37 42
38 Event->io (fd => $fh, poll => 'r', data => 0, cb => sub { 43 my $iow; $iow = AE::io $fh, 0, sub {
39 if (defined (my $cmd = <$fh>)) { 44 if (defined (my $cmd = <$fh>)) {
40 $cmd =~ s/\s+$//; 45 $cmd =~ s/\s+$//;
41 46
42 if ($cmd =~ /^\s*exit\b/i) { 47 if ($cmd =~ /^\s*exit\b/i) {
43 print "will not exit() server.\n"; 48 print $fh "will not exit() server.\n";
49 } elsif ($cmd =~ s/^coro\s+// or $cmd =~ /^(?:ps|bt\s)/) {
50 select $fh;
51 Coro::Debug::command $cmd;
52 select STDOUT;
44 } else { 53 } else {
45 my $sub = sub { 54 my $sub = sub {
46 package cf; 55 package cf;
47 select $fh; 56 select $fh;
48 57
49 # compile first, the execute, as Coro does not support switching in eval string 58 # compile first, then execute, as Coro does not support switching in eval string
50 my $cb = eval "sub { $cmd }"; 59 my $cb = eval "sub { $cmd \n}";
51 60
52 my $t1 = Time::HiRes::time; 61 my $t1 = Time::HiRes::time;
53 my @res = $@ ? () : eval { $cb->() }; 62 my @res = $@ ? () : eval { $cb->() };
54 my $t2 = Time::HiRes::time; 63 my $t2 = Time::HiRes::time;
55 64
56 print "\n", 65 print "\n",
57 "command: '$cmd'\n", 66 "command: '$cmd'\n",
58 "execution time: ", $t2 - $t1, "\n"; 67 "execution time: ", $t2 - $t1, "\n";
59 warn "evaluation error: $@" if $@;
60 print "evaluation error: $@\n" if $@; 68 print "evaluation error: $@\n" if $@;
61 print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res; 69 print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res;
62 print "\n> "; 70 print "\n> ";
71
72 select STDOUT;
63 }; 73 };
64 74
65 if ($cmd =~ s/\s*&$//) { 75 if ($cmd =~ s/\s*&$//) {
66 Coro::async { $sub->() }; 76 cf::async {
77 $Coro::current->desc ($cmd);
78 $sub->()
79 };
67 } else { 80 } else {
68 $sub->(); 81 $sub->();
69 } 82 }
70 } 83 }
71 84
72 print "\n> "; 85 print $fh "\n> ";
73 } else { 86 } else {
74 $_[0]->w->cancel; 87 undef $iow;
75 } 88 }
76 }); 89 };
77} 90}
91
92our $LISTENER;
78 93
79# now a shell listening on a tcp-port - let the firewall decide access rights 94# now a shell listening on a tcp-port - let the firewall decide access rights
80if ($cf::CFG{perl_shell}) { 95if ($cf::CFG{perl_shell}) {
81 if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1) { 96 if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1, Blocking => 0) {
82 Event->io (fd => $listen, poll => 'r', data => cf::WF_AUTOCANCEL, cb => sub { tcp_serve $listen->accept }); 97 $LISTENER = AE::io $listen, 0, sub { tcp_serve $listen->accept };
83 } 98 }
84} 99}
100

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines