WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/generic/src/printf/ Rev 2207 and /trunk/kernel/generic/src/printf/ Rev 2208

Ignore whitespace Rev 2207 → Rev 2208

/trunk/kernel/generic/src/printf/snprintf.c
50,4 → 50,3

/** @}
*/

 /trunk/kernel/generic/src/printf/vprintf.c
 ,7 → 35,11
 #include <print.h>
 #include <printf/printf_core.h>
 #include <putchar.h>
+#include <synch/spinlock.h>
+#include <arch/asm.h>
+SPINLOCK_INITIALIZE(printf_lock);           /**< vprintf spinlock */
 static int vprintf_write(const char *str, size_t count, void *unused)
 {
     size_t i;
 ,8 → 59,16
 int vprintf(const char *fmt, va_list ap)
 {
     struct printf_spec ps = {(int(*)(void *, size_t, void *)) vprintf_write, NULL};
-    return printf_core(fmt, &ps, ap);
+    int irqpri = interrupts_disable();
+    spinlock_lock(&printf_lock);
+    int ret = printf_core(fmt, &ps, ap);
+    spinlock_unlock(&printf_lock);
+    interrupts_restore(irqpri);
+    return ret;
 }
 /** @}

 /trunk/kernel/generic/src/printf/vsnprintf.c
 ,8 → 42,6
     char *string; /* destination string */
 };
-int vsnprintf_write(const char *str, size_t count, struct vsnprintf_data *data);
 /** Write string to given buffer.
  * Write at most data->size characters including trailing zero. According to C99, snprintf() has to return number
  * of characters that would have been written if enough space had been available. Hence the return value is not
 ,7 → 52,7
  * @param data structure with destination string, counter of used space and total string size.
  * @return number of characters to print (not characters really printed!)
  */
-int vsnprintf_write(const char *str, size_t count, struct vsnprintf_data *data)
+static int vsnprintf_write(const char *str, size_t count, struct vsnprintf_data *data)
 {
     size_t i;
     i = data->size - data->len;

 /trunk/kernel/generic/src/printf/printf_core.c
 ,14 → 38,9
 #include <printf/printf_core.h>
 #include <putchar.h>
 #include <print.h>
-#include <synch/spinlock.h>
 #include <arch/arg.h>
-#include <arch/asm.h>
 #include <arch.h>
-SPINLOCK_INITIALIZE(printflock);            /**< printf spinlock */
 #define __PRINTF_FLAG_PREFIX        0x00000001  /**< show prefixes 0x or 0*/
 #define __PRINTF_FLAG_SIGNED        0x00000002  /**< signed / unsigned number */
 #define __PRINTF_FLAG_ZEROPADDED    0x00000004  /**< print leading zeroes */
 ,7 → 453,6
  */
 int printf_core(const char *fmt, struct printf_spec *ps, va_list ap)
 {
-    int irqpri;
     int i = 0, j = 0; /**< i is index of currently processed char from fmt, j is index to the first not printed nonformating character */
     int end;
     int counter; /**< counter of printed characters */
 ,10 → 466,7
     uint64_t flags;
     counter = 0;
-    irqpri = interrupts_disable();
-    spinlock_lock(&printflock);
     while ((c = fmt[i])) {
         /* control character */
         if (c == '%' ) {
 ,8 → 703,6
     }
 out:
-    spinlock_unlock(&printflock);
-    interrupts_restore(irqpri);
     return counter;
 }

 /trunk/kernel/generic/src/printf/vsprintf.c
 ,7 → 36,7
 int vsprintf(char *str, const char *fmt, va_list ap)
 {
-    return vsnprintf(str, (size_t)-1, fmt, ap);
+    return vsnprintf(str, (size_t) - 1, fmt, ap);
 }
 /** @}