mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-17 08:40:52 +00:00
rkyv-test-server: buffer: add from_memory_message_mut()
This enables passing data back to the caller by modifying the original message `offset` field. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
cf1fc44f7e
commit
461f5c5f8d
1 changed files with 38 additions and 7 deletions
|
|
@ -11,6 +11,7 @@ pub struct Buffer<'a> {
|
||||||
offset: Option<MemoryAddress>,
|
offset: Option<MemoryAddress>,
|
||||||
slice: &'a mut [u8],
|
slice: &'a mut [u8],
|
||||||
should_drop: bool,
|
should_drop: bool,
|
||||||
|
memory_message: Option<&'a mut MemoryMessage>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct XousDeserializer;
|
pub struct XousDeserializer;
|
||||||
|
|
@ -54,6 +55,7 @@ impl<'a> Buffer<'a> {
|
||||||
valid,
|
valid,
|
||||||
offset: None,
|
offset: None,
|
||||||
should_drop: true,
|
should_drop: true,
|
||||||
|
memory_message: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -65,6 +67,19 @@ impl<'a> Buffer<'a> {
|
||||||
valid: mem.buf,
|
valid: mem.buf,
|
||||||
offset: mem.offset,
|
offset: mem.offset,
|
||||||
should_drop: false,
|
should_drop: false,
|
||||||
|
memory_message: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub unsafe fn from_memory_message_mut(mem: &'a mut MemoryMessage) -> Self {
|
||||||
|
Buffer {
|
||||||
|
range: mem.buf,
|
||||||
|
slice: core::slice::from_raw_parts_mut(mem.buf.as_mut_ptr(), mem.buf.len()),
|
||||||
|
valid: mem.buf,
|
||||||
|
offset: mem.offset,
|
||||||
|
should_drop: false,
|
||||||
|
memory_message: Some(mem),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -127,15 +142,31 @@ impl<'a> Buffer<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub fn serialize_from<S>(self, src: S) -> core::result::Result<Self, ()>
|
pub fn serialize_from<S>(&mut self, src: S) -> core::result::Result<(), &'static str>
|
||||||
where
|
where
|
||||||
S: rkyv::Serialize<rkyv::ser::serializers::BufferSerializer<Buffer<'a>>>,
|
S: rkyv::Serialize<rkyv::ser::serializers::BufferSerializer<&'a mut [u8]>>,
|
||||||
{
|
{
|
||||||
let mut ser = rkyv::ser::serializers::BufferSerializer::new(self);
|
// We must have a `memory_message` to update in order for this to work.
|
||||||
let pos = ser.serialize_value(&src).or(Err(()))?;
|
// Otherwise, we risk having the pointer go to somewhere invalid.
|
||||||
let mut buf = ser.into_inner();
|
if self.memory_message.is_none() {
|
||||||
buf.offset = MemoryAddress::new(pos);
|
// Create this message using `from_memory_message_mut()` instead of
|
||||||
Ok(buf)
|
// `from_memory_message()`.
|
||||||
|
Err("couldn't serialize because buffer wasn't mutable")?;
|
||||||
|
}
|
||||||
|
// Unsafe Warning: Create a copy of the backing slice to hand to the deserializer.
|
||||||
|
// This is required because the deserializer consumes the buffer and returns it
|
||||||
|
// later as part of `.into_inner()`.
|
||||||
|
// The "correct" way to do this would be to implement `rkyv::Serializer` an `rkyv::Fallible`
|
||||||
|
// for ourselves.
|
||||||
|
let copied_slice =
|
||||||
|
unsafe { core::slice::from_raw_parts_mut(self.slice.as_mut_ptr(), self.slice.len()) };
|
||||||
|
let mut ser = rkyv::ser::serializers::BufferSerializer::new(copied_slice);
|
||||||
|
let pos = ser.serialize_value(&src).or(Err("couldn't serialize"))?;
|
||||||
|
self.offset = MemoryAddress::new(pos);
|
||||||
|
if let Some(ref mut msg) = self.memory_message.as_mut() {
|
||||||
|
msg.offset = MemoryAddress::new(pos);
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue