From: ivan Date: Mon, 23 Sep 2002 14:27:28 +0000 (+0000) Subject: global.asa changes for profiling redirects X-Git-Tag: freeside_1_5_0pre1~221 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=536d684c3e17375d45a5d62bc5d748fec0224860 global.asa changes for profiling redirects header-handling changes necessary for chart .cgis --- diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index e44ebcc0a..d69aad2fc 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -10,7 +10,7 @@ use FS::UID; @ISA = qw(Exporter); @EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable - small_custview myexit); + small_custview myexit http_header); =head1 NAME @@ -68,6 +68,38 @@ END $x; } +=item http_header + +Sets an http header. + +=cut + +sub http_header { + my ( $header, $value ) = @_; + if (exists $ENV{MOD_PERL}) { + if ( defined $main::Response + && $main::Response->isa('Apache::ASP::Response') ) { #Apache::ASP + if ( $header =~ /^Content-Type$/ ) { + $main::Response->{ContentType} = $value; + } else { + $main::Response->AddHeader( $header => $value ); + } + } elsif ( defined $HTML::Mason::Commands::r ) { #Mason + ## is this the correct pacakge for $r ??? for 1.0x and 1.1x ? + if ( $header =~ /^Content-Type$/ ) { + $HTML::Mason::Commands::r->content_type($value); + } else { + $HTML::Mason::Commands::r->header_out( $header => $value ); + } + } else { + die "http_header called in unknown environment"; + } + } else { + die "http_header called not running under mod_perl"; + } + +} + =item menubar ITEM, URL, ... Returns an HTML menubar. diff --git a/htetc/global.asa b/htetc/global.asa index 3c8380fd4..4f1ca45d3 100644 --- a/htetc/global.asa +++ b/htetc/global.asa @@ -1,20 +1,26 @@ +#BEGIN { eval "use Devel::AutoProfiler;"; } #only if installed... +#BEGIN { package Devel::AutoProfiler; use vars qw(%caller_info); } +use Devel::AutoProfiler; + use strict; use vars qw( $cgi $p ); use CGI; #use CGI::Carp qw(fatalsToBrowser); use Date::Format; use Date::Parse; +use Time::Local; use Tie::IxHash; use HTML::Entities; use IO::Handle; use IO::File; use String::Approx qw(amatch); +use Chart::LinesPoints; use HTML::Widgets::SelectLayers 0.02; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); use FS::Conf; use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot - small_custview myexit); + small_custview myexit http_header); use FS::Msgcat qw(gettext geterror); use FS::agent; @@ -68,22 +74,113 @@ sub Script_OnStart { &cgisuidsetup($cgi); $p = popurl(2); #print $cgi->header( '-expires' => 'now' ); + dbh->{'private_profile'} = {} if dbh->can('sprintProfile'); + + #really should check for FS::Profiler or something + # Devel::AutoProfiler _our_ VERSION? thanks a fucking lot + if ( Devel::AutoProfiler->can('__recursively_fetch_subs_in_package') ) { + #should check to see it's my special version. well, switch to FS::Profiler + + #nicked from Devel::AutoProfiler::INIT + my %subs = Devel::AutoProfiler::__recursively_fetch_subs_in_package('main'); + + + SUB : while( my ($name, $ref) = each(%subs) ) + { + #next if $name =~ /^(main::)?Apache::/; + next unless $name =~ /FS/; + foreach my $sub (@Devel::AutoProfiler::do_not_instrument_this_sub) + { + if ($name =~ /$sub/) + { + next SUB; + } + } + next if ($Devel::AutoProfiler::do_not_instrument_this_sub{$name}); + #warn "INIT name is $name \n"; + Devel::AutoProfiler::__instrument_sub($name, $ref); + } + + } + } sub Script_OnFlush { my $ref = $Response->{BinaryRef}; - $$ref = $cgi->header( @FS::CGI::header ) . $$ref; + #$$ref = $cgi->header( @FS::CGI::header ) . $$ref; + #$$ref = $cgi->header() . $$ref; if ( dbh->can('sprintProfile') ) { - - $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i - or warn "can't remove"; + if ( lc($Response->{ContentType}) eq 'text/html' ) { + $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i + or warn "can't remove"; - #$$ref .= '
'. ("\n"x96). encode_entities(dbh->sprintProfile()). '
'; - # wtf? konqueror... - $$ref .= '
'. ("\n"x4096). encode_entities(dbh->sprintProfile()). '
'; + #$$ref .= '
'. ("\n"x96). encode_entities(dbh->sprintProfile()). '
'; + # wtf? konqueror... + $$ref .= '
'. ("\n"x4096). encode_entities(dbh->sprintProfile()).
+               "\n\n". &sprintAutoProfile(). '
'; - $$ref .= ''; - + $$ref .= ''; + } dbh->{'private_profile'} = {}; } } + +if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) { + + #warn "enabling profiling redirects"; + *CGI::redirect = sub { + my( $self, $location) = @_; + my $page = + $cgi->header. + qq!Redirect to $location

!. + '
'. encode_entities(dbh->sprintProfile()).
+      "\n\n". &sprintAutoProfile().  '
'. + ''; + dbh->{'private_profile'} = {}; + return $page; + }; + +} + +sub by_total_time +{ + return $a->{total_time_in_sub} <=> $b->{total_time_in_sub}; +} + +sub sprintAutoProfile { + my %caller_info = %Devel::AutoProfiler::caller_info; + return unless keys %caller_info; + + %Devel::AutoProfiler::caller_info = (); + + my @keys = keys(%caller_info); + + foreach my $key (@keys) + { + my $href = $caller_info{$key}; + + $href->{who_am_i} = $key; + } + + my @subs = values(%caller_info); + + #my @sorted = sort by_total_time ( @subs ); + my @sorted = reverse sort by_total_time ( @subs ); + + # print Dumper \@sorted; + + my @readable_info; + + foreach my $sort (@sorted) + { + push(@readable_info, delete($sort->{who_am_i})); + push(@readable_info, $sort); + } + + use Data::Dumper; + return encode_entities(Dumper(\@readable_info)); + +} + +1; + diff --git a/htetc/handler.pl b/htetc/handler.pl index 49bcbc08c..d55ba3310 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -61,17 +61,19 @@ sub handler #use CGI::Carp qw(fatalsToBrowser); use Date::Format; use Date::Parse; + use Time::Local; use Tie::IxHash; use HTML::Entities; use IO::Handle; use IO::File; use String::Approx qw(amatch); + use Chart::LinesPoints; use HTML::Widgets::SelectLayers 0.02; use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name); use FS::Record qw(qsearch qsearchs fields dbdef); use FS::Conf; use FS::CGI qw(header menubar popurl table itable ntable idiot eidiot - small_custview myexit); + small_custview myexit http_header); use FS::Msgcat qw(gettext geterror); use FS::agent;