mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-16 08:38:26 +00:00
intermediate attempt to extract a length parameter
This commit is contained in:
parent
ac01088ec7
commit
6272a94604
3 changed files with 11 additions and 18 deletions
4
Cargo.lock
generated
4
Cargo.lock
generated
|
|
@ -3087,8 +3087,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "rkyv"
|
||||
version = "0.4.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70de01b38fe7baba4ecdd33b777096d2b326993d8ea99bc5b6ede691883d3010"
|
||||
dependencies = [
|
||||
"memoffset",
|
||||
"ptr_meta",
|
||||
|
|
@ -3099,8 +3097,6 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "rkyv_derive"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "95a169f6bc5a81033e86ed39d0f4150e2608160b73d2b93c6e8e6a3efa873f14"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
|
|||
|
|
@ -148,6 +148,9 @@ git="https://github.com/betrusted-io/ring-xous"
|
|||
rev="09207048c393d524a34f63cf65c85a973012a21d" # use the commitref because we're still updating the branch
|
||||
#branch="0.16.20-cleanup"
|
||||
|
||||
[patch.crates-io.rkyv]
|
||||
path = "../rkyv/rkyv"
|
||||
|
||||
######################################################
|
||||
### PATCHES TO DEV/TEST XOUS KERNEL CODE
|
||||
###
|
||||
|
|
|
|||
|
|
@ -407,12 +407,6 @@ use rkyv::{
|
|||
use core::mem::size_of;
|
||||
use core::ops::Deref;
|
||||
|
||||
//--------------------------------
|
||||
|
||||
//--------------------------------
|
||||
|
||||
|
||||
|
||||
#[cfg(feature="perfcounter")]
|
||||
const FILE_ID_SERVICES_PDDB_SRC_MAIN: u32 = 0;
|
||||
#[cfg(feature="perfcounter")]
|
||||
|
|
@ -1503,7 +1497,7 @@ fn wrapped_main() -> ! {
|
|||
// now loop through and pack data into the slice
|
||||
let (header_buf, mut buf) = buf.split_at_mut(size_of::<BulkReadHeader>());
|
||||
enum SerializeResult<'a> {
|
||||
Success(usize, &'a mut [u8], String, &'a mut [u8]),
|
||||
Success(usize, usize, &'a mut [u8], String, &'a mut [u8]),
|
||||
Failure(String)
|
||||
}
|
||||
loop {
|
||||
|
|
@ -1548,8 +1542,8 @@ fn wrapped_main() -> ! {
|
|||
state.read_total += attr.len; // commit the read length early
|
||||
let (prebuf, buf) = buf.split_at_mut(size_of::<u32>()*2);
|
||||
let mut serializer = BufferSerializer::new(buf);
|
||||
match serializer.serialize_value(&rec) {
|
||||
Ok(pos) => SerializeResult::Success(pos, serializer.into_inner(), key_name, prebuf),
|
||||
match serializer.serialize_value_len(&rec) {
|
||||
Ok((pos, len)) => SerializeResult::Success(pos, len, serializer.into_inner(), key_name, prebuf),
|
||||
Err(_) => SerializeResult::Failure(key_name)
|
||||
}
|
||||
}
|
||||
|
|
@ -1571,8 +1565,8 @@ fn wrapped_main() -> ! {
|
|||
};
|
||||
let (prebuf, buf) = buf.split_at_mut(size_of::<u32>()*2);
|
||||
let mut serializer = BufferSerializer::new(buf);
|
||||
match serializer.serialize_value(&rec) {
|
||||
Ok(pos) => SerializeResult::Success(pos, serializer.into_inner(), key_name, prebuf),
|
||||
match serializer.serialize_value_len(&rec) {
|
||||
Ok((pos, len)) => SerializeResult::Success(pos, len, serializer.into_inner(), key_name, prebuf),
|
||||
Err(_) => SerializeResult::Failure(key_name)
|
||||
}
|
||||
}
|
||||
|
|
@ -1587,15 +1581,15 @@ fn wrapped_main() -> ! {
|
|||
// pointer to, to stack the next archived result. The other option would be to use the .write()
|
||||
// method but then we'd need to...make a serializer for the structure. which is agains the whole point of it...
|
||||
match ser_result {
|
||||
SerializeResult::Success(pos, sbuf, _key_name, pre_buf) => {
|
||||
log::info!("packing message of {}({})", sbuf.len(), pos);
|
||||
SerializeResult::Success(pos, len, sbuf, _key_name, pre_buf) => {
|
||||
log::info!("packing message of {}({})", len, pos);
|
||||
// data can fit, copy it into the buffer.
|
||||
state.buf_starting_key_index += 1;
|
||||
header.len += 1;
|
||||
// read length increment was handled when the data was copied into the serialization buffer.
|
||||
pre_buf[..4].copy_from_slice(
|
||||
//&(sbuf.len() as u32).to_le_bytes()
|
||||
&(pos as u32).to_le_bytes()
|
||||
&(len as u32).to_le_bytes()
|
||||
);
|
||||
pre_buf[4..8].copy_from_slice(
|
||||
&(pos as u32).to_le_bytes()
|
||||
|
|
|
|||
Loading…
Reference in a new issue