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

Merge "kata-logger: use a larger ipc buffer"

Browse Source 
GitOrigin-RevId: 2801cc0bbdf62bd9e468e0e14d04f8bf740e72ee
This commit is contained in:
Sam Leffler
2021-09-03 18:01:00 +00:00
parent 3b609285ad
commit a3bd1a6026
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/system/CMakeLists.txt
View File

@@ -16,6 +16,7 @@ project(system)
CAmkESAddImportPath(interfaces) CAmkESAddImportPath(interfaces)
includeGlobalComponents()
include(${CMAKE_CURRENT_LIST_DIR}/rust.cmake) include(${CMAKE_CURRENT_LIST_DIR}/rust.cmake)
RustAddLibrary( RustAddLibrary(

6
apps/system/components/DebugConsole/kata-logger/src/lib.rs
View File

@@ -3,7 +3,9 @@
use cstr_core::CStr; use cstr_core::CStr;
use log::{Metadata, Record}; use log::{Metadata, Record};
const MAX_MSG_LEN: usize = 256; // TODO(sleffler): until we can copy directly into shared memory limit
// stack allocation (can be up to 4096).
const MAX_MSG_LEN: usize = 2048;
pub struct KataLogger; pub struct KataLogger;
@@ -128,7 +130,7 @@ mod tests {
// NB: to run these sequentially use --test-threads=1; otherwise // NB: to run these sequentially use --test-threads=1; otherwise
// cargo will use multiple threads and you will get failures from // cargo will use multiple threads and you will get failures from
// multiple users of MSGS and the global logger; e.g. // multiple users of MSGS and the global logger; e.g.
// cargo +nightly test -- --test-threads=1 // cargo test -- --test-threads=1
#[test] #[test]
fn test_each_log_level_works() { fn test_each_log_level_works() {

11
apps/system/system.camkes
View File

@@ -11,6 +11,7 @@
*/ */
import <std_connector.camkes>; import <std_connector.camkes>;
import <global-connectors.camkes>;
import "interfaces/dataport_io.idl4"; import "interfaces/dataport_io.idl4";
import "interfaces/VectorCoreInterface.camkes"; import "interfaces/VectorCoreInterface.camkes";
@@ -81,10 +82,12 @@ assembly {
from debug_console.uart_rx, to uart_driver.rx); from debug_console.uart_rx, to uart_driver.rx);
// Connect the LoggerInterface to each component that needs to log // Connect the LoggerInterface to each component that needs to log
// to the console. // to the console. Note this allocates a 4KB shared memory region to
connection seL4RPCCall LoggerInterface(from process_manager.logger, // each component and copies data between components.
from ml_coordinator.logger, connection seL4RPCOverMultiSharedData LoggerInterface(
to debug_console.logger); from process_manager.logger,
from ml_coordinator.logger,
to debug_console.logger);
// Connect the SeL4Debug interface of each component that needs access. // Connect the SeL4Debug interface of each component that needs access.
connection seL4RPCCall SeL4DebugInterface(from debug_console.sel4debug, connection seL4RPCCall SeL4DebugInterface(from debug_console.sel4debug,