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.14 by root, Fri Oct 12 19:13:26 2007 UTC vs.
Revision 1.27 by root, Mon Apr 12 17:13:36 2010 UTC

29reload_archetypes & 29reload_archetypes &
30ext::help::reload & 30ext::help::reload &
31ext::books::reload & 31ext::books::reload &
32ext::map_tags::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({mallinfo})
37({objinfo})
34EOF 38EOF
35 print $fh "\n> "; 39 print $fh "\n> ";
36 40
37 Event->io (fd => $fh, poll => 'r', data => 0, cb => sub { 41 my $iow; $iow = AE::io $fh, 0, sub {
38 if (defined (my $cmd = <$fh>)) { 42 if (defined (my $cmd = <$fh>)) {
39 $cmd =~ s/\s+$//; 43 $cmd =~ s/\s+$//;
40 44
41 if ($cmd =~ /^\s*exit\b/i) { 45 if ($cmd =~ /^\s*exit\b/i) {
42 print $fh "will not exit() server.\n"; 46 print $fh "will not exit() server.\n";
47 } else { 51 } else {
48 my $sub = sub { 52 my $sub = sub {
49 package cf; 53 package cf;
50 select $fh; 54 select $fh;
51 55
52 # compile first, the execute, as Coro does not support switching in eval string 56 # compile first, then execute, as Coro does not support switching in eval string
53 my $cb = eval "sub { $cmd }"; 57 my $cb = eval "sub { $cmd \n}";
54 58
55 my $t1 = Time::HiRes::time; 59 my $t1 = Time::HiRes::time;
56 my @res = $@ ? () : eval { $cb->() }; 60 my @res = $@ ? () : eval { $cb->() };
57 my $t2 = Time::HiRes::time; 61 my $t2 = Time::HiRes::time;
58 62
77 } 81 }
78 } 82 }
79 83
80 print $fh "\n> "; 84 print $fh "\n> ";
81 } else { 85 } else {
82 $_[0]->w->cancel; 86 undef $iow;
83 } 87 }
84 }); 88 };
85} 89}
90
91our $LISTENER;
86 92
87# now a shell listening on a tcp-port - let the firewall decide access rights 93# now a shell listening on a tcp-port - let the firewall decide access rights
88if ($cf::CFG{perl_shell}) { 94if ($cf::CFG{perl_shell}) {
89 if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1) { 95 if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1, Blocking => 0) {
90 Event->io (fd => $listen, poll => 'r', data => cf::WF_AUTOCANCEL, cb => sub { tcp_serve $listen->accept }); 96 $LISTENER = AE::io $listen, 0, sub { tcp_serve $listen->accept };
91 } 97 }
92} 98}
93 99
94 100

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines