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.2 by root, Tue Jan 9 15:36:18 2007 UTC vs.
Revision 1.9 by root, Thu Sep 13 08:35:24 2007 UTC

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 10
11 select $fh;
12
11 binmode $fh, ":raw:perlio:utf8"; 13 binmode $fh, ":raw:perlio:utf8";
12 14
13 my $buf; 15 my $buf;
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); 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 (%l, @l); # for use by shell users 17 my (%l, @l); # for use by shell users
16 18
17 print $fh "Welcome!\n", 19 print <<EOF;
18 "Remember that everything entered here will be executed as a sync_job in cf::!\n", 20Welcome!
21Remember that everything entered here will be in the main coro context within cf::!
19 "You can freely use \$a .. \$z and \@l and \%l\n"; 22You can freely use \$a .. \$z and \@l and \%l
20 print $fh "\n> ";
21 23
24Useful commands (note the '&'):
25
26reload_perl &
27reload_config &
28reload_regions &
29reload_facedata &
30reload_treasures &
31reload_archetypes &
32ext::help::reload &
33ext::books::reload &
34ext::map_tags::reload &
35ext::map_world::reload &
36EOF
37 print "\n> ";
38
22 Event->io (fd => $fh, poll => 'r', data => cf::WF_AUTOCANCEL, cb => sub { 39 Event->io (fd => $fh, poll => 'r', data => 0, cb => sub {
23 if (defined (my $cmd = <$fh>)) { 40 if (defined (my $cmd = <$fh>)) {
24 my $old_fh = select $fh; 41 $cmd =~ s/\s+$//;
25 42
26 if ($cmd =~ /^\s*exit\b/i) { 43 if ($cmd =~ /^\s*exit\b/i) {
27 print "will not exit() server.\n"; 44 print "will not exit() server.\n";
28 } else { 45 } else {
29 cf::sync_job { 46 my $sub = sub {
30 package cf; 47 package cf;
31 my @res = eval $cmd; 48 select $fh;
32 warn "tcpshell evaluation error: $@" if $@;
33 print $@ if $@;
34 49
50 # compile first, the execute, as Coro does not support switching in eval string
51 my $cb = eval "sub { $cmd }";
52
53 my $t1 = Time::HiRes::time;
54 my @res = $@ ? () : eval { $cb->() };
55 my $t2 = Time::HiRes::time;
56
57 print "\n",
58 "command: '$cmd'\n",
59 "execution time: ", $t2 - $t1, "\n";
60 warn "evaluation error: $@" if $@;
61 print "evaluation error: $@\n" if $@;
35 print cf::dumpval @res > 1 ? \@res : $res[0] if @res; 62 print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res;
63 print "\n> ";
36 }; 64 };
65
66 if ($cmd =~ s/\s*&$//) {
67 Coro::async { $sub->() };
68 } else {
69 $sub->();
70 }
37 } 71 }
38 72
39 print "\n> "; 73 print "\n> ";
40 select $old_fh;
41 } else { 74 } else {
42 $_[0]->w->cancel; 75 $_[0]->w->cancel;
43 } 76 }
44 }); 77 });
45} 78}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines