From 88ffc3f461d078d6731114fc47c7496af74b7311 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Sat, 15 Nov 2025 21:22:36 -0500 Subject: kern: os: Add trace function for kernel logs Signed-off-by: Ian Moffett --- sys/inc/os/trace.h | 37 ++++++++++++++++++++++++++++++++++++ sys/kern/Makefile | 1 + sys/os/os_trace.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 sys/inc/os/trace.h create mode 100644 sys/os/os_trace.c (limited to 'sys') diff --git a/sys/inc/os/trace.h b/sys/inc/os/trace.h new file mode 100644 index 0000000..97b4817 --- /dev/null +++ b/sys/inc/os/trace.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _OS_TRACE_H_ +#define _OS_TRACE_H_ 1 + +#include + +void trace(const char *fmt, ...); + +#endif /* !_OS_TRACE_H_ */ diff --git a/sys/kern/Makefile b/sys/kern/Makefile index c5cc820..6252f1f 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -3,6 +3,7 @@ override PROMPT := printf "%s\t\t%s\n" CFILES = $(shell find . -name "*.c") CFILES += $(shell find ../lib -name "*.c") +CFILES += $(shell find ../os -name "*.c") OFILES = $(CFILES:.c=.o) CC = SYS_CFLAGS = diff --git a/sys/os/os_trace.c b/sys/os/os_trace.c new file mode 100644 index 0000000..f8c989d --- /dev/null +++ b/sys/os/os_trace.c @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include +#include +#include + +static void +trace_write(const char *s) +{ + serial_write(s, strlen(s)); +} + +void +trace(const char *fmt, ...) +{ + char buf[256]; + va_list ap; + + if (fmt == NULL) { + fmt = "(null)\n"; + } + + va_start(ap, fmt); + vsnprintf(buf, sizeof(buf), fmt, ap); + va_end(ap); + trace_write(buf); +} -- cgit v1.2.3