Rev 2131 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2131 | Rev 2307 | ||
---|---|---|---|
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> |
|
- | 40 | #include <async.h> |
|
39 | 41 | ||
40 | int vprintf_write(const char *str, size_t count, void *unused); |
42 | static atomic_t printf_futex = FUTEX_INITIALIZER; |
41 | 43 | ||
42 | int vprintf_write(const char *str, size_t count, void *unused) |
44 | static int vprintf_write(const char *str, size_t count, void *unused) |
43 | { |
45 | { |
44 | return write(1, str, count); |
46 | return write(1, str, count); |
45 | } |
47 | } |
46 | 48 | ||
47 | /** Print formatted text. |
49 | /** Print formatted text. |
48 | * @param fmt format string |
50 | * @param fmt format string |
49 | * @param ap format parameters |
51 | * @param ap format parameters |
50 | * \see For more details about format string see printf_core. |
52 | * \see For more details about format string see printf_core. |
51 | */ |
53 | */ |
52 | int vprintf(const char *fmt, va_list ap) |
54 | int vprintf(const char *fmt, va_list ap) |
53 | { |
55 | { |
- | 56 | struct printf_spec ps = { |
|
54 | struct printf_spec ps = {(int(*)(void *, size_t, void *))vprintf_write, NULL}; |
57 | (int (*)(void *, size_t, void *)) vprintf_write, |
- | 58 | NULL |
|
- | 59 | }; |
|
- | 60 | /* |
|
- | 61 | * Prevent other threads to execute printf_core() |
|
- | 62 | */ |
|
55 | return printf_core(fmt, &ps, ap); |
63 | futex_down(&printf_futex); |
56 | 64 | /* |
|
- | 65 | * Prevent other pseudo threads of the same thread |
|
- | 66 | * to execute printf_core() |
|
- | 67 | */ |
|
- | 68 | async_serialize_start(); |
|
- | 69 | int ret = printf_core(fmt, &ps, ap); |
|
- | 70 | async_serialize_end(); |
|
- | 71 | futex_up(&printf_futex); |
|
- | 72 | return ret; |
|
57 | } |
73 | } |
58 | 74 | ||
59 | /** @} |
75 | /** @} |
60 | */ |
76 | */ |
61 | 77 |