source: mainline/kernel/generic/src/printf/vprintf.c@ b487b956

Last change on this file since b487b956 was 90dd8aee, checked in by Jiří Zárevúcky <zarevucky.jiri@…>, 10 months ago

Introduce a console lock to prevent line splitting in kernel output

It is a common occurrence to see broken lines on screen or in serial
output due to bad timing. This is an attempt to prevent that without
breaking anything.

It could be considered a stopgap solution, since the whole console
stack deserves a better/faster implementation.

  • Property mode set to 100644
File size: 2.6 KB
RevLine 
[e499a30]1/*
[df4ed85]2 * Copyright (c) 2006 Josef Cejka
[e499a30]3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * - Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 * - Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution.
14 * - The name of the author may not be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
18 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28
[174156fd]29/** @addtogroup kernel_generic
[b45c443]30 * @{
31 */
32/** @file
33 */
34
[90dd8aee]35#include <arch/asm.h>
36#include <console/console.h>
[e499a30]37#include <print.h>
38#include <printf/printf_core.h>
39#include <putchar.h>
[90dd8aee]40#include <str.h>
[5b303ba]41#include <synch/spinlock.h>
[d99c1d2]42#include <typedefs.h>
[5b303ba]43
[043eca0]44static int vprintf_str_write(const char *str, size_t size, void *data)
[e499a30]45{
[1b0b48e0]46 size_t offset = 0;
[98000fb]47 size_t chars = 0;
[a35b458]48
[1b0b48e0]49 while (offset < size) {
[28a5ebd]50 putuchar(str_decode(str, &offset, size));
[eec616b]51 chars++;
52 }
[a35b458]53
[eec616b]54 return chars;
[e499a30]55}
56
[28a5ebd]57static int vprintf_wstr_write(const char32_t *str, size_t size, void *data)
[bd1deed]58{
[043eca0]59 size_t offset = 0;
[98000fb]60 size_t chars = 0;
[a35b458]61
[043eca0]62 while (offset < size) {
[28a5ebd]63 putuchar(str[chars]);
[043eca0]64 chars++;
[28a5ebd]65 offset += sizeof(char32_t);
[eec616b]66 }
[a35b458]67
[043eca0]68 return chars;
[eec616b]69}
70
71int puts(const char *str)
72{
[1b0b48e0]73 size_t offset = 0;
[98000fb]74 size_t chars = 0;
[28a5ebd]75 char32_t uc;
[a35b458]76
[90dd8aee]77 console_lock();
78
[043eca0]79 while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) {
[28a5ebd]80 putuchar(uc);
[eec616b]81 chars++;
82 }
[a35b458]83
[28a5ebd]84 putuchar('\n');
[90dd8aee]85
86 console_unlock();
[eec616b]87 return chars;
[bd1deed]88}
89
[e499a30]90int vprintf(const char *fmt, va_list ap)
91{
[eec616b]92 printf_spec_t ps = {
[043eca0]93 vprintf_str_write,
94 vprintf_wstr_write,
[eec616b]95 NULL
96 };
[a35b458]97
[90dd8aee]98 console_lock();
99 int ret = printf_core(fmt, &ps, ap);
100 console_unlock();
101 return ret;
[e499a30]102}
103
[06e1e95]104/** @}
[b45c443]105 */
Note: See TracBrowser for help on using the repository browser.