--- deliantra/server/ext/dm-support.ext 2007/10/18 02:56:13 1.15 +++ deliantra/server/ext/dm-support.ext 2012/11/11 02:38:10 1.37 @@ -22,20 +22,29 @@ Useful commands (note the '&'): reload_perl & +reload_sound & reload_config & reload_regions & reload_facedata & +reload_exp_table & +reload_materials & reload_treasures & +reload_resources & reload_archetypes & ext::help::reload & ext::books::reload & ext::map_tags::reload & ext::map_world::reload & -print JSON::XS->new->pretty->encode({cf::mallinfo}) +ext::player_env::reload & +ext::map_scheduler::reload & +# ext::map_scheduler::loadall & # debugging only! +until (Coro::AnyEvent::readable \$fh, 1) { Coro::Debug::command "ps" } & +({mallinfo}) +({objinfo}) EOF print $fh "\n> "; - Event->io (fd => $fh, poll => 'r', data => 0, cb => sub { + my $iow; $iow = AE::io $fh, 0, sub { if (defined (my $cmd = <$fh>)) { $cmd =~ s/\s+$//; @@ -50,17 +59,16 @@ package cf; select $fh; - # compile first, the execute, as Coro does not support switching in eval string - my $cb = eval "sub { $cmd }"; + # compile first, then execute, as Coro does not support switching in eval string + my $cb = eval "sub { $cmd \n}"; - my $t1 = Time::HiRes::time; + my $t1 = EV::time; my @res = $@ ? () : eval { $cb->() }; - my $t2 = Time::HiRes::time; + my $t2 = EV::time; print "\n", "command: '$cmd'\n", "execution time: ", $t2 - $t1, "\n"; - warn "evaluation error: $@" if $@; print "evaluation error: $@\n" if $@; print "result:\n", cf::dumpval @res > 1 ? \@res : $res[0] if @res; print "\n> "; @@ -80,16 +88,17 @@ print $fh "\n> "; } else { - $_[0]->w->cancel; + undef $iow; } - }); + }; } +our $LISTENER; + # now a shell listening on a tcp-port - let the firewall decide access rights if ($cf::CFG{perl_shell}) { - if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1) { - Event->io (fd => $listen, poll => 'r', data => cf::WF_AUTOCANCEL, cb => sub { tcp_serve $listen->accept }); + if (my $listen = new IO::Socket::INET LocalAddr => $cf::CFG{perl_shell}, Listen => 1, ReuseAddr => 1, Blocking => 0) { + $LISTENER = AE::io $listen, 0, sub { tcp_serve $listen->accept }; } } -