Return-Path: Delivered-To: apmail-activemq-camel-commits-archive@locus.apache.org Received: (qmail 12388 invoked from network); 6 Jun 2008 06:01:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Jun 2008 06:01:44 -0000 Received: (qmail 93165 invoked by uid 500); 6 Jun 2008 06:01:47 -0000 Delivered-To: apmail-activemq-camel-commits-archive@activemq.apache.org Received: (qmail 93144 invoked by uid 500); 6 Jun 2008 06:01:47 -0000 Mailing-List: contact camel-commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: camel-dev@activemq.apache.org Delivered-To: mailing list camel-commits@activemq.apache.org Received: (qmail 93135 invoked by uid 99); 6 Jun 2008 06:01:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Jun 2008 23:01:47 -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; Fri, 06 Jun 2008 06:00:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 480222388A0A; Thu, 5 Jun 2008 23:01:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r663830 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/management/ test/java/org/apache/camel/management/ Date: Fri, 06 Jun 2008 06:01:21 -0000 To: camel-commits@activemq.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080606060121.480222388A0A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Thu Jun 5 23:01:20 2008 New Revision: 663830 URL: http://svn.apache.org/viewvc?rev=663830&view=rev Log: CAMEL-578: Using millis for timing instead of nano. Applied patch with thanks to William Tam Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java?rev=663830&r1=663829&r2=663830&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/InstrumentationProcessor.java Thu Jun 5 23:01:20 2008 @@ -39,11 +39,11 @@ } public void process(Exchange exchange) throws Exception { - long startTime = System.nanoTime(); + long startTime = System.currentTimeMillis(); super.process(exchange); if (counter != null) { if (!exchange.isFailed()) { - counter.completedExchange(System.nanoTime() - startTime); + counter.completedExchange(System.currentTimeMillis() - startTime); } else { counter.completedExchange(); } Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java?rev=663830&r1=663829&r2=663830&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java (original) +++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/management/PerformanceCounter.java Thu Jun 5 23:01:20 2008 @@ -56,18 +56,18 @@ return numExchanges.get() - numCompleted.get(); } - @ManagedAttribute(description = "Min Processing Time [ns]") + @ManagedAttribute(description = "Min Processing Time [milli-seconds]") public synchronized long getMinProcessingTime() throws Exception { return minProcessingTime; } - @ManagedAttribute(description = "Mean Processing Time [ns]") + @ManagedAttribute(description = "Mean Processing Time [milli-seconds]") public synchronized long getMeanProcessingTime() throws Exception { long count = numCompleted.get(); return count > 0 ? (long)totalProcessingTime / count : 0L; } - @ManagedAttribute(description = "Max Processing Time [ns]") + @ManagedAttribute(description = "Max Processing Time [milli-seconds]") public synchronized long getMaxProcessingTime() throws Exception { return maxProcessingTime; } Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java?rev=663830&r1=663829&r2=663830&view=diff ============================================================================== --- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java (original) +++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java Thu Jun 5 23:01:20 2008 @@ -102,12 +102,12 @@ assertNotNull("Expected attribute not found. MBean registerred under a " + "':name=Stats,*' key must be of type PerformanceCounter.class", valueofMinProcessingTime); - assertTrue(valueofMinProcessingTime > 0); + assertTrue(valueofMinProcessingTime >= 0); Long valueofMaxProcessingTime = (Long)mbs.getAttribute(pcob, "MaxProcessingTime"); assertNotNull("Expected attribute not found. MBean registerred under a " + "':name=Stats,*' key must be of type PerformanceCounter.class", valueofMaxProcessingTime); - assertTrue(valueofMaxProcessingTime > 0); + assertTrue(valueofMaxProcessingTime >= 0); Long valueofMeanProcessingTime = (Long)mbs.getAttribute(pcob, "MeanProcessingTime"); assertNotNull("Expected attribute not found. MBean registerred under a " + "':name=Stats,*' key must be of type PerformanceCounter.class",