X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=74e53b10b1547a9af6cd729903b7397d33d26ea1;hb=d97dcf91d4bd3b8d3c31e5aafa439d00ba31066c;hp=d5271313960a1f6f42f6142a883923aa7e9afabd;hpb=f2c90f82509ae2be33216ebaed3bc9f8ea3f5f80;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index d5271313..74e53b10 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -544,8 +544,17 @@ sub run_cmd
 			if ($package && $self->can("${package}::handle")) {
 				no strict 'refs';
 				dbg("cmd: package $package") if isdbg('command');
+				if (isdbg('progress')) {
+					my $s = "CMD: '$cmd' by $call ip $self->{hostname}";
+				}
+				my $t0 = [gettimeofday];
 				eval { @ans = &{"${package}::handle"}($self, $args) };
 				return (DXDebug::shortmess($@)) if $@;
+				if (isdbg('progress')) {
+					my $msecs = _diffms($t0);
+					my $s = "CMD: '$cmd $args' by $call ip: $self->{hostname} ${msecs}mS";
+					dbg($s);
+				}
 			} else {
 				dbg("cmd: $package not present") if isdbg('command');
 				return $self->_error_out('e1');
@@ -1265,22 +1274,6 @@ sub send_motd
 	$self->send_file($motd) if -e $motd;
 }
 
-sub _diffms
-{
-	return unless isdbg('chan');
-	my $call = shift;
-	my $line = shift;
-	my $ta = shift;
-	my $tb = shift || [gettimeofday];
-
-	my $a = int($ta->[0] * 1000) + int($ta->[1] / 1000); 
-	my $b = int($tb->[0] * 1000) + int($tb->[1] / 1000);
-	my $msecs = $b - $a;
-
-	my $s = "forkcall stats: $call '$line' ";
-	$s .= "${msecs}mS";
-	dbg($s);
-}
 
 # Punt off a long running command into a separate process
 #
@@ -1324,6 +1317,7 @@ sub spawn_cmd
 					 $s .= ", args: " . join(', ', @$args) if $args && @$args;
 				 }
 				 my @res = $cmdref->(@$args);
+#				 diffms("rcmd from $call 1", $line, $t0, scalar @res) if isdbg('chan');
 				 return @res;
 			 },
 #			 $args,
@@ -1333,7 +1327,7 @@ sub spawn_cmd
 				 return unless $dxchan;
 
 				 if ($err) {
-					 my $s = "DXCommand::spawn_cmd: call $call error $err";
+					 my $s = "DXProt::spawn_cmd: call $call error $err";
 					 dbg($s) if isdbg('chan');
 					 $dxchan->send($s);
 					 return;
@@ -1349,7 +1343,7 @@ sub spawn_cmd
 						 $dxchan->send(@res);
 					 }
 				 }
-				 _diffms($call, $line, $t0);
+				 diffms("by $call", $line, $t0, scalar @res) if isdbg('progress');
 			 });
 	
 	return @out;