Author: sebb
Date: Thu Sep 24 02:00:56 2009
New Revision: 818343
URL: http://svn.apache.org/viewvc?rev=818343&view=rev
Log:
Enclose log parameter calculations in if (log.isDebugEnabled()) block
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
Thu Sep 24 02:00:56 2009
@@ -87,14 +87,16 @@
// create parser
Tidy tidy = null;
try {
- log.debug("HTMLAssertions.getResult(): Setup tidy ...");
- log.debug("doctype: " + getDoctype());
- log.debug("errors only: " + isErrorsOnly());
- log.debug("error threshold: " + getErrorThreshold());
- log.debug("warning threshold: " + getWarningThreshold());
- log.debug("html mode: " + isHTML());
- log.debug("xhtml mode: " + isXHTML());
- log.debug("xml mode: " + isXML());
+ if (log.isDebugEnabled()){
+ log.debug("HTMLAssertions.getResult(): Setup tidy ...");
+ log.debug("doctype: " + getDoctype());
+ log.debug("errors only: " + isErrorsOnly());
+ log.debug("error threshold: " + getErrorThreshold());
+ log.debug("warning threshold: " + getWarningThreshold());
+ log.debug("html mode: " + isHTML());
+ log.debug("xhtml mode: " + isXHTML());
+ log.debug("xml mode: " + isXML());
+ }
tidy = new Tidy();
tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8);
tidy.setQuiet(false);
@@ -106,13 +108,13 @@
} else if (isXML()) {
tidy.setXmlTags(true);
}
- log.debug("err file: " + getFilename());
tidy.setErrfile(getFilename());
if (log.isDebugEnabled()) {
+ log.debug("err file: " + getFilename());
log.debug("getParser : tidy parser created - " + tidy);
+ log.debug("HTMLAssertions.getResult(): Tidy instance
created!");
}
- log.debug("HTMLAssertions.getResult(): Tidy instance created!");
} catch (Exception e) {//TODO replace with proper Exception
log.error("Unable to instantiate tidy parser", e);
@@ -137,10 +139,10 @@
Node node = tidy.parse(new
ByteArrayInputStream(inResponse.getResponseData()), os);
if (log.isDebugEnabled()) {
log.debug("node : " + node);
+ log.debug("End : parse");
+ log.debug("HTMLAssertions.getResult(): parsing with tidy
done!");
+ log.debug("Output: " + os.toString());
}
- log.debug("End : parse");
- log.debug("HTMLAssertions.getResult(): parsing with tidy done!");
- log.debug("Output: " + os.toString());
// write output to file
writeOutput(errbuf.toString());
@@ -148,8 +150,10 @@
// evaluate result
if ((tidy.getParseErrors() > getErrorThreshold())
|| (!isErrorsOnly() && (tidy.getParseWarnings() >
getWarningThreshold()))) {
- log.debug("HTMLAssertions.getResult(): errors/warnings
detected:");
- log.debug(errbuf.toString());
+ if (log.isDebugEnabled()) {
+ log.debug("HTMLAssertions.getResult(): errors/warnings
detected:");
+ log.debug(errbuf.toString());
+ }
result.setFailure(true);
result.setFailureMessage(MessageFormat.format("Tidy Parser
errors: " + tidy.getParseErrors()
+ " (allowed " + getErrorThreshold() + ") " + "Tidy
Parser warnings: "
@@ -197,7 +201,9 @@
// flush
lOutputWriter.flush();
- log.debug("writeOutput() -> output successfully written to
file " + lFilename);
+ if (log.isDebugEnabled()) {
+ log.debug("writeOutput() -> output successfully written to
file " + lFilename);
+ }
} catch (IOException ex) {
log.warn("writeOutput() -> could not write output to file " +
lFilename, ex);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
Thu Sep 24 02:00:56 2009
@@ -154,15 +154,19 @@
}
if (nodeList == null || nodeList.getLength() == 0) {
- log.debug(new StringBuffer("nodeList null no match
").append(pathString).toString());
+ if (log.isDebugEnabled()) {
+ log.debug(new StringBuffer("nodeList null no match
").append(pathString).toString());
+ }
result.setFailure(!isNegated());
result.setFailureMessage("No Nodes Matched " + pathString);
return result;
}
- log.debug("nodeList length " + nodeList.getLength());
- if (log.isDebugEnabled() & !isNegated()) {
- for (int i = 0; i < nodeList.getLength(); i++){
- log.debug(new StringBuffer("nodeList[").append(i).append("]
").append(nodeList.item(i)).toString());
+ if (log.isDebugEnabled()) {
+ log.debug("nodeList length " + nodeList.getLength());
+ if (!isNegated()) {
+ for (int i = 0; i < nodeList.getLength(); i++){
+ log.debug(new
StringBuffer("nodeList[").append(i).append("]
").append(nodeList.item(i)).toString());
+ }
}
}
result.setFailure(isNegated());
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Thu Sep 24 02:00:56 2009
@@ -261,14 +261,18 @@
private String generateResult(MatchResult match) {
StringBuffer result = new StringBuffer();
for (int a = 0; a < template.length; a++) {
- log.debug("RegexExtractor: Template piece #" + a + " = " +
template[a]);
+ if (log.isDebugEnabled()) {
+ log.debug("RegexExtractor: Template piece #" + a + " = " +
template[a]);
+ }
if (template[a] instanceof String) {
result.append(template[a]);
} else {
result.append(match.group(((Integer) template[a]).intValue()));
}
}
- log.debug("Regex Extractor result = " + result.toString());
+ if (log.isDebugEnabled()) {
+ log.debug("Regex Extractor result = " + result.toString());
+ }
return result.toString();
}
@@ -284,12 +288,16 @@
Pattern templatePattern =
JMeterUtils.getPatternCache().getPattern("\\$(\\d+)\\$" // $NON-NLS-1$
, Perl5Compiler.READ_ONLY_MASK
& Perl5Compiler.SINGLELINE_MASK);
- log.debug("Pattern = " + templatePattern);
- log.debug("template = " + rawTemplate);
+ if (log.isDebugEnabled()) {
+ log.debug("Pattern = " + templatePattern);
+ log.debug("template = " + rawTemplate);
+ }
Util.split(pieces, matcher, templatePattern, rawTemplate);
PatternMatcherInput input = new PatternMatcherInput(rawTemplate);
boolean startsWith = isFirstElementGroup(rawTemplate);
- log.debug("template split into " + pieces.size() + " pieces, starts
with = " + startsWith);
+ if (log.isDebugEnabled()) {
+ log.debug("template split into " + pieces.size() + " pieces,
starts with = " + startsWith);
+ }
if (startsWith) {
pieces.remove(0);// Remove initial empty entry
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
Thu Sep 24 02:00:56 2009
@@ -122,10 +122,14 @@
log.debug("making threadlists from gui");
for (int col = 1; col < tableModel.getColumnCount(); col++) {
threadLists.addItem(tableModel.getColumnData(getUserColName(col)));
- log.debug("Adding column to threadlist: " +
tableModel.getColumnData(getUserColName(col)));
- log.debug("Threadlists now = " + threadLists);
+ if (log.isDebugEnabled()) {
+ log.debug("Adding column to threadlist: " +
tableModel.getColumnData(getUserColName(col)));
+ log.debug("Threadlists now = " + threadLists);
+ }
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("In the end, threadlists = " + threadLists);
}
- log.debug("In the end, threadlists = " + threadLists);
userParams.setThreadLists(threadLists);
userParams.setPerIteration(perIterationCheck.isSelected());
super.configureTestElement(params);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
Thu Sep 24 02:00:56 2009
@@ -218,7 +218,9 @@
g.setColor(JMeterColor.YELLOW);
}
g.drawLine(x % width, height - data, x % width, height - data - 1);
- log.debug("Drawing coords = " + (x % width) + "," + (height -
data));
+ if (log.isDebugEnabled()) {
+ log.debug("Drawing coords = " + (x % width) + "," + (height -
data));
+ }
}
if (wantAverage) {
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumModel.java
Thu Sep 24 02:00:56 2009
@@ -102,7 +102,9 @@
* @return the Max value
*/
public long getMax() {
- log.debug("getMax1 : Returning - " + max);
+ if (log.isDebugEnabled()) {
+ log.debug("getMax1 : Returning - " + max);
+ }
return max;
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphAccumVisualizer.java
Thu Sep 24 02:00:56 2009
@@ -137,8 +137,6 @@
@Override
public String toString() {
String toString = "Show the samples analysys as dot plots";
-
- log.debug("toString1 : Returning - " + toString);
return toString;
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SearchTextExtension.java
Thu Sep 24 02:00:56 2009
@@ -138,7 +138,9 @@
lastPosition = LAST_POSITION_DEFAULT;
}
- log.debug("lastPosition=" + lastPosition);
+ if (log.isDebugEnabled()) {
+ log.debug("lastPosition=" + lastPosition);
+ }
Matcher matcher = null;
try {
Pattern pattern = createPattern(textToFind);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
Thu Sep 24 02:00:56 2009
@@ -133,8 +133,10 @@
long endTime = System.currentTimeMillis();
long elapsedTime = endTime - startTime;
- log.debug("New Spline curve interpolated in ");
- log.debug(elapsedTime + " ms");
+ if (log.isDebugEnabled()) {
+ log.debug("New Spline curve interpolated in ");
+ log.debug(elapsedTime + " ms");
+ }
}
} catch (Exception e) {
log.error("Error when interpolating : ", e);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=818343&r1=818342&r2=818343&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Thu Sep 24 02:00:56 2009
@@ -339,11 +339,9 @@
if (log.isDebugEnabled()) {
log.debug("valueChanged1 : sample result - " + res);
+ log.debug("valueChanged1 : load time - " +
res.getTime());
}
- // load time label
-
- log.debug("valueChanged1 : load time - " + res.getTime());
String sd = res.getSamplerData();
if (sd != null) {
String rh = res.getRequestHeaders();
@@ -372,8 +370,9 @@
statsBuff = new StringBuffer(); //reset for reuse
String responseCode = res.getResponseCode();
- log.debug("valueChanged1 : response code - " +
responseCode);
-
+ if (log.isDebugEnabled()) {
+ log.debug("valueChanged1 : response code - " +
responseCode);
+ }
int responseLevel = 0;
if (responseCode != null) {
try {
@@ -403,7 +402,9 @@
// response message label
String responseMsgStr = res.getResponseMessage();
- log.debug("valueChanged1 : response message - " +
responseMsgStr);
+ if (log.isDebugEnabled()) {
+ log.debug("valueChanged1 : response message - " +
responseMsgStr);
+ }
statsBuff.append(JMeterUtils.getResString("view_results_response_message")).append(responseMsgStr).append(NL);
//$NON-NLS-1$
statsBuff.append(NL);
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
