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.7 by root, Mon Aug 20 18:11:02 2007 UTC vs.
Revision 1.25 by root, Sun Apr 11 04:52:07 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_config &
27reload_regions & 26reload_regions &
28reload_facedata & 27reload_facedata &
29reload_treasures & 28reload_treasures &
30reload_archetypes & 29reload_archetypes &
31ext::help::reload & 30ext::help::reload &
32ext::books::reload & 31ext::books::reload &
32ext::map_tags::reload &
33ext::map_world::reload & 33ext::map_world::reload &
34# ext::map_scheduler::loadall & # debugging only!
35while (EV::TIMEOUT & Coro::EV::timed_io_once \$fh, EV::READ, 1) { Coro::Debug::command "ps" } &
36({cf::mallinfo})
34EOF 37EOF
35 print "\n> "; 38 print $fh "\n> ";
36 39
37 Event->io (fd => $fh, poll => 'r', data => 0, cb => sub { 40 my $iow; $iow = AE::io $fh, 0, sub {
38 if (defined (my $cmd = <$fh>)) { 41 if (defined (my $cmd = <$fh>)) {
39 $cmd =~ s/\s+$//; 42 $cmd =~ s/\s+$//;
40 43
41 if ($cmd =~ /^\s*exit\b/i) { 44 if ($cmd =~ /^\s*exit\b/i) {
42 print "will not exit() server.\n"; 45 print $fh "will not exit() server.\n";
46 } elsif ($cmd =~ s/^coro\s+// or $cmd =~ /^(?:ps|bt\s)/) {
47 select $fh;
48 Coro::Debug::command $cmd;
49 select STDOUT;
43 } else { 50 } else {
44 my $sub = sub { 51 my $sub = sub {
45 package cf; 52 package cf;
46 select $fh; 53 select $fh;
47 54
48 # compile first, the execute, as Coro does not support switching in eval string 55 # compile first, then execute, as Coro does not support switching in eval string
49 my $cb = eval "sub { $cmd }"; 56 my $cb = eval "sub { $cmd \n}";
50 57
51 my $t1 = Time::HiRes::time; 58 my $t1 = Time::HiRes::time;
52 my @res = $@ ? () : eval { $cb->() }; 59 my @res = $@ ? () : eval { $cb->() };
53 my $t2 = Time::HiRes::time; 60 my $t2 = Time::HiRes::time;
54 61
57 "execution time: ", $t2 - $t1, "\n"; 64 "execution time: ", $t2 - $t1, "\n";
58 warn "evaluation error: $@" if $@; 65 warn "evaluation error: $@" if $@;
59 print "evaluation error: $@\n" if $@; 66 print "evaluation error: $@\n" if $@;
60 print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res; 67 print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res;
61 print "\n> "; 68 print "\n> ";
69
70 select STDOUT;
62 }; 71 };
63 72
64 if ($cmd =~ s/\s*&$//) { 73 if ($cmd =~ s/\s*&$//) {
65 Coro::async { $sub->() }; 74 cf::async {
75 $Coro::current->desc ($cmd);
76 $sub->()
77 };
66 } else { 78 } else {
67 $sub->(); 79 $sub->();
68 } 80 }
69 } 81 }
70 82
71 print "\n> "; 83 print $fh "\n> ";
72 } else { 84 } else {
73 $_[0]->w->cancel; 85 undef $iow;
74 } 86 }
75 }); 87 };
76} 88}
89
90our $LISTENER;
77 91
78# now a shell listening on a tcp-port - let the firewall decide access rights 92# now a shell listening on a tcp-port - let the firewall decide access rights
79if ($cf::CFG{perl_shell}) { 93if ($cf::CFG{perl_shell}) {
80 if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1) { 94 if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1, Blocking => 0) {
81 Event->io (fd => $listen, poll => 'r', data => cf::WF_AUTOCANCEL, cb => sub { tcp_serve $listen->accept }); 95 $LISTENER = AE::io $listen, 0, sub { tcp_serve $listen->accept };
82 } 96 }
83} 97}
98
99

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines