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.10 by root, Wed Sep 19 21:49:53 2007 UTC vs.
Revision 1.32 by root, Thu May 6 22:35:41 2010 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines