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.4 by root, Tue Apr 17 10:38:28 2007 UTC vs.
Revision 1.13 by root, Mon Oct 1 00:44:43 2007 UTC

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

Diff Legend

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