github/sparrow-kata-full
1
0
Fork 0
mirror of https://github.com/AmbiML/sparrow-kata-full.git synced 2025-09-10 09:48:48 +00:00
Code Issues Projects Releases Wiki Activity

StorageManager: clippy findings

Browse Source 
Change-Id: If4b16efb9c333f82631f9b1a13be3890d1560e39
GitOrigin-RevId: c4eba8d744f0cf29e0cac6ce697e49ee3e29a577
This commit is contained in:
Sam Leffler
2022-05-13 14:46:47 +00:00
parent 558a199151
commit 588fb66af6
2 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
apps/system/components/StorageManager/kata-storage-component/src/run.rs
View File

@@ -2,6 +2,7 @@
// Code here binds the camkes component to the rust code. // Code here binds the camkes component to the rust code.
#![no_std] #![no_std]
#![allow(clippy::missing_safety_doc)]
extern crate alloc; extern crate alloc;
use core::slice; use core::slice;
@@ -15,7 +16,7 @@ use kata_storage_manager::KATA_STORAGE;
use log::trace; use log::trace;
#[no_mangle] #[no_mangle]
pub extern "C" fn pre_init() { pub unsafe extern "C" fn pre_init() {
static KATA_LOGGER: KataLogger = KataLogger; static KATA_LOGGER: KataLogger = KataLogger;
log::set_logger(&KATA_LOGGER).unwrap(); log::set_logger(&KATA_LOGGER).unwrap();
// NB: set to max; the LoggerInterface will filter // NB: set to max; the LoggerInterface will filter
@@ -23,56 +24,50 @@ pub extern "C" fn pre_init() {
// TODO(sleffler): temp until we integrate with seL4 // TODO(sleffler): temp until we integrate with seL4
static mut HEAP_MEMORY: [u8; 8 * 1024] = [0; 8 * 1024]; static mut HEAP_MEMORY: [u8; 8 * 1024] = [0; 8 * 1024];
unsafe { allocator::ALLOCATOR.init(HEAP_MEMORY.as_mut_ptr() as usize, HEAP_MEMORY.len());
allocator::ALLOCATOR.init(HEAP_MEMORY.as_mut_ptr() as usize, HEAP_MEMORY.len()); trace!(
trace!( "setup heap: start_addr {:p} size {}",
"setup heap: start_addr {:p} size {}", HEAP_MEMORY.as_ptr(),
HEAP_MEMORY.as_ptr(), HEAP_MEMORY.len()
HEAP_MEMORY.len() );
);
}
} }
// StorageInterface glue stubs. // StorageInterface glue stubs.
#[no_mangle] #[no_mangle]
pub extern "C" fn storage_read( pub unsafe extern "C" fn storage_read(
c_key: *const cstr_core::c_char, c_key: *const cstr_core::c_char,
c_raw_value: *mut KeyValueData, c_raw_value: *mut KeyValueData,
) -> StorageManagerError { ) -> StorageManagerError {
unsafe { match CStr::from_ptr(c_key).to_str() {
match CStr::from_ptr(c_key).to_str() { Ok(key) => {
Ok(key) => { // TODO(sleffler): de-badge reply cap to get bundle_id
// TODO(sleffler): de-badge reply cap to get bundle_id match KATA_STORAGE.read("fubar", key) {
match KATA_STORAGE.read("fubar", key) { Ok(value) => {
Ok(value) => { // NB: no serialization, returns raw data
// NB: no serialization, returns raw data (*c_raw_value).copy_from_slice(&value);
(*c_raw_value).copy_from_slice(&value); StorageManagerError::SmeSuccess
StorageManagerError::SmeSuccess
}
Err(e) => StorageManagerError::from(e),
} }
Err(e) => StorageManagerError::from(e),
} }
Err(_) => StorageManagerError::SmeKeyInvalid,
} }
Err(_) => StorageManagerError::SmeKeyInvalid,
} }
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn storage_write( pub unsafe extern "C" fn storage_write(
c_key: *const cstr_core::c_char, c_key: *const cstr_core::c_char,
c_raw_value_len: usize, c_raw_value_len: usize,
c_raw_value: *const u8, c_raw_value: *const u8,
) -> StorageManagerError { ) -> StorageManagerError {
match unsafe { CStr::from_ptr(c_key).to_str() } { match CStr::from_ptr(c_key).to_str() {
Ok(key) => { Ok(key) => {
// TODO(sleffler): de-badge reply cap to get bundle_id // TODO(sleffler): de-badge reply cap to get bundle_id
unsafe { KATA_STORAGE.write(
KATA_STORAGE.write( "fubar",
"fubar", key,
key, slice::from_raw_parts(c_raw_value, c_raw_value_len),
slice::from_raw_parts(c_raw_value, c_raw_value_len), )
)
}
.into() .into()
} }
Err(_) => StorageManagerError::SmeKeyInvalid, Err(_) => StorageManagerError::SmeKeyInvalid,
@@ -80,11 +75,13 @@ pub extern "C" fn storage_write(
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn storage_delete(c_key: *const cstr_core::c_char) -> StorageManagerError { pub unsafe extern "C" fn storage_delete(
match unsafe { CStr::from_ptr(c_key).to_str() } { c_key: *const cstr_core::c_char
) -> StorageManagerError {
match CStr::from_ptr(c_key).to_str() {
Ok(key) => { Ok(key) => {
// TODO(sleffler): de-badge reply cap to get bundle_id // TODO(sleffler): de-badge reply cap to get bundle_id
unsafe { KATA_STORAGE.delete("fubar", key) }.into() KATA_STORAGE.delete("fubar", key).into()
} }
Err(_) => StorageManagerError::SmeKeyInvalid, Err(_) => StorageManagerError::SmeKeyInvalid,
} }

5
apps/system/components/StorageManager/kata-storage-interface/src/lib.rs
View File

@@ -4,7 +4,6 @@
use core::str; use core::str;
use cstr_core::CString; use cstr_core::CString;
use postcard;
// TODO(sleffler): temp constraint on value part of key-value pairs // TODO(sleffler): temp constraint on value part of key-value pairs
pub const KEY_VALUE_DATA_SIZE: usize = 100; pub const KEY_VALUE_DATA_SIZE: usize = 100;
@@ -77,8 +76,8 @@ impl From<StorageError> for StorageManagerError {
impl From<Result<(), StorageError>> for StorageManagerError { impl From<Result<(), StorageError>> for StorageManagerError {
fn from(result: Result<(), StorageError>) -> StorageManagerError { fn from(result: Result<(), StorageError>) -> StorageManagerError {
result.map_or_else( result.map_or_else(
|e| StorageManagerError::from(e), StorageManagerError::from,
|_v| StorageManagerError::SmeSuccess, |_| StorageManagerError::SmeSuccess,
) )
} }
} }