Subversion Repositories HelenOS

Rev

Rev 4420 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 4420 Rev 4537
Line 36... Line 36...
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
}
106
 
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
}
-
 
116
 
107
/** @}
117
/** @}
108
 */
118
 */