RTOS/seL4
1
0
Fork 0
forked from Imagelibrary/seL4
Code Pull Requests Activity

benchmark: config opt. name to enable log buffer

Browse Source 
The latest code updates introduced CONFIG_ENABLE_KERNEL_LOG_BUFFER
meanwhile other code and config.cmake keeps using
CONFIG_KERNEL_LOG_BUFFER

Signed-off-by: Nataliya Korovkina <malus.brandywine@gmail.com>
This commit is contained in:
Nataliya Korovkina
2022-03-29 17:41:16 -04:00
committed by Kent McLeod
parent 646bf87cc8
commit 756a37b7d3
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/benchmark/benchmark.h
View File

@@ -18,9 +18,9 @@
exception_t handle_SysBenchmarkFlushCaches(void);
exception_t handle_SysBenchmarkResetLog(void);
exception_t handle_SysBenchmarkFinalizeLog(void);
#ifdef CONFIG_ENABLE_KERNEL_LOG_BUFFER
#ifdef CONFIG_KERNEL_LOG_BUFFER
exception_t handle_SysBenchmarkSetLogBuffer(void);
#endif /* CONFIG_ENABLE_KERNEL_LOG_BUFFER */
#endif /* CONFIG_KERNEL_LOG_BUFFER */
#ifdef CONFIG_BENCHMARK_TRACK_UTILISATION
exception_t handle_SysBenchmarkGetThreadUtilisation(void);
exception_t handle_SysBenchmarkResetThreadUtilisation(void);

4
src/api/syscall.c
View File

@@ -181,10 +181,10 @@ exception_t handleUnknownSyscall(word_t w)
return handle_SysBenchmarkResetLog();
case SysBenchmarkFinalizeLog:
return handle_SysBenchmarkFinalizeLog();
#ifdef CONFIG_ENABLE_KERNEL_LOG_BUFFER
#ifdef CONFIG_KERNEL_LOG_BUFFER
case SysBenchmarkSetLogBuffer:
return handle_SysBenchmarkSetLogBuffer();
#endif /* CONFIG_ENABLE_KERNEL_LOG_BUFFER */
#endif /* CONFIG_KERNEL_LOG_BUFFER */
#ifdef CONFIG_BENCHMARK_TRACK_UTILISATION
case SysBenchmarkGetThreadUtilisation:
return handle_SysBenchmarkGetThreadUtilisation();

12
src/benchmark/benchmark.c
View File

@@ -31,7 +31,7 @@ exception_t handle_SysBenchmarkFlushCaches(void)
exception_t handle_SysBenchmarkResetLog(void)
{
#ifdef CONFIG_ENABLE_KERNEL_LOG_BUFFER
#ifdef CONFIG_KERNEL_LOG_BUFFER
if (ksUserLogBuffer == 0) {
userError("A user-level buffer has to be set before resetting benchmark.\
Use seL4_BenchmarkSetLogBuffer\n");
@@ -40,7 +40,7 @@ exception_t handle_SysBenchmarkResetLog(void)
}
ksLogIndex = 0;
#endif /* CONFIG_ENABLE_KERNEL_LOG_BUFFER */
#endif /* CONFIG_KERNEL_LOG_BUFFER */
#ifdef CONFIG_BENCHMARK_TRACK_UTILISATION
NODE_STATE(benchmark_log_utilisation_enabled) = true;
@@ -60,10 +60,10 @@ exception_t handle_SysBenchmarkResetLog(void)
exception_t handle_SysBenchmarkFinalizeLog(void)
{
#ifdef CONFIG_ENABLE_KERNEL_LOG_BUFFER
#ifdef CONFIG_KERNEL_LOG_BUFFER
ksLogIndexFinalized = ksLogIndex;
setRegister(NODE_STATE(ksCurThread), capRegister, ksLogIndexFinalized);
#endif /* CONFIG_ENABLE_KERNEL_LOG_BUFFER */
#endif /* CONFIG_KERNEL_LOG_BUFFER */
#ifdef CONFIG_BENCHMARK_TRACK_UTILISATION
benchmark_utilisation_finalise();
@@ -72,7 +72,7 @@ exception_t handle_SysBenchmarkFinalizeLog(void)
return EXCEPTION_NONE;
}
#ifdef CONFIG_ENABLE_KERNEL_LOG_BUFFER
#ifdef CONFIG_KERNEL_LOG_BUFFER
exception_t handle_SysBenchmarkSetLogBuffer(void)
{
word_t cptr_userFrame = getRegister(NODE_STATE(ksCurThread), capRegister);
@@ -84,7 +84,7 @@ exception_t handle_SysBenchmarkSetLogBuffer(void)
setRegister(NODE_STATE(ksCurThread), capRegister, seL4_NoError);
return EXCEPTION_NONE;
}
#endif /* CONFIG_ENABLE_KERNEL_LOG_BUFFER */
#endif /* CONFIG_KERNEL_LOG_BUFFER */
#ifdef CONFIG_BENCHMARK_TRACK_UTILISATION