<div dir="ltr"><br><br><div class="gmail_quote">On Wed, Aug 6, 2008 at 10:44 AM, <span dir="ltr"><<a href="mailto:commits@code.sixapart.com">commits@code.sixapart.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
r6897@db-dev1: josboum | 2008-08-06 19:40:36 +0200<br>
* Improve diagnostics when running under debug mode; this logging is somewhat expensive, and<br>
it might be a good idea to only compute the strings if the server is running in debug mode.<br>
* Add data::dumper + indentation to djabberd-test.pl to speed up debugging in test mode<br>
<br>
<br>
<br>
_U trunk/<br>
U trunk/DJabberd/lib/DJabberd/Callback.pm<br>
U trunk/DJabberd/lib/DJabberd/VHost.pm<br>
U trunk/DJabberd/t/lib/djabberd-test.pl<br>
<br>
<br>
<br>
Property changes on: trunk<br>
___________________________________________________________________<br>
Name: svk:merge<br>
- 02e31fea-a713-0410-9bb5-81a53d0f95f7:/djabberd-trunk:4879<br>
1b5ff1af-660f-0410-86e2-35bade70ffec:/trunk/djabberd:61<br>
391f84f8-cfa2-4f6b-a47d-f52c5dc88d86:/local/sixapart/djabberd-trunk:6534<br>
54bb65a0-b99f-4f2b-b22a-e47d41dc43c7:/groupchat:328<br>
54bb65a0-b99f-4f2b-b22a-e47d41dc43c7:/local:667<br>
c548c595-0a51-0410-a370-acbe0a8988c9:/local/sixapart/djabberd/trunk:6896<br>
+ 02e31fea-a713-0410-9bb5-81a53d0f95f7:/djabberd-trunk:4879<br>
1b5ff1af-660f-0410-86e2-35bade70ffec:/trunk/djabberd:61<br>
391f84f8-cfa2-4f6b-a47d-f52c5dc88d86:/local/sixapart/djabberd-trunk:6534<br>
54bb65a0-b99f-4f2b-b22a-e47d41dc43c7:/groupchat:328<br>
54bb65a0-b99f-4f2b-b22a-e47d41dc43c7:/local:667<br>
c548c595-0a51-0410-a370-acbe0a8988c9:/local/sixapart/djabberd/trunk:6897<br>
<br>
Modified: trunk/DJabberd/lib/DJabberd/Callback.pm<br>
===================================================================<br>
--- trunk/DJabberd/lib/DJabberd/Callback.pm 2008-08-06 17:44:20 UTC (rev 798)<br>
+++ trunk/DJabberd/lib/DJabberd/Callback.pm 2008-08-06 17:44:33 UTC (rev 799)<br>
@@ -3,6 +3,8 @@<br>
use Carp qw(croak);<br>
our $AUTOLOAD;<br>
<br>
+our $logger = DJabberd::Log->get_logger();<br>
+<br>
sub new {<br>
#my ($class, $meths) = @_;<br>
# TODO: track where it was defined at, in debug mode?<br>
@@ -34,6 +36,12 @@<br>
# ignore perl-generated methods<br>
return unless $meth =~ /[a-z]/;<br>
<br>
+ ### XXX this logging is somewhat expensive. Logging should probably<br>
+ ### only be done if loglevel is set to debug --kane<br>
+ { my @c = caller;<br>
+ $logger->debug( '$callback->'."$meth( @_ ) has been called from $c[1]:$c[2]" );<br>
+ }<br>
+<br>
if ($self->{_has_been_called}++) {<br>
warn "Callback called twice. ignoring.\n";<br>
return;<br>
<br>
Modified: trunk/DJabberd/lib/DJabberd/VHost.pm<br>
===================================================================<br>
--- trunk/DJabberd/lib/DJabberd/VHost.pm 2008-08-06 17:44:20 UTC (rev 798)<br>
+++ trunk/DJabberd/lib/DJabberd/VHost.pm 2008-08-06 17:44:33 UTC (rev 799)<br>
@@ -237,13 +237,28 @@<br>
}<br>
push @hooks, $fallback if $fallback;<br>
<br>
- my ($cb, $try_another); # pre-declared here so they're captured by closures below<br>
+ # pre-declared here so they're captured by closures below<br>
+ my ($cb, $try_another, $depth);<br>
+ my $hook_count = scalar @hooks;<br>
+<br>
my $stopper = sub {<br>
$try_another = undef;<br>
};<br>
$try_another = sub {<br>
my $hk = shift @hooks<br>
or return;<br>
+<br>
+ $depth++;<br>
+<br>
+ ### XXX this logging is somewhat expensive. Logging should probably<br>
+ ### only be done if loglevel is set to debug --kane</blockquote><div><br>So don't check this in. Your commit message even says that it's unnecessarily slow and should only be computed when debug mode is on. So do that first, before you commit to trunk. Trunk should be stable/good.<br>
</div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><br>
+ { use B;</blockquote><div><br>use B at top of the file, not here. use is compile-time anyway, so this buys nothing. and import it as use B (); just to be clear that you're importing no symbols.<br><br></div>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><br>
+ my $cv = B::svref_2object( $hk );</blockquote><div><br>kill the spaces around the parens.<br><br> <br></div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br>
+ $logger->debug(<br>
+ "For phase [@$phase] invoking hook $depth of $hook_count defined at: ".<br>
+ $cv->FILE .':'. $cv->ROOT->first->first->line<br>
+ );<br>
+ }<br>
<br>
$cb->{_has_been_called} = 0; # cheating version of: $cb->reset;<br>
$hk->($self || $hook_inv,<br>
<br>
Modified: trunk/DJabberd/t/lib/djabberd-test.pl<br>
===================================================================<br>
--- trunk/DJabberd/t/lib/djabberd-test.pl 2008-08-06 17:44:20 UTC (rev 798)<br>
+++ trunk/DJabberd/t/lib/djabberd-test.pl 2008-08-06 17:44:33 UTC (rev 799)<br>
@@ -167,6 +167,9 @@<br>
use overload<br>
'""' => \&as_string;<br>
<br>
+use Data::Dumper qw[Dumper];<br>
+local $Data::Dumper::Indent = 1;<br>
+<br>
our $PLUGIN_CB;<br>
our $VHOST_CB;<br>
our @SUBDOMAINS;<br>
@@ -316,6 +319,9 @@<br>
use overload<br>
'""' => \&as_string;<br>
<br>
+use Data::Dumper qw[Dumper];<br>
+local $Data::Dumper::Indent = 1;<br>
+<br>
sub resource {<br>
return $_[0]{resource} ||= ($ENV{UNICODE_RESOURCE} ? "test\xe2\x80\x99s computer" : "testsuite_with_gibberish:'\"");<br>
}<br>
<br>
<br>
</blockquote></div><br></div>