serverscanning/capnproto-java-rpc
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix more endianness problems

Browse source
This commit is contained in:
David Renshaw 2014-05-11 08:13:52 -04:00
parent d230ea824a
commit 6047cd72c9
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/capnp/InputStreamMessageReader.java
View file

@ -64,10 +64,13 @@ public class InputStreamMessageReader {
ByteBuffer[] segmentSlices = new ByteBuffer[segmentCount]; ByteBuffer[] segmentSlices = new ByteBuffer[segmentCount];
segmentSlices[0] = ByteBuffer.wrap(allSegments, 0, segment0Size); segmentSlices[0] = ByteBuffer.wrap(allSegments, 0, segment0Size);
segmentSlices[0].order(ByteOrder.LITTLE_ENDIAN);
int offset = segment0Size; int offset = segment0Size;
for (int ii = 1; ii < segmentCount; ++ii) { for (int ii = 1; ii < segmentCount; ++ii) {
segmentSlices[ii] = ByteBuffer.wrap(allSegments, offset, moreSizes.get(ii - 1)); segmentSlices[ii] = ByteBuffer.wrap(allSegments, offset, moreSizes.get(ii - 1));
segmentSlices[ii].order(ByteOrder.LITTLE_ENDIAN);
offset += moreSizes.get(ii - 1); offset += moreSizes.get(ii - 1);
} }

1
src/capnp/StructReader.java
View file

@ -66,7 +66,6 @@ public class StructReader {
this.pointers + ptrIndex, this.pointers + ptrIndex,
this.nestingLimit); this.nestingLimit);
} else { } else {
System.out.println("pointer count: " + this.pointerCount);
return new PointerReader(); return new PointerReader();
} }
} }

5
src/capnp/WireHelpers.java
View file

@ -14,7 +14,7 @@ class WireHelpers {
return new StructReader(segment, return new StructReader(segment,
ptr.offset * 8, ptr.offset * 8,
(ptr.offset + dataSizeWords) * 8, (ptr.offset + dataSizeWords),
dataSizeWords * 64, dataSizeWords * 64,
structPtr.ptrCount(), structPtr.ptrCount(),
(byte)0, (byte)0,
@ -44,6 +44,9 @@ class WireHelpers {
// TODO bounds check // TODO bounds check
int size = tag.inlineCompositeListElementCount(); int size = tag.inlineCompositeListElementCount();
System.out.println("size = " + size);
StructPointer structPtr = new StructPointer(tag); StructPointer structPtr = new StructPointer(tag);
int wordsPerElement = structPtr.wordSize(); int wordsPerElement = structPtr.wordSize();