hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

more benchmark changes from Ryan Gustafson

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4942 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Xavier Le Vourch
2007-01-13 01:37:25 +00:00
parent b381f76941
commit 32f881bb60
3 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pmd/src/net/sourceforge/pmd/AbstractRuleChainVisitor.java
View File

@ -46,7 +46,7 @@ public abstract class AbstractRuleChainVisitor implements RuleChainVisitor {
long start = Benchmark.nanoTime();
indexNodes(astCompilationUnits, ctx);
long end = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_RULE_CHAIN, "RuleChain Visit", end - start, 1);
Benchmark.mark(Benchmark.TYPE_RULE_CHAIN_VISIT, end - start, 1);
// For each rule, allow it to visit the nodes it desires
int visits = 0;

23
pmd/src/net/sourceforge/pmd/PMD.java
View File

@ -86,12 +86,12 @@ public class PMD {
Object rootNode = parser.parse(reader);
ctx.excludeLines(parser.getExcludeMap());
long end = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_PARSER, "Parser", end - start, 0);
Benchmark.mark(Benchmark.TYPE_PARSER, end - start, 0);
Thread.yield();
start = Benchmark.nanoTime();
sourceTypeHandler.getSymbolFacade().start(rootNode);
end = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_SYMBOL_TABLE, "Symbol Table", end - start, 0);
Benchmark.mark(Benchmark.TYPE_SYMBOL_TABLE, end - start, 0);
Language language = SourceTypeToRuleLanguageMapper.getMappedLanguage(sourceType);
@ -99,14 +99,14 @@ public class PMD {
start = Benchmark.nanoTime();
sourceTypeHandler.getDataFlowFacade().start(rootNode);
end = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_DFA, "Data Flow Analysis", end - start, 0);
Benchmark.mark(Benchmark.TYPE_DFA, end - start, 0);
}
if (ruleSets.usesTypeResolution(language)) {
start = Benchmark.nanoTime();
sourceTypeHandler.getTypeResolutionFacade().start(rootNode);
end = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_TYPE_RESOLUTION, "Type Resolution", end - start, 0);
Benchmark.mark(Benchmark.TYPE_TYPE_RESOLUTION, end - start, 0);
}
List acus = new ArrayList();
@ -252,7 +252,7 @@ public class PMD {
files = collectFilesFromOneName(opts.getInputPath(), fileSelector);
}
long endFiles = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_COLLECT_FILES, "Collect Files", endFiles - startFiles, 0);
Benchmark.mark(Benchmark.TYPE_COLLECT_FILES, endFiles - startFiles, 0);
SourceType sourceType;
if (opts.getTargetJDK().equals("1.3")) {
@ -279,14 +279,14 @@ public class PMD {
report.start();
try {
long startLoadRules = Benchmark.nanoTime();
long startLoadRules = Benchmark.nanoTime();
RuleSetFactory ruleSetFactory = new RuleSetFactory();
ruleSetFactory.setMinimumPriority(opts.getMinPriority());
RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());
printRuleNamesInDebug(opts.debugEnabled(), rulesets);
long endLoadRules = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_LOAD_RULES, "Load Rules", endLoadRules - startLoadRules, 0);
long endLoadRules = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);
processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx,
opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),
@ -328,12 +328,12 @@ public class PMD {
}
}
long reportEnd = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_REPORTING, "Reporting", reportEnd - reportStart, 0);
Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);
}
if (opts.benchmark()) {
long end = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_TOTAL, "Total PMD", end - start, 0);
Benchmark.mark(Benchmark.TYPE_TOTAL_PMD, end - start, 0);
System.err.println(Benchmark.report());
}
}
@ -479,6 +479,7 @@ public class PMD {
} catch (InterruptedException e) {
}
long start = Benchmark.nanoTime();
Report mainReport = ctx.getReport();
Iterator i = factory.threadList.iterator();
while (i.hasNext()) {
@ -486,6 +487,8 @@ public class PMD {
Report r = thread.context.getReport();
mainReport.merge(r);
}
long end = Benchmark.nanoTime();
Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);
}
/**

58
pmd/src/net/sourceforge/pmd/util/Benchmark.java
View File

@ -185,15 +185,33 @@ public class Benchmark {
public static final int TYPE_SYMBOL_TABLE = 5;
public static final int TYPE_DFA = 6;
public static final int TYPE_TYPE_RESOLUTION = 7;
public static final int TYPE_RULE_CHAIN = 8;
public static final int TYPE_RULE_CHAIN_VISIT = 8;
public static final int TYPE_REPORTING = 9;
private static final int TYPE_RULE_TOTAL = 10;
private static final int TYPE_RULE_CHAIN_RULE_TOTAL = 11;
private static final int TYPE_MEASURED_TOTAL = 12;
private static final int TYPE_UNMEASURED_TOTAL = 13;
public static final int TYPE_TOTAL = 14;
private static final int TYPE_NON_MEASURED_TOTAL = 13;
public static final int TYPE_TOTAL_PMD = 14;
private static final String[] TYPE_NAMES = {
null,
null,
"Collect Files",
"Load Rules",
"Parser",
"Symbol Table",
"Data Flow Analysis",
"Type Resolution",
"RuleChain Visit",
"Reporting",
"Rule Total",
"RuleChain Rule Total",
"Measured",
"Non-measured",
"Total PMD",
};
private static final class BenchmarkResult implements Comparable {
private static final class BenchmarkResult implements Comparable {
private final int type;
private final String name;
private long time;
@ -240,11 +258,23 @@ public class Benchmark {
//return System.nanoTime();
}
public static void mark(int type, long time, long count) {
mark(type, null, time, count);
}
public synchronized static void mark(int type, String name, long time, long count) {
BenchmarkResult benchmarkResult = (BenchmarkResult)nameToBenchmarkResult.get(name);
String typeName = TYPE_NAMES[type];
if (typeName != null && name != null) {
throw new IllegalArgumentException("Name cannot be given for type: " + type);
} else if (typeName == null && name == null) {
throw new IllegalArgumentException("Name is required for type: " + type);
} else if (typeName == null) {
typeName = name;
}
BenchmarkResult benchmarkResult = (BenchmarkResult)nameToBenchmarkResult.get(typeName);
if (benchmarkResult == null) {
benchmarkResult = new BenchmarkResult(type, name);
nameToBenchmarkResult.put(name, benchmarkResult);
benchmarkResult = new BenchmarkResult(type, typeName);
nameToBenchmarkResult.put(typeName, benchmarkResult);
}
benchmarkResult.update(time, count);
}
@ -256,8 +286,8 @@ public class Benchmark {
public static String report() {
List results = new ArrayList(nameToBenchmarkResult.values());
long totalTime[] = new long[TYPE_TOTAL + 1];
long totalCount[] = new long[TYPE_TOTAL + 1];
long totalTime[] = new long[TYPE_TOTAL_PMD + 1];
long totalCount[] = new long[TYPE_TOTAL_PMD + 1];
for (Iterator i = results.iterator(); i.hasNext();) {
BenchmarkResult benchmarkResult = (BenchmarkResult)i.next();
totalTime[benchmarkResult.getType()] += benchmarkResult.getTime();
@ -266,10 +296,10 @@ public class Benchmark {
totalTime[TYPE_MEASURED_TOTAL] += benchmarkResult.getTime();
}
}
results.add(new BenchmarkResult(TYPE_RULE_TOTAL, "Rule Total", totalTime[TYPE_RULE], 0));
results.add(new BenchmarkResult(TYPE_RULE_CHAIN_RULE_TOTAL, "RuleChain Rule Total", totalTime[TYPE_RULE_CHAIN_RULE], 0));
results.add(new BenchmarkResult(TYPE_MEASURED_TOTAL, "Measured", totalTime[TYPE_MEASURED_TOTAL], 0));
results.add(new BenchmarkResult(TYPE_UNMEASURED_TOTAL, "Non-measured", totalTime[TYPE_TOTAL] - totalTime[TYPE_MEASURED_TOTAL], 0));
results.add(new BenchmarkResult(TYPE_RULE_TOTAL, TYPE_NAMES[TYPE_RULE_TOTAL], totalTime[TYPE_RULE], 0));
results.add(new BenchmarkResult(TYPE_RULE_CHAIN_RULE_TOTAL, TYPE_NAMES[TYPE_RULE_CHAIN_RULE_TOTAL], totalTime[TYPE_RULE_CHAIN_RULE], 0));
results.add(new BenchmarkResult(TYPE_MEASURED_TOTAL, TYPE_NAMES[TYPE_MEASURED_TOTAL], totalTime[TYPE_MEASURED_TOTAL], 0));
results.add(new BenchmarkResult(TYPE_NON_MEASURED_TOTAL, TYPE_NAMES[TYPE_NON_MEASURED_TOTAL], totalTime[TYPE_TOTAL_PMD] - totalTime[TYPE_MEASURED_TOTAL], 0));
Collections.sort(results);
StringBuffer buf = new StringBuffer();
@ -283,7 +313,7 @@ public class Benchmark {
while (buf2.length() <= 50) {
buf2.append(' ');
}
buf2.append(StringUtil.lpad(MessageFormat.format("{0,number,0.00000}", new Object[]{new Double(benchmarkResult.getTime()/1000000000.0)}), 8));
buf2.append(StringUtil.lpad(MessageFormat.format("{0,number,0.000}", new Object[]{new Double(benchmarkResult.getTime()/1000000000.0)}), 8));
if (benchmarkResult.getType() <= TYPE_RULE_CHAIN_RULE) {
buf2.append(StringUtil.lpad(MessageFormat.format("{0,number,###,###,###,###,###}", new Object[]{new Long(benchmarkResult.getCount())}), 20));
}