Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 42593 invoked from network); 8 May 2008 14:50:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 May 2008 14:50:55 -0000 Received: (qmail 7818 invoked by uid 500); 8 May 2008 14:50:57 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 7782 invoked by uid 500); 8 May 2008 14:50:56 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 7773 invoked by uid 99); 8 May 2008 14:50:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 07:50:56 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 May 2008 14:50:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id EBF2B238899B; Thu, 8 May 2008 07:50:30 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r654541 - in /incubator/sling/trunk: api/src/main/java/org/apache/sling/api/request/ commons/testing/src/main/java/org/apache/sling/commons/testing/sling/ sling/core/src/main/java/org/apache/sling/core/impl/debug/ sling/core/src/main/java/o... Date: Thu, 08 May 2008 14:50:30 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080508145030.EBF2B238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Thu May 8 07:50:30 2008 New Revision: 654541 URL: http://svn.apache.org/viewvc?rev=654541&view=rev Log: SLING-3 - add more useful info to the RequestProgressTracker log Modified: incubator/sling/trunk/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockRequestProgressTracker.java incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/debug/RequestProgressTrackerLogFilter.java incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestProgressTracker.java incubator/sling/trunk/sling/servlets-get/src/main/java/org/apache/sling/servlets/DefaultGetServlet.java Modified: incubator/sling/trunk/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java?rev=654541&r1=654540&r2=654541&view=diff ============================================================================== --- incubator/sling/trunk/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java (original) +++ incubator/sling/trunk/api/src/main/java/org/apache/sling/api/request/RequestProgressTracker.java Thu May 8 07:50:30 2008 @@ -118,5 +118,10 @@ * Dumps the process timer entries to the given writer, one entry per line. */ public void dump(PrintWriter writer); - + + /** + * Call this when done processing the request - all calls except the first + * one are ignored + */ + public void done(); } Modified: incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockRequestProgressTracker.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockRequestProgressTracker.java?rev=654541&r1=654540&r2=654541&view=diff ============================================================================== --- incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockRequestProgressTracker.java (original) +++ incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/sling/MockRequestProgressTracker.java Thu May 8 07:50:30 2008 @@ -48,4 +48,6 @@ public void startTimer(String timerName) { } + public void done() { + } } Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/debug/RequestProgressTrackerLogFilter.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/debug/RequestProgressTrackerLogFilter.java?rev=654541&r1=654540&r2=654541&view=diff ============================================================================== --- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/debug/RequestProgressTrackerLogFilter.java (original) +++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/debug/RequestProgressTrackerLogFilter.java Thu May 8 07:50:30 2008 @@ -55,15 +55,19 @@ chain.doFilter(request, response); - if(log.isDebugEnabled() && request instanceof SlingHttpServletRequest) { - int requestId = 0; - synchronized (getClass()) { - requestId = ++requestCounter; - } + if(request instanceof SlingHttpServletRequest) { final RequestProgressTracker t = ((SlingHttpServletRequest)request).getRequestProgressTracker(); - final Iterator it = t.getMessages(); - while(it.hasNext()) { - log.debug("REQUEST_{} - " + it.next(), requestId); + t.done(); + + if(log.isDebugEnabled()) { + int requestId = 0; + synchronized (getClass()) { + requestId = ++requestCounter; + } + final Iterator it = t.getMessages(); + while(it.hasNext()) { + log.debug("REQUEST_{} - " + it.next(), requestId); + } } } } Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java?rev=654541&r1=654540&r2=654541&view=diff ============================================================================== --- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java (original) +++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestDispatcher.java Thu May 8 07:50:30 2008 @@ -118,6 +118,7 @@ } } + cRequest.getRequestProgressTracker().log("Including resource " + info.getResourcePath()); rd.getSlingMainServlet().includeContent(request, response, resource, info); } Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestProgressTracker.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestProgressTracker.java?rev=654541&r1=654540&r2=654541&view=diff ============================================================================== --- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestProgressTracker.java (original) +++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/request/SlingRequestProgressTracker.java Thu May 8 07:50:30 2008 @@ -119,6 +119,8 @@ * start of the respective timer. */ private final Map namedTimerEntries = new HashMap(); + + private boolean done; /** * Creates a new request progress tracker. @@ -132,6 +134,8 @@ * initial timer entry */ public void reset() { + done = false; + // remove all entries entries.clear(); namedTimerEntries.clear(); @@ -241,6 +245,13 @@ + "ms"); } } + + public void done() { + if(done) return; + logTimer(REQUEST_PROCESSING_TIMER, REQUEST_PROCESSING_TIMER + " ends"); + done = true; + } + /** Process tracker entry keeping timestamp, tag and message */ private static class TrackingEntry { Modified: incubator/sling/trunk/sling/servlets-get/src/main/java/org/apache/sling/servlets/DefaultGetServlet.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/servlets-get/src/main/java/org/apache/sling/servlets/DefaultGetServlet.java?rev=654541&r1=654540&r2=654541&view=diff ============================================================================== --- incubator/sling/trunk/sling/servlets-get/src/main/java/org/apache/sling/servlets/DefaultGetServlet.java (original) +++ incubator/sling/trunk/sling/servlets-get/src/main/java/org/apache/sling/servlets/DefaultGetServlet.java Thu May 8 07:50:30 2008 @@ -107,6 +107,9 @@ return; } + request.getRequestProgressTracker().log("Using " + + rendererServlet.getClass().getName() + + " to render for extension=" + ext); rendererServlet.service(request, response); }