You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by mo...@apache.org on 2009/06/01 22:51:26 UTC
svn commit: r780864 - in
/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src:
main/java/org/apache/kato/common/ main/java/org/apache/kato/hprof/datalayer/
test/java/test/apache/kato/common/
Author: monteith
Date: Mon Jun 1 22:51:25 2009
New Revision: 780864
URL: http://svn.apache.org/viewvc?rev=780864&view=rev
Log:
Fix problem whereby different subset providers were confusing one another by updating the provider underneath, without the other being aware to the change in location.
Modified:
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/IDataProvider.java
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/SubsetDataProvider.java
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/HProfFile.java
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/RandomAccesDataProvider.java
incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/test/java/test/apache/kato/common/TestSubsetDataProvider.java
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/IDataProvider.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/IDataProvider.java?rev=780864&r1=780863&r2=780864&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/IDataProvider.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/IDataProvider.java Mon Jun 1 22:51:25 2009
@@ -46,4 +46,5 @@
long dataRemaining();
+ boolean moved();
}
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/SubsetDataProvider.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/SubsetDataProvider.java?rev=780864&r1=780863&r2=780864&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/SubsetDataProvider.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/common/SubsetDataProvider.java Mon Jun 1 22:51:25 2009
@@ -121,7 +121,7 @@
}
private void updateLocation() throws IOException {
- if(moved) {
+ if(moved()) {
provider.moveTo(current+startPoint);
moved=false;
}
@@ -140,5 +140,9 @@
return scope-current;
}
+ @Override
+ public boolean moved() {
+ return moved | provider.moved();
+ }
}
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/HProfFile.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/HProfFile.java?rev=780864&r1=780863&r2=780864&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/HProfFile.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/HProfFile.java Mon Jun 1 22:51:25 2009
@@ -1080,7 +1080,24 @@
}
return null;
}
-
+
+ @Override
+ public String toString() {
+ StringBuffer output = new StringBuffer("LightHeapRecord: Tag: 0x");
+ output.append(Long.toHexString(getTag()));
+ output.append(", length:");
+ output.append(getDataLength());
+ output.append(", Data:");
+ for (int i=0; i < getDataLength(); i++) {
+ short val = (short) (((short)readByte(i))&0xff);
+ if (val <= 0xf) {
+ output.append('0');
+ }
+ output.append(Integer.toHexString(val));
+ }
+
+ return output.toString();
+ }
}
class GCPrimitiveArrayHeapDumpRecord extends LightHeapEntryRecord implements IGCPrimitiveArrayHeapDumpRecord {
@@ -1178,15 +1195,26 @@
}
@Override
+ public long getArrayClassObjectID() {
+ return readNumber(idSize + 8, idSize);
+ }
+
+ @Override
public long getElement(int index) {
return readNumber(idSize*2+8 + index * idSize, idSize);
}
+
@Override
- public long getArrayClassObjectID() {
- return readNumber(idSize + 8, idSize);
+ public String toString() {
+ StringBuffer output = new StringBuffer(super.toString());
+ output.append("\nReferences: ");
+ for (int i=0; i < getNumberOfElements(); i++) {
+ output.append("0x").append(Long.toHexString(getElement(i))).append(' ');
+ }
+
+ return output.toString();
}
-
}
/**
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/RandomAccesDataProvider.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/RandomAccesDataProvider.java?rev=780864&r1=780863&r2=780864&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/RandomAccesDataProvider.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/main/java/org/apache/kato/hprof/datalayer/RandomAccesDataProvider.java Mon Jun 1 22:51:25 2009
@@ -158,4 +158,8 @@
return fileLength-current;
}
+ @Override
+ public boolean moved() {
+ return moved;
+ }
}
Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/test/java/test/apache/kato/common/TestSubsetDataProvider.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/test/java/test/apache/kato/common/TestSubsetDataProvider.java?rev=780864&r1=780863&r2=780864&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/test/java/test/apache/kato/common/TestSubsetDataProvider.java (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/kato.hprof.reader/src/test/java/test/apache/kato/common/TestSubsetDataProvider.java Mon Jun 1 22:51:25 2009
@@ -159,6 +159,11 @@
// TODO Auto-generated method stub
return 0;
}
+ @Override
+ public boolean moved() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
}