X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=1e3efc47fd97bc6ecae12f506bcca9b3ede6f857;hb=a76624e4742348ed0f39c7c3f732cdec8462da9e;hp=ad9baad05832ed2d087ee479f1d9a84a52acb519;hpb=9fc2ec17088fbff22e825133a4b9b3efe5384df3;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index ad9baad0..1e3efc47 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -38,6 +38,10 @@ use VE7CC;
 use DXXml;
 use AsyncMsg;
 
+use Mojo::IOLoop;
+use Mojo::IOLoop::ForkCall;
+use Mojo::UserAgent;
+
 use strict;
 use vars qw(%Cache %cmd_cache $errstr %aliases $scriptbase %nothereslug
 	$maxbadcount $msgpolltime $default_pagelth $cmdimportdir);
@@ -793,7 +797,7 @@ sub find_cmd_name {
 		#we have compiled this subroutine already,
 		#it has not been updated on disk, nothing left to do
 		#print STDERR "already compiled $package->handler\n";
-		;
+		dbg("find_cmd_name: $package cached") if isdbg('command');
 	} else {
 
 		my $sub = readfilestr($filename);
@@ -1194,7 +1198,7 @@ sub import_cmd
 						$dxchan->{priv} = $u->priv;
 						$dxchan->{user} = $u;
 						@out = $s->run($dxchan, 1);
-						$dxchan->{call} = $call;
+						$dxchan->{call} = $old;
 						$dxchan->{priv} = $priv;
 						$dxchan->{user} = $user;
 					} else {
@@ -1241,5 +1245,57 @@ sub send_motd
 	}
 	$self->send_file($motd) if -e $motd;
 }
+
+# Punt off a long running command into a separate process
+#
+# Hhis is called from commands to run some potentially long running
+# function. The process forks and then runs the function and returns
+# the result back to the cmd. 
+# 
+# call: $self->spawn_cmd(\<function>, [cb => sub{...}], [prefix => "cmd> "], [progress => 0|1], [args => [...]]);
+sub spawn_cmd
+{
+	my $self = shift;
+	my $cmdref = shift;
+	my $call = $self->{call};
+	my %args = @_;
+	my @out;
+	
+	my $cb = delete $args{cb};
+	my $prefix = delete $args{prefix};
+	my $progress = delete $args{progress};
+	my $args = delete $args{args} || [];
+
+	no strict 'refs';
+		
+	my $fc = Mojo::IOLoop::ForkCall->new;
+	$fc->run(
+			 sub {my @args = @_; my @res = $cmdref->(@args); return @res},
+			 $args,
+			 sub {
+				 my ($fc, $err, @res) = @_; 
+				 my $dxchan = DXChannel::get($call);
+				 return unless $dxchan;
+
+				 if (defined $err) {
+					 my $s = "DXCommand::spawn_cmd: call $call error $err";
+					 dbg($s) if isdbg('chan');
+					 $dxchan->send($s);
+					 return;
+				 }
+				 if ($cb) {
+					 $cb->($dxchan, @res);
+				 } else {
+					 return unless @res;
+					 if (defined $prefix) {
+						 $dxchan->send(map {"$prefix$_"} @res);
+					 } else {
+						 $dxchan->send(@res);
+					 }
+				 }
+			 });
+	return @out;
+}
+
 1;
 __END__