[LON-CAPA-cvs] cvs: loncom /xml lonxml.pm

[albertel]

albertel		Tue Oct  5 14:51:51 2004 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
  Log:
  - add in timing info to the debugging info
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.338 loncom/xml/lonxml.pm:1.339
--- loncom/xml/lonxml.pm:1.338	Sun Aug 29 04:14:41 2004
+++ loncom/xml/lonxml.pm	Tue Oct  5 14:51:50 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.338 2004/08/29 08:14:41 albertel Exp $
+# $Id: lonxml.pm,v 1.339 2004/10/05 18:51:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,7 @@
 use Math::Random();
 use Opcode();
 use POSIX qw(strftime);
-
+use Time::HiRes qw( gettimeofday tv_interval );
 
 sub register {
   my ($space,@taglist) = @_;
@@ -815,6 +815,8 @@
   $Apache::lonxml::olddepth=-1;
 }
 
+my @timers;
+my $lasttime;
 sub increasedepth {
   my ($token) = @_;
   $Apache::lonxml::depth++;
@@ -822,8 +824,12 @@
   if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) {
     $Apache::lonxml::olddepth=$Apache::lonxml::depth;
   }
+  push(@timers,[&gettimeofday()]);
+  my $time=&tv_interval($lasttime);
+  $lasttime=[&gettimeofday()];
+  my $spacing='  'x($Apache::lonxml::depth-1);
   my $curdepth=join('_',@Apache::lonxml::depthcounter);
-  &Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n");
+  &Apache::lonxml::debug("s$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : \n");
 #print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n";
 }
 
@@ -838,8 +844,12 @@
     &Apache::lonxml::warning(&mt("Missing tags, unable to properly run file."));
     $Apache::lonxml::depth='-1';
   }
+  my $timer=pop(@timers);
+  my $time=&tv_interval($lasttime);
+  $lasttime=[&gettimeofday()];
+  my $spacing='  'x$Apache::lonxml::depth;
   my $curdepth=join('_',@Apache::lonxml::depthcounter);
-  &Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n");
+  &Apache::lonxml::debug("e$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : ".&tv_interval($timer)."\n");
 #print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n";
 }