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

getWritableStructPointer

Browse source
This commit is contained in:
David Renshaw 2014-06-05 18:25:29 -04:00
parent bbd0333077
commit d1e938130f
4 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compiler/src/main/cpp/capnpc-java.c++
View file

@ -929,7 +929,8 @@ private:
spaces(indent), " }\n",
spaces(indent), " public final ", type, ".Builder get", titleCase, "() {\n",
spaces(indent), " return ", type,
".Builder.factory.fromStructBuilder(_builder.getPointerField(", offset, ").getStruct());\n",
".Builder.factory.fromStructBuilder(_builder.getPointerField(", offset, ").getStruct(",
type, ".STRUCT_SIZE", "));\n",
spaces(indent), " }\n",
spaces(indent), " public final void set", titleCase, "(", type, ".Reader value) {\n",
unionDiscrim.set,

2
compiler/src/test/scala/org/capnproto/TestUtil.scala
View file

@ -56,7 +56,7 @@ object TestUtil {
//assert(builder.getTextField().toString() == "foo");
{
// val subBuilder = builder.getStructField();
val subBuilder = builder.getStructField();
}
}

5
runtime/src/main/java/org/capnproto/PointerBuilder.java
View file

@ -17,9 +17,8 @@ public final class PointerBuilder {
return this.segment.buffer.getLong(this.pointer) == 0;
}
public final StructBuilder getStruct() {
throw new Error();
// return WireHelpers.getWritableStructPointer();
public final StructBuilder getStruct(StructSize size) {
return WireHelpers.getWritableStructPointer(this.pointer, this.segment, size);
}
public final StructBuilder initStruct(StructSize size) {

21
runtime/src/main/java/org/capnproto/WireHelpers.java
View file

@ -37,7 +37,28 @@ final class WireHelpers {
public static StructBuilder getWritableStructPointer(int refOffset,
SegmentBuilder segment,
StructSize size) {
long ref = WirePointer.get(segment.buffer, refOffset);
int target = WirePointer.target(refOffset, ref);
if (WirePointer.isNull(ref)) {
return initStructPointer(refOffset, segment, size);
}
long oldRef = ref;
SegmentBuilder oldSegment = segment;
// TODO follow fars.
int oldPtrOffset = target;
short oldDataSize = StructPointer.dataSize(WirePointer.structPointer(oldRef));
short oldPointerCount = StructPointer.ptrCount(WirePointer.structPointer(oldRef));
int oldPointerSectionOffset = oldPtrOffset + oldDataSize;
if (oldDataSize < size.data || oldPointerCount < size.pointers) {
throw new Error("unimplemented");
} else {
return new StructBuilder(oldSegment, oldPtrOffset * 8,
oldPointerSectionOffset, oldDataSize * 64,
oldPointerCount, (byte)0);
}
}
public static ListBuilder initListPointer(int refOffset,