WebSVN – HelenOS – Diff – /branches/dd/kernel/generic/src/console/console.c


/*
 * Copyright (c) 2003 Josef Cejka
 * Copyright (c) 2005 Jakub Jermar
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * - Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 * - 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.
 * - The name of the author may not be used to endorse or promote products
 *   derived from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
 */
 
/** @addtogroup genericconsole
 * @{
 */
/** @file
 */
 
#include <console/console.h>
#include <console/chardev.h>
#include <sysinfo/sysinfo.h>
#include <synch/waitq.h>
#include <synch/spinlock.h>
#include <arch/types.h>
#include <ddi/irq.h>
#include <ddi/ddi.h>
#include <event/event.h>
#include <ipc/irq.h>
#include <arch.h>
#include <func.h>
#include <print.h>
#include <putchar.h>
#include <atomic.h>
#include <syscall/copy.h>
#include <errno.h>
 
#define KLOG_SIZE     PAGE_SIZE
#define KLOG_LATENCY  8
 
/** Kernel log cyclic buffer */
static wchar_t klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE)));
 
/** Kernel log initialized */
static bool klog_inited = false;
/** First kernel log characters */
static index_t klog_start = 0;
/** Number of valid kernel log characters */
static size_t klog_len = 0;
/** Number of stored (not printed) kernel log characters */
static size_t klog_stored = 0;
/** Number of stored kernel log characters for uspace */
static size_t klog_uspace = 0;
 
/** Silence output */
bool silent = false;
 
/** Kernel log spinlock */
SPINLOCK_INITIALIZE(klog_lock);
 
/** Physical memory area used for klog buffer */
static parea_t klog_parea;
 
/** Standard input and output character devices */
indev_t *stdin = NULL;
outdev_t *stdout = NULL;
 
/** Initialize kernel logging facility
 *
 * The shared area contains kernel cyclic buffer. Userspace application may
 * be notified on new data with indication of position and size
 * of the data within the circular buffer.
 *
 */
void klog_init(void)
{
    void *faddr = (void *) KA2PA(klog);
   
    ASSERT((uintptr_t) faddr % FRAME_SIZE == 0);
    ASSERT(KLOG_SIZE % FRAME_SIZE == 0);
   
    klog_parea.pbase = (uintptr_t) faddr;
    klog_parea.frames = SIZE2FRAMES(sizeof(klog));
    ddi_parea_register(&klog_parea);
   
    sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
    sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(sizeof(klog)));
 
 
 
 
 
 
   
    spinlock_lock(&klog_lock);
    klog_inited = true;
    spinlock_unlock(&klog_lock);
}
 
void grab_console(void)
{
    silent = false;
    arch_grab_console();
}
 
void release_console(void)
{
    silent = true;
    arch_release_console();
}
 
/** Tell kernel to get keyboard/console access again */
unative_t sys_debug_enable_console(void)
{
#ifdef CONFIG_KCONSOLE
    grab_console();
    return true;
#else
    return false;
#endif
}
 
/** Tell kernel to relinquish keyboard/console access */
unative_t sys_debug_disable_console(void)
{
    release_console();
    return true;
}
 
bool check_poll(indev_t *indev)
{
    if (indev == NULL)
        return false;
   
    if (indev->op == NULL)
        return false;
   
    return (indev->op->poll != NULL);
}
 
/** Get character from input character device. Do not echo character.
 *
 * @param indev Input character device.
 * @return Character read.
 *
 */
uint8_t _getc(indev_t *indev)
{
    if (atomic_get(&haltstate)) {
        /* If we are here, we are hopefully on the processor that
         * issued the 'halt' command, so proceed to read the character
         * directly from input
         */
        if (check_poll(indev))
            return indev->op->poll(indev);
       
        /* No other way of interacting with user */
        interrupts_disable();
       
        if (CPU)
            printf("cpu%u: ", CPU->id);
        else
            printf("cpu: ");
        printf("halted (no polling input)\n");
        cpu_halt();
    }
   
    waitq_sleep(&indev->wq);
    ipl_t ipl = interrupts_disable();
    spinlock_lock(&indev->lock);
    uint8_t ch = indev->buffer[(indev->index - indev->counter) % INDEV_BUFLEN];
    indev->counter--;
    spinlock_unlock(&indev->lock);
    interrupts_restore(ipl);
   
    return ch;
}
 
/** Get string from input character device.
 *
 * Read characters from input character device until first occurrence
 * of newline character.
 *
 * @param indev  Input character device.
 * @param buf    Buffer where to store string terminated by '\0'.
 * @param buflen Size of the buffer.
 *
 * @return Number of characters read.
 *
 */
count_t gets(indev_t *indev, char *buf, size_t buflen)
{
    index_t index = 0;
   
    while (index < buflen) {
        char ch = _getc(indev);
        if (ch == '\b') {
            if (index > 0) {
                index--;
                /* Space backspace, space */
                putchar('\b');
                putchar(' ');
                putchar('\b');
            }
            continue;
        }
        putchar(ch);
       
        if (ch == '\n') { /* end of string => write 0, return */
            buf[index] = '\0';
            return (count_t) index;
        }
        buf[index++] = ch;
    }
   
    return (count_t) index;
}
 
/** Get character from input device & echo it to screen */
uint8_t getc(indev_t *indev)
{
    uint8_t ch = _getc(indev);
    putchar(ch);
    return ch;
}
 
void klog_update(void)
{
    spinlock_lock(&klog_lock);
   
    if ((klog_inited) && (event_is_subscribed(EVENT_KLOG)) && (klog_uspace > 0)) {
        event_notify_3(EVENT_KLOG, klog_start, klog_len, klog_uspace);
        klog_uspace = 0;
    }
   
    spinlock_unlock(&klog_lock);
}
 
void putchar(const wchar_t ch)
{
    spinlock_lock(&klog_lock);
   
    if ((klog_stored > 0) && (stdout) && (stdout->op->write)) {
        /* Print charaters stored in kernel log */
        index_t i;
        for (i = klog_len - klog_stored; i < klog_len; i++)
            stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE], silent);
        klog_stored = 0;
    }
   
    /* Store character in the cyclic kernel log */
    klog[(klog_start + klog_len) % KLOG_SIZE] = ch;
    if (klog_len < KLOG_SIZE)
        klog_len++;
    else
        klog_start = (klog_start + 1) % KLOG_SIZE;
   
    if ((stdout) && (stdout->op->write))
        stdout->op->write(stdout, ch, silent);
    else {
        /* The character is just in the kernel log */
        if (klog_stored < klog_len)
            klog_stored++;
    }
   
    /* The character is stored for uspace */
    if (klog_uspace < klog_len)
        klog_uspace++;
   
    /* Check notify uspace to update */
    bool update;
    if ((klog_uspace > KLOG_LATENCY) || (ch == '\n'))
        update = true;
    else
        update = false;
   
    spinlock_unlock(&klog_lock);
   
    if (update)
        klog_update();
}
 
/** Print using kernel facility
 *
 * Print to kernel log.
 *
 */
unative_t sys_klog(int fd, const void * buf, size_t count)
{
    char *data;
    int rc;
   
    if (count > PAGE_SIZE)
        return ELIMIT;
   
    if (count > 0) {
        data = (char *) malloc(count + 1, 0);
        if (!data)
            return ENOMEM;
       
        rc = copy_from_uspace(data, buf, count);
        if (rc) {
            free(data);
            return rc;
        }
        data[count] = 0;
       
        printf("%s", data);
        free(data);
    } else
        klog_update();
   
    return count;
}
 
/** @}
 */
 

Rev 4156	Rev 4201
1	/*	1	/*
2	* Copyright (c) 2003 Josef Cejka	2	* Copyright (c) 2003 Josef Cejka
3	* Copyright (c) 2005 Jakub Jermar	3	* Copyright (c) 2005 Jakub Jermar
4	* All rights reserved.	4	* All rights reserved.
5	*	5	*
6	* Redistribution and use in source and binary forms, with or without	6	* Redistribution and use in source and binary forms, with or without
7	* modification, are permitted provided that the following conditions	7	* modification, are permitted provided that the following conditions
8	* are met:	8	* are met:
9	*	9	*
10	* - Redistributions of source code must retain the above copyright	10	* - Redistributions of source code must retain the above copyright
11	* notice, this list of conditions and the following disclaimer.	11	* notice, this list of conditions and the following disclaimer.
12	* - Redistributions in binary form must reproduce the above copyright	12	* - Redistributions in binary form must reproduce the above copyright
13	* notice, this list of conditions and the following disclaimer in the	13	* notice, this list of conditions and the following disclaimer in the
14	* documentation and/or other materials provided with the distribution.	14	* documentation and/or other materials provided with the distribution.
15	* - The name of the author may not be used to endorse or promote products	15	* - The name of the author may not be used to endorse or promote products
16	* derived from this software without specific prior written permission.	16	* derived from this software without specific prior written permission.
17	*	17	*
18	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR	18	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
19	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES	19	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.	20	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,	21	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT	22	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,	23	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY	24	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	25	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF	26	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	27	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	*/	28	*/
29		29
30	/** @addtogroup genericconsole	30	/** @addtogroup genericconsole
31	* @{	31	* @{
32	*/	32	*/
33	/** @file	33	/** @file
34	*/	34	*/
35		35
36	#include <console/console.h>	36	#include <console/console.h>
37	#include <console/chardev.h>	37	#include <console/chardev.h>
38	#include <sysinfo/sysinfo.h>	38	#include <sysinfo/sysinfo.h>
39	#include <synch/waitq.h>	39	#include <synch/waitq.h>
40	#include <synch/spinlock.h>	40	#include <synch/spinlock.h>
41	#include <arch/types.h>	41	#include <arch/types.h>
42	#include <ddi/irq.h>	42	#include <ddi/irq.h>
43	#include <ddi/ddi.h>	43	#include <ddi/ddi.h>
-		44	#include <event/event.h>
44	#include <ipc/irq.h>	45	#include <ipc/irq.h>
45	#include <arch.h>	46	#include <arch.h>
46	#include <func.h>	47	#include <func.h>
47	#include <print.h>	48	#include <print.h>
-		49	#include <putchar.h>
48	#include <atomic.h>	50	#include <atomic.h>
49	#include <syscall/copy.h>	51	#include <syscall/copy.h>
50	#include <errno.h>	52	#include <errno.h>
51		53
52	#define KLOG_SIZE PAGE_SIZE	54	#define KLOG_SIZE PAGE_SIZE
53	#define KLOG_LATENCY 8	55	#define KLOG_LATENCY 8
54		56
55	/** Kernel log cyclic buffer */	57	/** Kernel log cyclic buffer */
56	static char klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE)));	58	static wchar_t klog[KLOG_SIZE] __attribute__ ((aligned (PAGE_SIZE)));
57		59
58	/** Kernel log initialized */	60	/** Kernel log initialized */
59	static bool klog_inited = false;	61	static bool klog_inited = false;
60	/** First kernel log characters */	62	/** First kernel log characters */
61	static index_t klog_start = 0;	63	static index_t klog_start = 0;
62	/** Number of valid kernel log characters */	64	/** Number of valid kernel log characters */
63	static size_t klog_len = 0;	65	static size_t klog_len = 0;
64	/** Number of stored (not printed) kernel log characters */	66	/** Number of stored (not printed) kernel log characters */
65	static size_t klog_stored = 0;	67	static size_t klog_stored = 0;
66	/** Number of stored kernel log characters for uspace */	68	/** Number of stored kernel log characters for uspace */
67	static size_t klog_uspace = 0;	69	static size_t klog_uspace = 0;
68		70
69	/** Silence output */	71	/** Silence output */
70	bool silent = false;	72	bool silent = false;
71		73
72	/** Kernel log spinlock */	74	/** Kernel log spinlock */
73	SPINLOCK_INITIALIZE(klog_lock);	75	SPINLOCK_INITIALIZE(klog_lock);
74		76
75	/** Physical memory area used for klog buffer */	77	/** Physical memory area used for klog buffer */
76	static parea_t klog_parea;	78	static parea_t klog_parea;
77		79
78	/** Standard input and output character devices */	80	/** Standard input and output character devices */
79	indev_t *stdin = NULL;	81	indev_t *stdin = NULL;
80	outdev_t *stdout = NULL;	82	outdev_t *stdout = NULL;
81		83
82	/** Initialize kernel logging facility	84	/** Initialize kernel logging facility
83	*	85	*
84	* The shared area contains kernel cyclic buffer. Userspace application may	86	* The shared area contains kernel cyclic buffer. Userspace application may
85	* be notified on new data with indication of position and size	87	* be notified on new data with indication of position and size
86	* of the data within the circular buffer.	88	* of the data within the circular buffer.
87	*	89	*
88	*/	90	*/
89	void klog_init(void)	91	void klog_init(void)
90	{	92	{
91	void faddr = (void ) KA2PA(klog);	93	void faddr = (void ) KA2PA(klog);
92		94
93	ASSERT((uintptr_t) faddr % FRAME_SIZE == 0);	95	ASSERT((uintptr_t) faddr % FRAME_SIZE == 0);
94	ASSERT(KLOG_SIZE % FRAME_SIZE == 0);	96	ASSERT(KLOG_SIZE % FRAME_SIZE == 0);
95		97
96	klog_parea.pbase = (uintptr_t) faddr;	98	klog_parea.pbase = (uintptr_t) faddr;
97	klog_parea.frames = SIZE2FRAMES(KLOG_SIZE);	99	klog_parea.frames = SIZE2FRAMES(sizeof(klog));
98	ddi_parea_register(&klog_parea);	100	ddi_parea_register(&klog_parea);
99		101
100	sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);	102	sysinfo_set_item_val("klog.faddr", NULL, (unative_t) faddr);
101	sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(KLOG_SIZE));	103	sysinfo_set_item_val("klog.pages", NULL, SIZE2FRAMES(sizeof(klog)));
102		-
103	//irq_initialize(&klog_irq);	-
104	//klog_irq.devno = devno;	-
105	//klog_irq.inr = KLOG_VIRT_INR;	-
106	//klog_irq.claim = klog_claim;	-
107	//irq_register(&klog_irq);	-
108		104
109	spinlock_lock(&klog_lock);	105	spinlock_lock(&klog_lock);
110	klog_inited = true;	106	klog_inited = true;
111	spinlock_unlock(&klog_lock);	107	spinlock_unlock(&klog_lock);
112	}	108	}
113		109
114	void grab_console(void)	110	void grab_console(void)
115	{	111	{
116	silent = false;	112	silent = false;
117	arch_grab_console();	113	arch_grab_console();
118	}	114	}
119		115
120	void release_console(void)	116	void release_console(void)
121	{	117	{
122	silent = true;	118	silent = true;
123	arch_release_console();	119	arch_release_console();
124	}	120	}
125		121
126	/** Tell kernel to get keyboard/console access again */	122	/** Tell kernel to get keyboard/console access again */
127	unative_t sys_debug_enable_console(void)	123	unative_t sys_debug_enable_console(void)
128	{	124	{
129	#ifdef CONFIG_KCONSOLE	125	#ifdef CONFIG_KCONSOLE
130	grab_console();	126	grab_console();
131	return true;	127	return true;
132	#else	128	#else
133	return false;	129	return false;
134	#endif	130	#endif
135	}	131	}
136		132
137	/** Tell kernel to relinquish keyboard/console access */	133	/** Tell kernel to relinquish keyboard/console access */
138	unative_t sys_debug_disable_console(void)	134	unative_t sys_debug_disable_console(void)
139	{	135	{
140	release_console();	136	release_console();
141	return true;	137	return true;
142	}	138	}
143		139
144	bool check_poll(indev_t *indev)	140	bool check_poll(indev_t *indev)
145	{	141	{
146	if (indev == NULL)	142	if (indev == NULL)
147	return false;	143	return false;
148		144
149	if (indev->op == NULL)	145	if (indev->op == NULL)
150	return false;	146	return false;
151		147
152	return (indev->op->poll != NULL);	148	return (indev->op->poll != NULL);
153	}	149	}
154		150
155	/** Get character from input character device. Do not echo character.	151	/** Get character from input character device. Do not echo character.
156	*	152	*
157	* @param indev Input character device.	153	* @param indev Input character device.
158	* @return Character read.	154	* @return Character read.
159	*	155	*
160	*/	156	*/
161	uint8_t _getc(indev_t *indev)	157	uint8_t _getc(indev_t *indev)
162	{	158	{
163	if (atomic_get(&haltstate)) {	159	if (atomic_get(&haltstate)) {
164	/* If we are here, we are hopefully on the processor that	160	/* If we are here, we are hopefully on the processor that
165	* issued the 'halt' command, so proceed to read the character	161	* issued the 'halt' command, so proceed to read the character
166	* directly from input	162	* directly from input
167	*/	163	*/
168	if (check_poll(indev))	164	if (check_poll(indev))
169	return indev->op->poll(indev);	165	return indev->op->poll(indev);
170		166
171	/* No other way of interacting with user */	167	/* No other way of interacting with user */
172	interrupts_disable();	168	interrupts_disable();
173		169
174	if (CPU)	170	if (CPU)
175	printf("cpu%u: ", CPU->id);	171	printf("cpu%u: ", CPU->id);
176	else	172	else
177	printf("cpu: ");	173	printf("cpu: ");
178	printf("halted (no polling input)\n");	174	printf("halted (no polling input)\n");
179	cpu_halt();	175	cpu_halt();
180	}	176	}
181		177
182	waitq_sleep(&indev->wq);	178	waitq_sleep(&indev->wq);
183	ipl_t ipl = interrupts_disable();	179	ipl_t ipl = interrupts_disable();
184	spinlock_lock(&indev->lock);	180	spinlock_lock(&indev->lock);
185	uint8_t ch = indev->buffer[(indev->index - indev->counter) % INDEV_BUFLEN];	181	uint8_t ch = indev->buffer[(indev->index - indev->counter) % INDEV_BUFLEN];
186	indev->counter--;	182	indev->counter--;
187	spinlock_unlock(&indev->lock);	183	spinlock_unlock(&indev->lock);
188	interrupts_restore(ipl);	184	interrupts_restore(ipl);
189		185
190	return ch;	186	return ch;
191	}	187	}
192		188
193	/** Get string from input character device.	189	/** Get string from input character device.
194	*	190	*
195	* Read characters from input character device until first occurrence	191	* Read characters from input character device until first occurrence
196	* of newline character.	192	* of newline character.
197	*	193	*
198	* @param indev Input character device.	194	* @param indev Input character device.
199	* @param buf Buffer where to store string terminated by '\0'.	195	* @param buf Buffer where to store string terminated by '\0'.
200	* @param buflen Size of the buffer.	196	* @param buflen Size of the buffer.
201	*	197	*
202	* @return Number of characters read.	198	* @return Number of characters read.
203	*	199	*
204	*/	200	*/
205	count_t gets(indev_t indev, char buf, size_t buflen)	201	count_t gets(indev_t indev, char buf, size_t buflen)
206	{	202	{
207	index_t index = 0;	203	index_t index = 0;
208		204
209	while (index < buflen) {	205	while (index < buflen) {
210	char ch = _getc(indev);	206	char ch = _getc(indev);
211	if (ch == '\b') {	207	if (ch == '\b') {
212	if (index > 0) {	208	if (index > 0) {
213	index--;	209	index--;
214	/* Space backspace, space */	210	/* Space backspace, space */
215	putchar('\b');	211	putchar('\b');
216	putchar(' ');	212	putchar(' ');
217	putchar('\b');	213	putchar('\b');
218	}	214	}
219	continue;	215	continue;
220	}	216	}
221	putchar(ch);	217	putchar(ch);
222		218
223	if (ch == '\n') { /* end of string => write 0, return */	219	if (ch == '\n') { /* end of string => write 0, return */
224	buf[index] = '\0';	220	buf[index] = '\0';
225	return (count_t) index;	221	return (count_t) index;
226	}	222	}
227	buf[index++] = ch;	223	buf[index++] = ch;
228	}	224	}
229		225
230	return (count_t) index;	226	return (count_t) index;
231	}	227	}
232		228
233	/** Get character from input device & echo it to screen */	229	/** Get character from input device & echo it to screen */
234	uint8_t getc(indev_t *indev)	230	uint8_t getc(indev_t *indev)
235	{	231	{
236	uint8_t ch = _getc(indev);	232	uint8_t ch = _getc(indev);
237	putchar(ch);	233	putchar(ch);
238	return ch;	234	return ch;
239	}	235	}
240		236
241	void klog_update(void)	237	void klog_update(void)
242	{	238	{
243	spinlock_lock(&klog_lock);	239	spinlock_lock(&klog_lock);
244		240
245	// if ((klog_inited) && (klog_irq.notif_cfg.notify) && (klog_uspace > 0)) {	241	if ((klog_inited) && (event_is_subscribed(EVENT_KLOG)) && (klog_uspace > 0)) {
246	// ipc_irq_send_msg_3(&klog_irq, klog_start, klog_len, klog_uspace);	242	event_notify_3(EVENT_KLOG, klog_start, klog_len, klog_uspace);
247	// klog_uspace = 0;	243	klog_uspace = 0;
248	// }	244	}
249		245
250	spinlock_unlock(&klog_lock);	246	spinlock_unlock(&klog_lock);
251	}	247	}
252		248
253	void putchar(char c)	249	void putchar(const wchar_t ch)
254	{	250	{
255	spinlock_lock(&klog_lock);	251	spinlock_lock(&klog_lock);
256		252
257	if ((klog_stored > 0) && (stdout) && (stdout->op->write)) {	253	if ((klog_stored > 0) && (stdout) && (stdout->op->write)) {
258	/* Print charaters stored in kernel log */	254	/* Print charaters stored in kernel log */
259	index_t i;	255	index_t i;
260	for (i = klog_len - klog_stored; i < klog_len; i++)	256	for (i = klog_len - klog_stored; i < klog_len; i++)
261	stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE], silent);	257	stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE], silent);
262	klog_stored = 0;	258	klog_stored = 0;
263	}	259	}
264		260
265	/* Store character in the cyclic kernel log */	261	/* Store character in the cyclic kernel log */
266	klog[(klog_start + klog_len) % KLOG_SIZE] = c;	262	klog[(klog_start + klog_len) % KLOG_SIZE] = ch;
267	if (klog_len < KLOG_SIZE)	263	if (klog_len < KLOG_SIZE)
268	klog_len++;	264	klog_len++;
269	else	265	else
270	klog_start = (klog_start + 1) % KLOG_SIZE;	266	klog_start = (klog_start + 1) % KLOG_SIZE;
271		267
272	if ((stdout) && (stdout->op->write))	268	if ((stdout) && (stdout->op->write))
273	stdout->op->write(stdout, c, silent);	269	stdout->op->write(stdout, ch, silent);
274	else {	270	else {
275	/* The character is just in the kernel log */	271	/* The character is just in the kernel log */
276	if (klog_stored < klog_len)	272	if (klog_stored < klog_len)
277	klog_stored++;	273	klog_stored++;
278	}	274	}
279		275
280	/* The character is stored for uspace */	276	/* The character is stored for uspace */
281	if (klog_uspace < klog_len)	277	if (klog_uspace < klog_len)
282	klog_uspace++;	278	klog_uspace++;
283		279
284	/* Check notify uspace to update */	280	/* Check notify uspace to update */
285	bool update;	281	bool update;
286	if ((klog_uspace > KLOG_LATENCY) \|\| (c == '\n'))	282	if ((klog_uspace > KLOG_LATENCY) \|\| (ch == '\n'))
287	update = true;	283	update = true;
288	else	284	else
289	update = false;	285	update = false;
290		286
291	spinlock_unlock(&klog_lock);	287	spinlock_unlock(&klog_lock);
292		288
293	if (update)	289	if (update)
294	klog_update();	290	klog_update();
295	}	291	}
296		292
297	/** Print using kernel facility	293	/** Print using kernel facility
298	*	294	*
299	* Print to kernel log.	295	* Print to kernel log.
300	*	296	*
301	*/	297	*/
302	unative_t sys_klog(int fd, const void * buf, size_t count)	298	unative_t sys_klog(int fd, const void * buf, size_t count)
303	{	299	{
304	char *data;	300	char *data;
305	int rc;	301	int rc;
306		302
307	if (count > PAGE_SIZE)	303	if (count > PAGE_SIZE)
308	return ELIMIT;	304	return ELIMIT;
309		305
310	if (count > 0) {	306	if (count > 0) {
311	data = (char *) malloc(count + 1, 0);	307	data = (char *) malloc(count + 1, 0);
312	if (!data)	308	if (!data)
313	return ENOMEM;	309	return ENOMEM;
314		310
315	rc = copy_from_uspace(data, buf, count);	311	rc = copy_from_uspace(data, buf, count);
316	if (rc) {	312	if (rc) {
317	free(data);	313	free(data);
318	return rc;	314	return rc;
319	}	315	}
320	data[count] = 0;	316	data[count] = 0;
321		317
322	printf("%s", data);	318	printf("%s", data);
323	free(data);	319	free(data);
324	} else	320	} else
325	klog_update();	321	klog_update();
326		322
327	return count;	323	return count;
328	}	324	}
329		325
330	/** @}	326	/** @}
331	*/	327	*/
332		328

Subversion Repositories HelenOS

(root)/branches/dd/kernel/generic/src/console/console.c @ 4296 – Rev 4156 → 4201