Changeset 2009

Timestamp:

10/27/2007 11:05:43 PM (10 months ago)

Author:

jan

Message:

fixed support for tracing on solaris with gdb and truss

Files:

• trunk/tests/LightyTest.pm (modified) (4 diffs)

trunk/tests/LightyTest.pm

@@ -92 +92 @@
 
         unlink($self->{LIGHTTPD_PIDFILE});
+        my $cmdline = "";
         if (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'strace') {
-                system("strace -tt -s 512 -o strace ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &");
+                $cmdline = "strace -tt -s 512 -o strace ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &";
+        } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'truss') {
+                $cmdline = "truss -a -l -w all -v all -o strace ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &";
+        } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'gdb') {
+                $cmdline = "gdb --batch --ex 'run' --ex 'bt' --args ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." > gdb.out &";
+
         } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'valgrind') {
-                system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --log-file=valgrind ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &");
+                $cmdline = "valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --log-file=valgrind ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &";
         } else {
-                system($self->{LIGHTTPD_PATH}." -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH});
-        }
+                $cmdline = $self->{LIGHTTPD_PATH}." -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH};
+        }
+        # diag("starting lighttpd at :".$self->{PORT}.", cmdline: ".$cmdline );
+        system($cmdline) == 0 or die($?);
 
         select(undef, undef, undef, 0.1);
@@ -131 +139 @@
         my @request = $t->{REQUEST};
         my @response = $t->{RESPONSE};
+        my $is_debug = $ENV{"TRACE_HTTP"};
 
         my $remote = 
@@ -144 +153 @@
         $remote->autoflush(1);
 
+        diag("sending request header to ".$host.":".$self->{PORT}) if $is_debug;
         foreach(@request) {
                 # pipeline requests
@@ -150 +160 @@
 
                 print $remote $_.$BLANK;        
-        }
+                diag("<< ".$_) if $is_debug;
+        }
+        diag("... done") if $is_debug;
 
         my $lines = "";
 
+        diag("receiving response") if $is_debug;
         # read everything
         while(<$remote>) {
                 $lines .= $_;
-        }
+                diag(">> ".$_) if $is_debug;
+        }
+        diag("... done") if $is_debug;
         
         close $remote;