date:20140912

[Bug 56955] Skip some useless information in the class when parsing

2014-09-12 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=56955

--- Comment #6 from Mark Thomas  ---
If you continue to ignore the comments you are given then this issue is going
to get closed as WONTFIX.

Your first patch was 117k and full of irrelevant changes. The second attempt is
worse at 130k.

Starting at the beginning of the patch:
1. The first chunk changes restores an svn keyword the Tomcat team previously
removed. This change has nothing to do with this issue and should not be in
this patch.

2. The second chunk reverts a fix to a constant name the Tomcat team previously
fixed and removes some code necessary for Java 8 support. This change has
nothing to do with this issue and should not be in this patch. Further this
change breaks Java 8 support.

3. The third chunk makes further changes that have nothing to do with this
issue and further breaks Java 8 support.

And so on.

To repeat:
- Patches should be against http://svn.apache.org/viewvc/tomcat/trunk/
- If you'd like to propose changes to back port form there to tc7.0.x/trunk
then provide some revision numbers.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Analysis of apache-tomcat-8.0.12 dependency on JDK-Internal APIs

2014-09-12 Thread Rory O'Donnell Oracle, Dublin Ireland

Hi Mark,

Thanks for the feedback, I will follow up on this.

Rgds,Rory
On 11/09/2014 19:50, Mark Thomas wrote:

On 11/09/2014 14:59, Rory O'Donnell Oracle, Dublin Ireland wrote:

Hi Mladen/Mark,

As part of the preparations for JDK 9, Oracle’s engineers have been
analyzing open source projects like yours to understand usage.
One area of concern involves identifying compatibility problems, such as
reliance on JDK-internal APIs.

Our engineers have already prepared guidance on migrating some of the
more common usage patterns of JDK-internal APIs to supported public
interfaces. The list is on the OpenJDK wiki [0], along with instructions
on how to run the jdeps analysis tool yourself .

We have analyzed jar files within apache-tomcat-8.0.12 and found 0 jar
files depending on JDK-Internal APIs.

However, jdeps is a static analysis tool and therefore use of
JDK-internal APIs via reflection or dynamically generated bytecode are
not reported by the tool, while such a dependency should also be replaced.

If you have any feedback please reply either on this list or to me
directly.

We do make use JDK-Internal APIs but we always do it via reflection as
it is nearly always vendor specific.

The protection against JRE triggered memory leaks is a source of a lot
of internal API usage:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?view=annotate

It would be great of there were public APIs we could use instead or
better still if the various memory leaks could be fixed.

Other than that, I can't think of any off-hand. Use the internal API is
something we try to avoid if at all possible.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Early Access builds for JDK 9 b29 and JDK 8u40 b05 are available on java.net

2014-09-12 Thread Rory O'Donnell Oracle, Dublin Ireland


Hi Mladen/Mark,

Early Access build for JDK 9 b29   is 
available on java.net, summary of changes are listed here 



Early Access build for JDK 8u40 b05  
is available on java.net, summary of changes are listed here. 



Rgds,Rory

--
Rgds,Rory O'Donnell
Quality Engineering Manager
Oracle EMEA , Dublin, Ireland

[Bug 56953] A improvement for "DataInputStream"

2014-09-12 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=56953

--- Comment #5 from Mark Thomas  ---
If you continue to ignore the comments you are given then this issue is going
to get closed as WONTFIX.

Your first patch was 86k and full of irrelevant changes. The second attempt is
worse at 107k.

Starting at the beginning of the patch:
1. The first chunk changes restores an svn keyword the Tomcat team previously
removed. This change has nothing to do with this issue and should not be in
this patch.

2. The second chunk reverts a fix to a constant name the Tomcat team previously
fixed and removes some code necessary for Java 8 support. This change has
nothing to do with this issue and should not be in this patch. Further this
change breaks Java 8 support.

3. The third chunk makes further changes that have nothing to do with this
issue and further breaks Java 8 support.

And so on.

I have no problem with reviewing a patch that completely replaces
DataInputStream because of final methods. It is all the other irrelevant,
breaking changes in the patch that are the problem.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1624474 - in /tomcat/trunk/test/org/apache/tomcat/util/bcel: ./ TesterPerformance.java

2014-09-12 Thread markt

Author: markt
Date: Fri Sep 12 08:12:53 2014
New Revision: 1624474

URL: http://svn.apache.org/r1624474
Log:
Add a performance test. Useful for judging the benefit (or not) of proposed 
BCEL changes.

Added:
tomcat/trunk/test/org/apache/tomcat/util/bcel/
tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java   
(with props)

Added: tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java?rev=1624474&view=auto
==
--- tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java Fri 
Sep 12 08:12:53 2014
@@ -0,0 +1,70 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.tomcat.util.bcel;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import org.junit.Test;
+
+import org.apache.tomcat.util.bcel.classfile.ClassParser;
+import org.apache.tomcat.util.scan.Jar;
+import org.apache.tomcat.util.scan.JarFactory;
+
+public class TesterPerformance {
+
+private static final String JAR_LOCATION = "/tmp/jira-libs";
+
+@Test
+public void testClassParserPerformance() throws IOException {
+File libDir = new File(JAR_LOCATION);
+String[] libs = libDir.list();
+
+Set jarURLs = new HashSet<>();
+
+for (String lib : libs) {
+if (!lib.toLowerCase(Locale.ENGLISH).endsWith(".jar")) {
+continue;
+}
+jarURLs.add(new URL("jar:" + new File (libDir, 
lib).toURI().toURL().toExternalForm() + "!/"));
+}
+
+long start = System.nanoTime();
+
+for (URL jarURL : jarURLs) {
+Jar jar = JarFactory.newInstance(jarURL);
+jar.nextEntry();
+String jarEntryName = jar.getEntryName();
+while (jarEntryName != null) {
+if (jarEntryName.endsWith(".class")) {
+ClassParser cp = new 
ClassParser(jar.getEntryInputStream(), jarEntryName);
+cp.parse();
+}
+jar.nextEntry();
+jarEntryName = jar.getEntryName();
+}
+}
+
+long duration = System.nanoTime() - start;
+
+System.out.println("ClassParser performance test took: " + duration + 
"ns");
+}
+}

Propchange: tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
--
svn:eol-style = native



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 56940] Cache mechanism for "ConstantUtf8.java" doesn't have any benefit

2014-09-12 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=56940

Mark Thomas  changed:

   What|Removed |Added

 OS||All

--- Comment #4 from Mark Thomas  ---
The caching has been removed in 8.0.x after testing showed a performance
improvement of between 10-15%.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1624476 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java

2014-09-12 Thread markt

Author: markt
Date: Fri Sep 12 08:30:39 2014
New Revision: 1624476

URL: http://svn.apache.org/r1624476
Log:
Remove the cache. Generally, it makes performance worse not better. Testing 
with the jars that ship with Jira, performance was improved by around 10-15% by 
removing the cache.
Based on a suggestion by hzhang9

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java?rev=1624476&r1=1624475&r2=1624476&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantUtf8.java 
Fri Sep 12 08:30:39 2014
@@ -18,9 +18,6 @@ package org.apache.tomcat.util.bcel.clas
 
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 import org.apache.tomcat.util.bcel.Constants;
 
@@ -37,39 +34,9 @@ public final class ConstantUtf8 extends 
 private static final long serialVersionUID = 8119001312020421976L;
 private final String bytes;
 
-private static final int MAX_CACHE_ENTRIES = 2;
-private static final int INITIAL_CACHE_CAPACITY = 
(int)(MAX_CACHE_ENTRIES/0.75);
-private static HashMap cache;
-
-private static synchronized ConstantUtf8 getCachedInstance(String s) {
-if (s.length() > 200) {
-return  new ConstantUtf8(s);
-}
-if (cache == null)  {
-cache = new LinkedHashMap(INITIAL_CACHE_CAPACITY, 0.75f, true) {
-private static final long serialVersionUID = 1L;
-
-@Override
-protected boolean removeEldestEntry(Map.Entry eldest) {
- return size() > MAX_CACHE_ENTRIES;
-}
-};
-}
-ConstantUtf8 result = cache.get(s);
-if (result != null) {
-return result;
-}
-result = new ConstantUtf8(s);
-cache.put(s, result);
-return result;
-}
-
-private static ConstantUtf8 getInstance(String s) {
-return getCachedInstance(s);
-}
 
 static ConstantUtf8 getInstance(DataInputStream file) throws IOException {
-return getInstance(file.readUTF());
+return new ConstantUtf8(file.readUTF());
 }
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Use 'length' when swallowing attributes in BCEL

2014-09-12 Thread Konstantin Kolinko

Hi!

Reviewing BCEL method Utility.swallowUnknownAttribute(...),  I think
the same approach can be used for all other attributes that we ignore,
ignoring their internal structure.

That is: we know length of their data. In Attribute.readAttribute():

// Length of data in bytes
length = file.readInt();

I have yet to verify this with specification, but it looks promising.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 56955] Skip some useless information in the class when parsing

2014-09-12 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=56955

--- Comment #7 from hzha...@ebay.com ---
Sorry for any inconvenience. I am now reviewing my code.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 56974] New: jdbc-pool validation query defaultAutoCommit status

2014-09-12 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=56974

Bug ID: 56974
   Summary: jdbc-pool validation query defaultAutoCommit status
   Product: Tomcat Modules
   Version: unspecified
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: jdbc-pool
  Assignee: dev@tomcat.apache.org
  Reporter: denuwanthi.hasanth...@gmail.com

I would like to know wether the validation query made by jdbc pool is done in
defaultAutoCommit=true mode.
Because, it seems like after the validation query, it is not committed. So,
when we try to do some other operation we get an error : "Cannot change
transaction isolation level in the middle of a transaction"
Thus, we have to forcefully commit the validation query, by making
defaultAutoCommit=true in our datasource configuration.
Any insight on this is much appreciated.

Thanks,
Denuwanthi.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Use 'length' when swallowing attributes in BCEL

2014-09-12 Thread Mark Thomas

On 12/09/2014 09:36, Konstantin Kolinko wrote:
> Hi!
> 
> Reviewing BCEL method Utility.swallowUnknownAttribute(...),  I think
> the same approach can be used for all other attributes that we ignore,
> ignoring their internal structure.
> 
> That is: we know length of their data. In Attribute.readAttribute():
> 
> // Length of data in bytes
> length = file.readInt();
> 
> I have yet to verify this with specification, but it looks promising.

I did a quick test using the newly added performance test and the Jira
jars. It certainly works - no errors are reported - but there is no
noticeable performance improvement. What it does do is remove a large
chunk of code so, if your specification check confirms this is OK, I am
+1 purely based on the simplification benefits.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Use 'length' when swallowing attributes in BCEL

2014-09-12 Thread Mark Thomas

On 12/09/2014 10:08, Mark Thomas wrote:
> On 12/09/2014 09:36, Konstantin Kolinko wrote:
>> Hi!
>>
>> Reviewing BCEL method Utility.swallowUnknownAttribute(...),  I think
>> the same approach can be used for all other attributes that we ignore,
>> ignoring their internal structure.
>>
>> That is: we know length of their data. In Attribute.readAttribute():
>>
>> // Length of data in bytes
>> length = file.readInt();
>>
>> I have yet to verify this with specification, but it looks promising.
> 
> I did a quick test using the newly added performance test and the Jira
> jars. It certainly works - no errors are reported - but there is no
> noticeable performance improvement. What it does do is remove a large
> chunk of code so, if your specification check confirms this is OK, I am
> +1 purely based on the simplification benefits.

I've tweaked the performance test to focus timing info on the BCEL part
of the code after some profiling showed a lot of time was being spent
reading the class files from the JAR. There is a performance improvement
here (5-10%) so if this change is spec compliant there is an even
stronger reason for doing it.

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1624483 - /tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java

2014-09-12 Thread markt

Author: markt
Date: Fri Sep 12 09:22:36 2014
New Revision: 1624483

URL: http://svn.apache.org/r1624483
Log:
Focus timing on BCEL parts of code.

Modified:
tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java

Modified: tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java?rev=1624483&r1=1624482&r2=1624483&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/bcel/TesterPerformance.java Fri 
Sep 12 09:22:36 2014
@@ -18,6 +18,7 @@ package org.apache.tomcat.util.bcel;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.HashSet;
 import java.util.Locale;
@@ -47,7 +48,7 @@ public class TesterPerformance {
 jarURLs.add(new URL("jar:" + new File (libDir, 
lib).toURI().toURL().toExternalForm() + "!/"));
 }
 
-long start = System.nanoTime();
+long duration = 0;
 
 for (URL jarURL : jarURLs) {
 Jar jar = JarFactory.newInstance(jarURL);
@@ -55,16 +56,17 @@ public class TesterPerformance {
 String jarEntryName = jar.getEntryName();
 while (jarEntryName != null) {
 if (jarEntryName.endsWith(".class")) {
-ClassParser cp = new 
ClassParser(jar.getEntryInputStream(), jarEntryName);
+InputStream is = jar.getEntryInputStream();
+long start = System.nanoTime();
+ClassParser cp = new ClassParser(is, jarEntryName);
 cp.parse();
+duration += System.nanoTime() - start;
 }
 jar.nextEntry();
 jarEntryName = jar.getEntryName();
 }
 }
 
-long duration = System.nanoTime() - start;
-
 System.out.println("ClassParser performance test took: " + duration + 
"ns");
 }
 }



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Use 'length' when swallowing attributes in BCEL

2014-09-12 Thread Konstantin Kolinko

2014-09-12 13:20 GMT+04:00 Mark Thomas :
> On 12/09/2014 10:08, Mark Thomas wrote:
>> On 12/09/2014 09:36, Konstantin Kolinko wrote:
>>> Hi!
>>>
>>> Reviewing BCEL method Utility.swallowUnknownAttribute(...),  I think
>>> the same approach can be used for all other attributes that we ignore,
>>> ignoring their internal structure.
>>>
>>> That is: we know length of their data. In Attribute.readAttribute():
>>>
>>> // Length of data in bytes
>>> length = file.readInt();
>>>
>>> I have yet to verify this with specification, but it looks promising.
>>
>> I did a quick test using the newly added performance test and the Jira
>> jars. It certainly works - no errors are reported - but there is no
>> noticeable performance improvement. What it does do is remove a large
>> chunk of code so, if your specification check confirms this is OK, I am
>> +1 purely based on the simplification benefits.
>
> I've tweaked the performance test to focus timing info on the BCEL part
> of the code after some profiling showed a lot of time was being spent
> reading the class files from the JAR. There is a performance improvement
> here (5-10%) so if this change is spec compliant there is an even
> stronger reason for doing it.

Yes, it is compliant.

The Java Virtual Machine Specification, Java SE 7 Edition
Chapter 4.7 Attributes
http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7

The structure is
[[[
attribute_info {
u2 attribute_name_index;
u4 attribute_length;
u1 info[attribute_length];
}
]]]



For reference, JLS/JVM specifications page:
http://docs.oracle.com/javase/specs/

PDF version of the spec may be easier to work with.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1624486 - in /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile: Attribute.java ClassParser.java Utility.java

2014-09-12 Thread markt

Author: markt
Date: Fri Sep 12 09:34:25 2014
New Revision: 1624486

URL: http://svn.apache.org/r1624486
Log:
Simplify attribute skipping. Based on an idea by kkolinko.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java?rev=1624486&r1=1624485&r2=1624486&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Attribute.java Fri 
Sep 12 09:34:25 2014
@@ -100,7 +100,7 @@ public abstract class Attribute implemen
 Utility.swallowSourceFile(file);
 return null;
 case Constants.ATTR_CODE:
-Utility.swallowCode(file, constant_pool);
+Utility.swallowCode(file);
 return null;
 case Constants.ATTR_EXCEPTIONS:
 Utility.swallowExceptionTable(file);

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java?rev=1624486&r1=1624485&r2=1624486&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java 
Fri Sep 12 09:34:25 2014
@@ -175,7 +175,7 @@ public final class ClassParser {
 private void readFields() throws IOException, ClassFormatException {
 int fields_count = file.readUnsignedShort();
 for (int i = 0; i < fields_count; i++) {
-Utility.swallowFieldOrMethod(file, constant_pool);
+Utility.swallowFieldOrMethod(file);
 }
 }
 
@@ -218,7 +218,7 @@ public final class ClassParser {
 int methods_count;
 methods_count = file.readUnsignedShort();
 for (int i = 0; i < methods_count; i++) {
-Utility.swallowFieldOrMethod(file, constant_pool);
+Utility.swallowFieldOrMethod(file);
 }
 }
 

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1624486&r1=1624485&r2=1624486&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Fri 
Sep 12 09:34:25 2014
@@ -211,7 +211,7 @@ final class Utility {
 skipFully(file, 2);
 }
 
-static void swallowCode(DataInputStream file, ConstantPool constant_pool) 
throws IOException {
+static void swallowCode(DataInputStream file) throws IOException {
 // file.readUnsignedShort(); // Unused max_stack
 // file.readUnsignedShort(); // Unused max_locals
 skipFully(file, 4);
@@ -227,7 +227,7 @@ final class Utility {
  */
 int attributes_count = file.readUnsignedShort();
 for (int i = 0; i < attributes_count; i++) {
-swallowAttribute(file, constant_pool);
+swallowAttribute(file);
 }
 }
 
@@ -382,7 +382,7 @@ final class Utility {
 }
 }
 
-static void swallowFieldOrMethod(DataInputStream file, ConstantPool 
constant_pool)
+static void swallowFieldOrMethod(DataInputStream file)
 throws IOException {
 // file.readUnsignedShort(); // Unused access flags
 // file.readUnsignedShort(); // name index
@@ -391,98 +391,17 @@ final class Utility {
 
 int attributes_count = file.readUnsignedShort();
 for (int i = 0; i < attributes_count; i++) {
-swallowAttribute(file, constant_pool);
+swallowAttribute(file);
 }
 }
 
-static void swallowAttribute(DataInputStream file, ConstantPool 
constant_pool)
+static void swallowAttribute(DataInputStream file)
 throws IOException {
-byte tag = Constants.ATTR_UNKNOWN;  // Unknown attribute
-// Get class name from constant pool via `name_index' indirection
-int name_index = file.readUnsignedShort();
-ConstantUtf8 c =
-(ConstantUtf8) constant_pool.getConstant(name_index, 
Constants.CONSTANT_Utf8);
-String name = c.getBytes();
+//file.readUnsignedShort();   // Unused name index
+skipFully(file, 2);
 // Length of data in bytes
 int length = file.readInt();
-// Compare strings to find known attr

svn commit: r1624487 - /tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java

2014-09-12 Thread markt

Author: markt
Date: Fri Sep 12 09:36:57 2014
New Revision: 1624487

URL: http://svn.apache.org/r1624487
Log:
Don't use DataInputStream where we don't have to

Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1624487&r1=1624486&r2=1624487&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Fri 
Sep 12 09:36:57 2014
@@ -211,7 +211,7 @@ final class Utility {
 skipFully(file, 2);
 }
 
-static void swallowCode(DataInputStream file) throws IOException {
+static void swallowCode(DataInput file) throws IOException {
 // file.readUnsignedShort(); // Unused max_stack
 // file.readUnsignedShort(); // Unused max_locals
 skipFully(file, 4);
@@ -382,7 +382,7 @@ final class Utility {
 }
 }
 
-static void swallowFieldOrMethod(DataInputStream file)
+static void swallowFieldOrMethod(DataInput file)
 throws IOException {
 // file.readUnsignedShort(); // Unused access flags
 // file.readUnsignedShort(); // name index
@@ -395,7 +395,7 @@ final class Utility {
 }
 }
 
-static void swallowAttribute(DataInputStream file)
+static void swallowAttribute(DataInput file)
 throws IOException {
 //file.readUnsignedShort();   // Unused name index
 skipFully(file, 2);



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 56953] A improvement for "DataInputStream"

2014-09-12 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=56953

--- Comment #6 from Konstantin Kolinko  ---
The point of java.io.BufferedInputStream() is that is.read() were fast enough.
I do not see much benefit in re-implementing standard JRE classes.

By the way, is.read() is a blocking method. If you were to use fill() or
is.read(chars[]) there is no guarantee of how many bytes they can actually read
in a single call.

That is why DataInput.readFully() method is there.

-- 
You are receiving this mail because:
You are the assignee for the bug.

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

1 2 >

1 - 100 of 108 matches

Mail list logo