Rev 4377 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 4377 | Rev 4692 | ||
---|---|---|---|
1 | /* |
1 | /* |
2 | * Copyright (c) 2006 Josef Cejka |
2 | * Copyright (c) 2006 Josef Cejka |
3 | * All rights reserved. |
3 | * All rights reserved. |
4 | * |
4 | * |
5 | * Redistribution and use in source and binary forms, with or without |
5 | * Redistribution and use in source and binary forms, with or without |
6 | * modification, are permitted provided that the following conditions |
6 | * modification, are permitted provided that the following conditions |
7 | * are met: |
7 | * are met: |
8 | * |
8 | * |
9 | * - Redistributions of source code must retain the above copyright |
9 | * - Redistributions of source code must retain the above copyright |
10 | * notice, this list of conditions and the following disclaimer. |
10 | * notice, this list of conditions and the following disclaimer. |
11 | * - Redistributions in binary form must reproduce the above copyright |
11 | * - Redistributions in binary form must reproduce the above copyright |
12 | * notice, this list of conditions and the following disclaimer in the |
12 | * notice, this list of conditions and the following disclaimer in the |
13 | * documentation and/or other materials provided with the distribution. |
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 |
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. |
15 | * derived from this software without specific prior written permission. |
16 | * |
16 | * |
17 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
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 |
18 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
19 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
20 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
21 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
22 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
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 |
23 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
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 |
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. |
26 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ |
27 | */ |
28 | 28 | ||
29 | /** @addtogroup libc |
29 | /** @addtogroup libc |
30 | * @{ |
30 | * @{ |
31 | */ |
31 | */ |
32 | /** @file |
32 | /** @file |
33 | */ |
33 | */ |
34 | 34 | ||
35 | #include <stdarg.h> |
35 | #include <stdarg.h> |
36 | #include <stdio.h> |
36 | #include <stdio.h> |
37 | #include <unistd.h> |
37 | #include <unistd.h> |
38 | #include <io/printf_core.h> |
38 | #include <io/printf_core.h> |
39 | #include <futex.h> |
39 | #include <futex.h> |
40 | #include <async.h> |
40 | #include <async.h> |
41 | #include <console.h> |
41 | #include <string.h> |
42 | 42 | ||
43 | static atomic_t printf_futex = FUTEX_INITIALIZER; |
43 | static atomic_t printf_futex = FUTEX_INITIALIZER; |
44 | 44 | ||
45 | static int vprintf_str_write(const char *str, size_t size, void *data) |
45 | static int vprintf_str_write(const char *str, size_t size, void *stream) |
46 | { |
46 | { |
47 | size_t offset = 0; |
- | |
48 | size_t prev; |
- | |
49 | count_t chars = 0; |
- | |
50 | - | ||
51 | while (offset < size) { |
- | |
52 | prev = offset; |
- | |
53 | str_decode(str, &offset, size); |
- | |
54 | console_write(str + prev, offset - prev); |
47 | size_t wr = fwrite(str, 1, size, (FILE *) stream); |
55 | chars++; |
- | |
56 | } |
- | |
57 | - | ||
58 | return chars; |
48 | return str_nlength(str, wr); |
59 | } |
49 | } |
60 | 50 | ||
61 | static int vprintf_wstr_write(const wchar_t *str, size_t size, void *data) |
51 | static int vprintf_wstr_write(const wchar_t *str, size_t size, void *stream) |
62 | { |
52 | { |
63 | size_t offset = 0; |
53 | size_t offset = 0; |
64 | size_t boff; |
- | |
65 | count_t chars = 0; |
54 | size_t chars = 0; |
66 | char buf[4]; |
- | |
67 | 55 | ||
68 | while (offset < size) { |
56 | while (offset < size) { |
69 | boff = 0; |
- | |
70 | chr_encode(str[chars], buf, &boff, 4); |
57 | if (fputc(str[chars], (FILE *) stream) <= 0) |
71 | console_write(buf, boff); |
58 | break; |
- | 59 | ||
72 | chars++; |
60 | chars++; |
73 | offset += sizeof(wchar_t); |
61 | offset += sizeof(wchar_t); |
74 | } |
62 | } |
75 | 63 | ||
76 | return chars; |
64 | return chars; |
77 | } |
65 | } |
78 | 66 | ||
79 | - | ||
80 | /** Print formatted text. |
67 | /** Print formatted text. |
- | 68 | * |
|
- | 69 | * @param stream Output stream |
|
81 | * @param fmt format string |
70 | * @param fmt Format string |
82 | * @param ap format parameters |
71 | * @param ap Format parameters |
- | 72 | * |
|
83 | * \see For more details about format string see printf_core. |
73 | * \see For more details about format string see printf_core. |
- | 74 | * |
|
84 | */ |
75 | */ |
85 | int vprintf(const char *fmt, va_list ap) |
76 | int vfprintf(FILE *stream, const char *fmt, va_list ap) |
86 | { |
77 | { |
87 | struct printf_spec ps = { |
78 | struct printf_spec ps = { |
88 | vprintf_str_write, |
79 | vprintf_str_write, |
89 | vprintf_wstr_write, |
80 | vprintf_wstr_write, |
90 | NULL |
81 | stream |
91 | }; |
82 | }; |
- | 83 | ||
92 | /* |
84 | /* |
93 | * Prevent other threads to execute printf_core() |
85 | * Prevent other threads to execute printf_core() |
94 | */ |
86 | */ |
95 | futex_down(&printf_futex); |
87 | futex_down(&printf_futex); |
- | 88 | ||
96 | /* |
89 | /* |
97 | * Prevent other pseudo threads of the same thread |
90 | * Prevent other fibrils of the same thread |
98 | * to execute printf_core() |
91 | * to execute printf_core() |
99 | */ |
92 | */ |
100 | async_serialize_start(); |
93 | async_serialize_start(); |
- | 94 | ||
101 | int ret = printf_core(fmt, &ps, ap); |
95 | int ret = printf_core(fmt, &ps, ap); |
- | 96 | ||
102 | async_serialize_end(); |
97 | async_serialize_end(); |
103 | futex_up(&printf_futex); |
98 | futex_up(&printf_futex); |
- | 99 | ||
104 | return ret; |
100 | return ret; |
105 | } |
101 | } |
- | 102 | ||
- | 103 | /** Print formatted text to stdout. |
|
- | 104 | * |
|
- | 105 | * @param file Output stream |
|
- | 106 | * @param fmt Format string |
|
- | 107 | * @param ap Format parameters |
|
- | 108 | * |
|
- | 109 | * \see For more details about format string see printf_core. |
|
- | 110 | * |
|
- | 111 | */ |
|
- | 112 | int vprintf(const char *fmt, va_list ap) |
|
- | 113 | { |
|
- | 114 | return vfprintf(stdout, fmt, ap); |
|
- | 115 | } |
|
106 | 116 | ||
107 | /** @} |
117 | /** @} |
108 | */ |
118 | */ |
109 | 119 |