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.12 by root, Sun Sep 30 22:33:52 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 '&'):
… …
29reload_facedata & 28reload_facedata &
30reload_treasures & 29reload_treasures &
31reload_archetypes & 30reload_archetypes &
32ext::help::reload & 31ext::help::reload &
33ext::books::reload & 32ext::books::reload &
33ext::map_tags::reload &
34ext::map_world::reload & 34ext::map_world::reload &
35EOF 35EOF
36 print "\n> "; 36 print $fh "\n> ";
37 37
38 Event->io (fd => $fh, poll => 'r', data => 0, cb => sub { 38 Event->io (fd => $fh, poll => 'r', data => 0, cb => sub {
39 if (defined (my $cmd = <$fh>)) { 39 if (defined (my $cmd = <$fh>)) {
40 $cmd =~ s/\s+$//; 40 $cmd =~ s/\s+$//;
41 41
42 select $fh;
42 if ($cmd =~ /^\s*exit\b/i) { 43 if ($cmd =~ /^\s*exit\b/i) {
43 print "will not exit() server.\n"; 44 print "will not exit() server.\n";
45 } elsif ($cmd =~ s/^coro\s+// or $cmd =~ /^(?:ps|bt\s)/) {
46 Coro::Debug::command $cmd;
44 } else { 47 } else {
45 my $sub = sub { 48 my $sub = sub {
46 package cf; 49 package cf;
47 select $fh; 50 select $fh;
48 51
… …
58 "execution time: ", $t2 - $t1, "\n"; 61 "execution time: ", $t2 - $t1, "\n";
59 warn "evaluation error: $@" if $@; 62 warn "evaluation error: $@" if $@;
60 print "evaluation error: $@\n" if $@; 63 print "evaluation error: $@\n" if $@;
61 print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res; 64 print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res;
62 print "\n> "; 65 print "\n> ";
66
67 select STDOUT;
63 }; 68 };
64 69
65 if ($cmd =~ s/\s*&$//) { 70 if ($cmd =~ s/\s*&$//) {
66 Coro::async { $sub->() }; 71 cf::async {
72 $Coro::current->desc ($cmd);
73 $sub->()
74 };
67 } else { 75 } else {
68 $sub->(); 76 $sub->();
69 } 77 }
70 } 78 }
71 79
72 print "\n> "; 80 print "\n> ";
81 select STDOUT;
73 } else { 82 } else {
74 $_[0]->w->cancel; 83 $_[0]->w->cancel;
75 } 84 }
76 }); 85 });
77} 86}
… …
80if ($cf::CFG{perl_shell}) { 89if ($cf::CFG{perl_shell}) {
81 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) {
82 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 });
83 } 92 }
84} 93}
94
95

Diff Legend

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