- Nuiton-utils-commits - mailman.cloud.codelutin.com

r2195 - trunk/nuiton-profiling/src/main/java/org/nuiton/profiling
by bpoussin＠users.nuiton.org Aug. 26, 2011

Aug. 26, 2011

Author: bpoussin Date: 2011-08-26 18:01:12 +0200 (Fri, 26 Aug 2011) New Revision: 2195 Url: http://nuiton.org/repositories/revision/nuiton-utils/2195 Log: Evolution #1712: Add information of caller of method with number of call - call stack must be per thread to prevent mix Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-08-26 15:28:26 UTC (rev 2194) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-08-26 16:01:12 UTC (rev 2195) @@ -123,9 +123,22 @@ protected Map<Method, Caller<Method>> callers = new HashMap<Method, Caller<Method>>(); - /** array : [nest method call, start time, start time with child] */ - protected Stack<Call> callStack = new Stack<Call>(); + /** + * array : [nest method call, start time, start time with child] + * + * On ne melange pas les stack entre les threads, sinon les resultats + * ne veulent plus rien dire car toutes les methodes des threads sont + * melangees + */ + protected static final ThreadLocal<Stack<Call>> callStack = new ThreadLocal<Stack<Call>> () { + @Override + protected Stack<Call> initialValue() { + Stack<Call> result = new Stack<Call>(); + return result; + } + }; + public NuitonTrace() { instances.add(this); } @@ -171,9 +184,7 @@ long current = System.nanoTime(); Call stackItem = new Call(method, 0, current, current); - callStack.push(stackItem); - - + callStack.get().push(stackItem); } @AfterThrowing("executeMethod() && !within(org.nuiton.profiling.NuitonTrace.*)") @@ -188,6 +199,8 @@ long current = System.nanoTime(); + Stack<Call> callStack = this.callStack.get(); + if (callStack.isEmpty()) { // log.warn("Empty stack in afterExecute for method " + method.getName()); } else { @@ -252,6 +265,7 @@ for (NuitonTrace trace : instances) { for (Method method : trace.statistics.keySet()) { Statistic stat = trace.getStatistics(method); + Caller<Method> caller = trace.getCallers(method); long meanTime = stat.timeTotal / stat.call; result.append(method) .append(";").append(stat.call) @@ -262,11 +276,14 @@ .append(";").append(DurationFormatUtils.formatDuration(stat.timeTotal / 1000000, "s'.'S")) .append(";").append(stat.callNestMethod) .append(";").append(DurationFormatUtils.formatDuration(stat.timeTotalNestMethod / 1000000, "s'.'S")) - .append(";").append(trace.getCallers(method)) + .append(";").append(caller) .append("\n"); } + trace.statistics.clear(); + trace.callers.clear(); } - instances.clear(); + // Poussin 20110826 on ne vide pas les instances mais les stats +// instances.clear(); return result.toString(); } @@ -291,8 +308,11 @@ .append("\n"); } result.append("--------------------\n"); + trace.statistics.clear(); + trace.callers.clear(); } - instances.clear(); + // Poussin 20110826 on ne vide pas les instances mais les stats +// instances.clear(); return result.toString(); }

1 0

r2194 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org Aug. 26, 2011

Aug. 26, 2011

Author: echatellier Date: 2011-08-26 17:28:26 +0200 (Fri, 26 Aug 2011) New Revision: 2194 Url: http://nuiton.org/repositories/revision/nuiton-utils/2194 Log: Add javadoc about getResource use cases. Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java 2011-08-26 15:25:10 UTC (rev 2193) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/Resource.java 2011-08-26 15:28:26 UTC (rev 2194) @@ -625,6 +625,12 @@ /** * Find pattern resouces in {@link ClassLoader#getSystemClassLoader()}. * + * Usage : + * <pre> + * List<URL> urls = Resources.getResources("META-INF/.*\\.MF"); + * List<URL> urls = Resources.getResources("org/nuiton/util/.?esource\\.class"); + * </pre> + * * @param pattern java regex style pattern to find * @return url list found * @throws IOException if any IO problem while seeking resources @@ -637,6 +643,12 @@ /** * Find pattern resouces in classloader. * + * Usage : + * <pre> + * List<URL> urls = Resources.getResources("META-INF/.*\\.MF"); + * List<URL> urls = Resources.getResources("org/nuiton/util/.?esource\\.class"); + * </pre> + * * @param pattern java regex style pattern to find * @param classLoader classLoader * @return url list found

1 0

r2193 - trunk/nuiton-utils/src/main/java/org/nuiton/util
by echatellier＠users.nuiton.org Aug. 26, 2011

Aug. 26, 2011

Author: echatellier Date: 2011-08-26 17:25:10 +0200 (Fri, 26 Aug 2011) New Revision: 2193 Url: http://nuiton.org/repositories/revision/nuiton-utils/2193 Log: Add javadoc Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java 2011-08-25 17:50:06 UTC (rev 2192) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/FileUtil.java 2011-08-26 15:25:10 UTC (rev 2193) @@ -515,7 +515,10 @@ /** * Permet de lire un fichier et de retourner sont contenu sous forme d'une - * chaine de carateres + * chaine de carateres. + * + * Warning, this method use {@link #ENCODING} to read file (by default + * in ISO). * * @param file le fichier a lire * @return le contenu du fichier @@ -537,7 +540,8 @@ /** * Permet de sauver une chaine directement dans un fichier * - * Use default enconding : {@link #ENCODING}. + * Warning, this method use {@link #ENCODING} to read file (by default + * in ISO). * * @param file Le fichier dans lequel il faut ecrire la chaine * @param content Le texte a ecrire dans le fichier

1 0

r2192 - trunk/nuiton-profiling/src/test/resources/META-INF
by athimel＠users.nuiton.org Aug. 25, 2011

Aug. 25, 2011

Author: athimel Date: 2011-08-25 19:50:06 +0200 (Thu, 25 Aug 2011) New Revision: 2192 Url: http://nuiton.org/repositories/revision/nuiton-utils/2192 Log: Add missing header Modified: trunk/nuiton-profiling/src/test/resources/META-INF/aop.xml Modified: trunk/nuiton-profiling/src/test/resources/META-INF/aop.xml =================================================================== --- trunk/nuiton-profiling/src/test/resources/META-INF/aop.xml 2011-08-25 17:46:56 UTC (rev 2191) +++ trunk/nuiton-profiling/src/test/resources/META-INF/aop.xml 2011-08-25 17:50:06 UTC (rev 2192) @@ -1,3 +1,27 @@ + <!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.eclipse.org/aspectj/dtd/aspectj.dtd">

1 0

r2191 - in trunk/nuiton-utils/src: main/java/org/nuiton/util/beans test/java/org/nuiton/util/beans
by athimel＠users.nuiton.org Aug. 25, 2011

Aug. 25, 2011

Author: athimel Date: 2011-08-25 19:46:56 +0200 (Thu, 25 Aug 2011) New Revision: 2191 Url: http://nuiton.org/repositories/revision/nuiton-utils/2191 Log: Fix #1713 - BinderModelBuilder was using source instead of target Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Destination.java trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Source.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java 2011-08-25 14:18:52 UTC (rev 2190) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java 2011-08-25 17:46:56 UTC (rev 2191) @@ -444,7 +444,7 @@ model.getTargetType()); } // check dstProperty is writable - Method writeMethod = sourceDescriptor.getWriteMethod(); + Method writeMethod = targetDescriptor.getWriteMethod(); if (writeMethod == null) { throw new IllegalArgumentException("property '" + targetProperty + "' " + "is not writable on type " + model.getTargetType()); Modified: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java 2011-08-25 14:18:52 UTC (rev 2190) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/BinderModelBuilderTest.java 2011-08-25 17:46:56 UTC (rev 2191) @@ -540,4 +540,24 @@ Assert.assertEquals(targetType, builder.getModel().getTargetType()); } + @Test + public void testBug1713() throws Exception { + + // This is test for http://nuiton.org/issues/1713 + + BinderModelBuilder<Source, Destination> builder = + BinderModelBuilder.newDefaultBuilder(Source.class, Destination.class); + builder.addProperty("salutationCode", "gender"); + + Binder<Source, Destination> binder = builder.toBinder(); + + String salutationCode = "youhou"; + + Source source = new Source(salutationCode); + Destination destination = new Destination(); + binder.copy(source, destination); + + Assert.assertEquals(salutationCode, destination.getGender()); + } + } Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Destination.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Destination.java (rev 0) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Destination.java 2011-08-25 17:46:56 UTC (rev 2191) @@ -0,0 +1,42 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.util.beans; + +/** + * Destination bean used to fix http://nuiton.org/issues/1713 + */ +public class Destination { + + private String gender; + + public String getGender() { + return gender; + } + + public void setGender(String gender) { + this.gender = gender; + } + +} Property changes on: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Destination.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Source.java =================================================================== --- trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Source.java (rev 0) +++ trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Source.java 2011-08-25 17:46:56 UTC (rev 2191) @@ -0,0 +1,42 @@ +/* + * #%L + * Nuiton Utils :: Nuiton Utils + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.util.beans; + +/** + * Source bean used to fix http://nuiton.org/issues/1713 + */ +public class Source { + + private String salutationCode; + + public Source(String salutationCode) { + this.salutationCode = salutationCode; + } + + public String getSalutationCode() { + return salutationCode; + } + +} Property changes on: trunk/nuiton-utils/src/test/java/org/nuiton/util/beans/Source.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2190 - trunk/nuiton-profiling/src/main/java/org/nuiton/profiling
by bpoussin＠users.nuiton.org Aug. 25, 2011

Aug. 25, 2011

Author: bpoussin Date: 2011-08-25 16:18:52 +0200 (Thu, 25 Aug 2011) New Revision: 2190 Url: http://nuiton.org/repositories/revision/nuiton-utils/2190 Log: exclude all time org.nuiton.profiling.NuitonTrace method in pointcut (prevent cycle) Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-08-25 14:11:05 UTC (rev 2189) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-08-25 14:18:52 UTC (rev 2190) @@ -164,7 +164,7 @@ @Pointcut abstract void executeMethod(); - @Before("executeMethod()") + @Before("executeMethod() && !within(org.nuiton.profiling.NuitonTrace.*)") public void traceBeforeExecute(JoinPoint jp) { // ajout dans le stack Method method = ((MethodSignature) jp.getSignature()).getMethod(); @@ -176,13 +176,13 @@ } - @AfterThrowing("executeMethod()") + @AfterThrowing("executeMethod() && !within(org.nuiton.profiling.NuitonTrace.*)") public void traceAfterThrowingExecute(JoinPoint jp) { // si une exeption est leve, il faut faire la meme chose traceAfterExecute(jp); } - @After("executeMethod()") + @After("executeMethod() && !within(org.nuiton.profiling.NuitonTrace.*)") public void traceAfterExecute(JoinPoint jp) { Method method = ((MethodSignature) jp.getSignature()).getMethod();

1 0

r2189 - trunk/nuiton-profiling/src/main/java/org/nuiton/profiling
by bpoussin＠users.nuiton.org Aug. 25, 2011

Aug. 25, 2011

Author: bpoussin Date: 2011-08-25 16:11:05 +0200 (Thu, 25 Aug 2011) New Revision: 2189 Url: http://nuiton.org/repositories/revision/nuiton-utils/2189 Log: Evolution #1712: Add information of caller of method with number of call - change array of long with java object use as struct Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-08-24 16:55:22 UTC (rev 2188) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-08-25 14:11:05 UTC (rev 2189) @@ -21,15 +21,20 @@ */ package org.nuiton.profiling; +import java.util.Map.Entry; import org.apache.commons.lang.time.DurationFormatUtils; import java.io.PrintStream; import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.Stack; +import java.util.TreeSet; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.After; import org.aspectj.lang.annotation.AfterThrowing; @@ -113,53 +118,48 @@ /** to use log facility, just put in your code: log.info("..."); */ // static private Log log = LogFactory.getLog(NuitonTrace.class); - /** nombre d'appel */ - final static public int STAT_CALL = 0; + /** array : [call's numbers, call do, min time, max time, total time, total time with child] */ + protected Map<Method, Statistic> statistics = new LinkedHashMap<Method, Statistic>(); - /** nombre d'appel vers une autre method depuis cette methode */ - final static public int STAT_CALL_NEST_METHOD = 1; + protected Map<Method, Caller<Method>> callers = new HashMap<Method, Caller<Method>>(); - /** temps mini d'execution de cette methode (sans le temps des autres methodes) */ - final static public int STAT_TIME_MIN = 2; - - /** temps max d'execution de cette methode (sans le temps des autres methodes) */ - final static public int STAT_TIME_MAX = 3; - - /** temps total d'execution de cette methode (sans le temps des autres methodes) */ - final static public int STAT_TIME_TOTAL = 4; - - /** temps total d'execution de cette methode (avec le temps des autres methodes) */ - final static public int STAT_TIME_TOTAL_NEST_METHOD = 5; - - /** nombre d'appel vers une autre method depuis cette methode */ - final static private int STACK_CALL_NEST_METHOD = 0; - - /** heure de depart de l'appel a la methode (sans le temps des autres methodes) */ - final static private int STACK_TIME_START = 1; - - /** heure de depart de l'appel a la methode (avec le temps des autres methodes) */ - final static private int STACK_TIME_START_NEST_METHOD = 2; - - - /** array : [call's numbers, call do, min time, max time, total time, total time with child] */ - protected Map<Method, long[]> statistics = new LinkedHashMap<Method, long[]>(); - /** array : [nest method call, start time, start time with child] */ - protected Stack<long[]> callStack = new Stack<long[]>(); + protected Stack<Call> callStack = new Stack<Call>(); public NuitonTrace() { instances.add(this); } - public long[] getStatistics(Method method) { - long[] result = statistics.get(method); + /** + * Retourne les statistiques d'appele pour la methode passee en parametre + * + * @param method + * @return + */ + public Statistic getStatistics(Method method) { + Statistic result = statistics.get(method); if (result == null) { - result = new long[]{0, 0, 0, 0, 0, 0}; + result = new Statistic(method); statistics.put(method, result); } return result; } + /** + * Retourne la liste des appelant pour la methode passee en parametre + * + * @param method + * @return + */ + public Caller<Method> getCallers(Method method) { + Caller<Method> result = callers.get(method); + if (result == null) { + result = new Caller<Method>(); + callers.put(method, result); + } + return result; + } + // abstract pointcut: no expression is defined @Pointcut abstract void executeMethod(); @@ -167,8 +167,10 @@ @Before("executeMethod()") public void traceBeforeExecute(JoinPoint jp) { // ajout dans le stack + Method method = ((MethodSignature) jp.getSignature()).getMethod(); long current = System.nanoTime(); - long[] stackItem = new long[]{0, current, current}; + + Call stackItem = new Call(method, 0, current, current); callStack.push(stackItem); @@ -189,26 +191,28 @@ if (callStack.isEmpty()) { // log.warn("Empty stack in afterExecute for method " + method.getName()); } else { - long[] stackItem = callStack.pop(); - long timeSpent = current - stackItem[STACK_TIME_START]; - long timeSpentNestMethod = current - stackItem[STACK_TIME_START_NEST_METHOD]; + Call stackItem = callStack.pop(); + long timeSpent = current - stackItem.timeStart; + long timeSpentNestMethod = current - stackItem.timeStartNestMethod; - long[] stat = getStatistics(method); - stat[STAT_CALL]++; // add +1 to call number - stat[STAT_CALL_NEST_METHOD] += stackItem[STACK_CALL_NEST_METHOD]; - stat[STAT_TIME_TOTAL] += timeSpent; - stat[STAT_TIME_TOTAL_NEST_METHOD] += timeSpentNestMethod; - if (stat[STAT_TIME_MIN] > timeSpent) { - stat[STAT_TIME_MIN] = timeSpent; + Statistic stat = getStatistics(method); + stat.call++; // add +1 to call number + stat.callNestMethod += stackItem.callNestMethod; + stat.timeTotal += timeSpent; + stat.timeTotalNestMethod += timeSpentNestMethod; + if (stat.timeMin > timeSpent) { + stat.timeMin = timeSpent; } - if (stat[STAT_TIME_MAX] < timeSpent) { - stat[STAT_TIME_MAX] = timeSpent; + if (stat.timeMax < timeSpent) { + stat.timeMax = timeSpent; } if (!callStack.isEmpty()) { - long[] parent = callStack.peek(); - parent[STACK_CALL_NEST_METHOD]++; // add +1 to call number nest method - parent[STACK_TIME_START] += timeSpentNestMethod; // remove to time all time spent in nest method (yes + to remove :) + Call parent = callStack.peek(); + parent.callNestMethod++; // add +1 to call number nest method + parent.timeStart += timeSpentNestMethod; // remove to time all time spent in nest method (yes + to remove :) + + getCallers(method).add(parent.method); } } @@ -241,21 +245,24 @@ .append("max;") .append("total;") .append("call_nest;") - .append("total_with_nest\n"); + .append("total_with_nest;") + .append("callers;") + .append("\n"); for (NuitonTrace trace : instances) { for (Method method : trace.statistics.keySet()) { - long[] stat = trace.getStatistics(method); - long meanTime = stat[STAT_TIME_TOTAL] / stat[STAT_CALL]; + Statistic stat = trace.getStatistics(method); + long meanTime = stat.timeTotal / stat.call; result.append(method) - .append(";").append(stat[STAT_CALL]) + .append(";").append(stat.call) // Time is in nano not millis, we must divide by 1000000 - .append(";").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_MIN] / 1000000, "s'.'S")) + .append(";").append(DurationFormatUtils.formatDuration(stat.timeMin / 1000000, "s'.'S")) .append(";").append(DurationFormatUtils.formatDuration(meanTime / 1000000, "s'.'S")) - .append(";").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_MAX] / 1000000, "s'.'S")) - .append(";").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_TOTAL] / 1000000, "s'.'S")) - .append(";").append(stat[STAT_CALL_NEST_METHOD]) - .append(";").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_TOTAL_NEST_METHOD] / 1000000, "s'.'S")) + .append(";").append(DurationFormatUtils.formatDuration(stat.timeMax / 1000000, "s'.'S")) + .append(";").append(DurationFormatUtils.formatDuration(stat.timeTotal / 1000000, "s'.'S")) + .append(";").append(stat.callNestMethod) + .append(";").append(DurationFormatUtils.formatDuration(stat.timeTotalNestMethod / 1000000, "s'.'S")) + .append(";").append(trace.getCallers(method)) .append("\n"); } } @@ -269,17 +276,18 @@ for (NuitonTrace trace : instances) { result.append("--- Statistics ---\n"); for (Method method : trace.statistics.keySet()) { - long[] stat = trace.getStatistics(method); - long meanTime = stat[STAT_TIME_TOTAL] / stat[STAT_CALL]; + Statistic stat = trace.getStatistics(method); + long meanTime = stat.timeTotal / stat.call; result.append(method).append("\t") - .append(" call: ").append(stat[STAT_CALL]) + .append(" call: ").append(stat.call) // TIme is in nano not millis, we must divide by 1000000 - .append(" min: ").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_MIN] / 1000000, "s'.'S")) + .append(" min: ").append(DurationFormatUtils.formatDuration(stat.timeMin / 1000000, "s'.'S")) .append(" mean: ").append(DurationFormatUtils.formatDuration(meanTime / 1000000, "s'.'S")) - .append(" max: ").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_MAX] / 1000000, "s'.'S")) - .append(" total: ").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_TOTAL] / 1000000, "s'.'S")) - .append(" call_nest: ").append(stat[STAT_CALL_NEST_METHOD]) - .append(" total_with_nest: ").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_TOTAL_NEST_METHOD] / 1000000, "s'.'S")) + .append(" max: ").append(DurationFormatUtils.formatDuration(stat.timeMax / 1000000, "s'.'S")) + .append(" total: ").append(DurationFormatUtils.formatDuration(stat.timeTotal / 1000000, "s'.'S")) + .append(" call_nest: ").append(stat.callNestMethod) + .append(" total_with_nest: ").append(DurationFormatUtils.formatDuration(stat.timeTotalNestMethod / 1000000, "s'.'S")) + .append(" callers: ").append(trace.getCallers(method)) .append("\n"); } result.append("--------------------\n"); @@ -299,4 +307,112 @@ } } + /** + * Statistique sur un appele de methode + */ + protected static class Statistic { + Method method; + /** nombre d'appel */ + long call = 0; + /** nombre d'appel vers une autre method depuis cette methode */ + long callNestMethod = 0; + /** temps mini d'execution de cette methode (sans le temps des autres methodes) */ + long timeMin = 0; + /** temps max d'execution de cette methode (sans le temps des autres methodes) */ + long timeMax = 0; + /** temps total d'execution de cette methode (sans le temps des autres methodes) */ + long timeTotal = 0; + /** temps total d'execution de cette methode (avec le temps des autres methodes) */ + long timeTotalNestMethod = 0; + + public Statistic(Method method) { + this.method = method; + } + + } + + /** + * Represente un call de methode + */ + protected static class Call { + Method method; + /** nombre d'appel vers une autre method depuis cette methode */ + long callNestMethod; + /** heure de depart de l'appel a la methode (sans le temps des autres methodes) */ + long timeStart; + /** heure de depart de l'appel a la methode (avec le temps des autres methodes) */ + long timeStartNestMethod; + + public Call(Method method, long callNestMethod, long timeStart, long timeStartNestMethod) { + this.method = method; + this.callNestMethod = callNestMethod; + this.timeStart = timeStart; + this.timeStartNestMethod = timeStartNestMethod; + } + + } + + /** + * Classe qui permet d'ajouter un element et compte le nombre de fois + * que l'on a ajoute cet element. + * + * exemple d'utilisation: on souhaite compter le nombre de fois qu'une methode + * est appeler par une autre, on ajoute a chaque fois que quelqu'un fait + * appele a elle ce quelqu'un. + * + */ + protected static class Caller<E> { + + protected Map<E, Integer> data = new HashMap<E, Integer>(); + + /** + * indique que l'on ajoute un element + * @param e + */ + public void add(E e) { + Integer v = data.get(e); + if (v == null) { + v = 0; + } + data.put(e, v+1); + } + + /** + * Retourne la liste des objets ajouter avec le nombre de fois qu'ils + * ont ete ajoute. Trie par le nombre de fois qu'ils ont ete ajoute,le + * plus grand nombre en 1er + * + * @return + */ + @Override + public String toString() { + Comparator<Map.Entry<E, Integer>> comparator = new Comparator<Map.Entry<E, Integer>>() { + public int compare(Entry<E, Integer> o1, Entry<E, Integer> o2) { + // on inverse, car on veut le plus grand en 1er + return o2.getValue().compareTo(o1.getValue()); + } + }; + + Set<Map.Entry<E, Integer>> entries = data.entrySet(); + Set<Map.Entry<E, Integer>> sorted = + new TreeSet<Map.Entry<E, Integer>>(comparator); + sorted.addAll(entries); + + StringBuilder result = new StringBuilder(); + + for (Map.Entry<E, Integer> e : sorted) { + result.append(e.getValue()).append("=[").append(e.getKey()).append("]").append(","); + } + if (result.length() > 0) { + // on supprime la derniere virgule en trop + result.deleteCharAt(result.length()-1); + } + + return result.toString(); + } + + + + } + }

1 0

r2188 - trunk/nuiton-profiling/src/site/apt
by bpoussin＠users.nuiton.org Aug. 24, 2011

Aug. 24, 2011

Author: bpoussin Date: 2011-08-24 18:55:22 +0200 (Wed, 24 Aug 2011) New Revision: 2188 Url: http://nuiton.org/repositories/revision/nuiton-utils/2188 Log: Evolution #1704: Make works NuitonTrace again and add tutorial Modified: trunk/nuiton-profiling/src/site/apt/index.apt Modified: trunk/nuiton-profiling/src/site/apt/index.apt =================================================================== --- trunk/nuiton-profiling/src/site/apt/index.apt 2011-08-24 16:07:45 UTC (rev 2187) +++ trunk/nuiton-profiling/src/site/apt/index.apt 2011-08-24 16:55:22 UTC (rev 2188) @@ -31,12 +31,65 @@ Présentation - nuiton-utils-extra contient un ensemble de librairies trop petites pour avoir - leur propre projet, mais avec trop de dépendances pour être dans nuiton-utils. - Elles sont aussi utiles à la plupart des projets de Code Lutin. + nuiton-profiling contient un ensemble de librairies pour aider à tester les + performance d'une application et voir ou le temps est perdu. NuitonTrace - Permet de tracer le temps passé dans les méthodes au cours de l'éxecution. Cette classe utilise l'AOP pour cela. Pour l'utiliser voir sa javadoc. + +NuitonTrace pour une application Web lancée avec Maven + + Il faut créer le fichier src/main/webapp/WEB-INF/classes/META-INF/aop.xml + pour indiquer les methodes que vous souhaitez surveiller, il contient par + exemple:: + + <!DOCTYPE aspectj PUBLIC + "-//AspectJ//DTD//EN" + "http://www.eclipse.org/aspectj/dtd/aspectj.dtd"> + + <aspectj> + <aspects> + <concrete-aspect name="org.nuiton.profiling.NuitonTraceTestAspect" + extends="org.nuiton.profiling.NuitonTrace"> + <pointcut name="executeMethod" + expression=" + execution(* org.nuiton..*(..)) + || execution(* org.chorem..*(..)) + || execution(* org.apache.struts2..*(..)) + || execution(* com.opensymphony..*(..)) + || execution(* org.apache.velocity..*(..)) + || execution(* freemarker..*(..)) + || execution(* ognl..*(..))"/> + </concrete-aspect> + </aspects> + <weaver options="-verbose"> + </weaver> + </aspectj> + + + Il faut ajouter la dépendance dans votre projet:: + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-profiling</artifactId> + <version>2.3-SNAPSHOT</version> + </dependency> + + Il faut ajouter des options Maven:: + + export MAVEN_OPTS="$MAVEN_OPTS -javaagent:${maven_repo}/org/aspectj/aspectjweaver/1.6.11/aspectjweaver-1.6.11.jar" + + ensuite lancer:: + + mvn jetty:run + + Le plus simple pour sortir les statistiques lorsque vous en avez besoin est de + créer un lien sur votre page web vers une jsp qui contient:: + + <%@page import="org.nuiton.profiling.NuitonTrace"%> + <%@page contentType="text/csv" pageEncoding="UTF-8"%> + <%=NuitonTrace.getStatisticsCSVAndClear()%> + +Il ne vous reste plus qu'a analyser votre application \ No newline at end of file

1 0

r2187 - trunk/nuiton-profiling/src/main/java/org/nuiton/profiling
by bpoussin＠users.nuiton.org Aug. 24, 2011

Aug. 24, 2011

Author: bpoussin Date: 2011-08-24 18:07:45 +0200 (Wed, 24 Aug 2011) New Revision: 2187 Url: http://nuiton.org/repositories/revision/nuiton-utils/2187 Log: Evolution #1711: Add CSV export format data Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java Modified: trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java =================================================================== --- trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-08-24 15:54:43 UTC (rev 2186) +++ trunk/nuiton-profiling/src/main/java/org/nuiton/profiling/NuitonTrace.java 2011-08-24 16:07:45 UTC (rev 2187) @@ -230,6 +230,39 @@ // le temps reellement passé dans A est representé par les ===== } + /** @return les statistiques in CSV format*/ + static public String getStatisticsCSVAndClear() { + StringBuilder result = new StringBuilder(); + result.append("method;") + .append("call;") + // TIme is in nano not millis, we must divide by 1000000 + .append("min;") + .append("mean;") + .append("max;") + .append("total;") + .append("call_nest;") + .append("total_with_nest\n"); + + for (NuitonTrace trace : instances) { + for (Method method : trace.statistics.keySet()) { + long[] stat = trace.getStatistics(method); + long meanTime = stat[STAT_TIME_TOTAL] / stat[STAT_CALL]; + result.append(method) + .append(";").append(stat[STAT_CALL]) + // Time is in nano not millis, we must divide by 1000000 + .append(";").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_MIN] / 1000000, "s'.'S")) + .append(";").append(DurationFormatUtils.formatDuration(meanTime / 1000000, "s'.'S")) + .append(";").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_MAX] / 1000000, "s'.'S")) + .append(";").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_TOTAL] / 1000000, "s'.'S")) + .append(";").append(stat[STAT_CALL_NEST_METHOD]) + .append(";").append(DurationFormatUtils.formatDuration(stat[STAT_TIME_TOTAL_NEST_METHOD] / 1000000, "s'.'S")) + .append("\n"); + } + } + instances.clear(); + return result.toString(); + } + /** @return les statistiques */ static public String getStatisticsAndClear() { StringBuilder result = new StringBuilder();

1 0

r2186 - trunk
by tchemit＠users.nuiton.org Aug. 24, 2011

Aug. 24, 2011

Author: tchemit Date: 2011-08-24 17:54:43 +0200 (Wed, 24 Aug 2011) New Revision: 2186 Url: http://nuiton.org/repositories/revision/nuiton-utils/2186 Log: optimize poms Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-24 15:53:53 UTC (rev 2185) +++ trunk/pom.xml 2011-08-24 15:54:43 UTC (rev 2186) @@ -72,47 +72,20 @@ <scope>runtime</scope> </dependency> -  - +  <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz-core</artifactId> - <version>${aspectwerkzVersion}</version> -  - <exclusions> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - <exclusion> - <groupId>asm-attrs</groupId> - <artifactId>asm-attrs</artifactId> - </exclusion> - <exclusion> - <groupId>asm-util</groupId> - <artifactId>asm-util</artifactId> - </exclusion> - </exclusions> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>${aspectj.version}</version> </dependency> <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz</artifactId> - <version>${aspectwerkzVersion}</version> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>${aspectj.version}</version> + <scope>runtime</scope> </dependency> - <dependency> - <groupId>aspectwerkz</groupId> - <artifactId>aspectwerkz-jdk5</artifactId> - <version>${aspectwerkzVersion}</version> - </dependency> - - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.3.1</version> - </dependency> - </dependencies> </dependencyManagement> @@ -206,7 +179,7 @@ <projectId>nuiton-utils</projectId> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <aspectwerkzVersion>2.0</aspectwerkzVersion> + <aspectj.version>1.6.11</aspectj.version> <xworkVersion>2.2.3</xworkVersion>

1 0