Changeset 5b303ba in mainline

Timestamp:

2007-04-07T17:57:07Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3dbe2d1f

Parents:

be66dee

Message:

use spinlock only on console output, not other print functions
cleanup

Location:

kernel/generic

Files:

• include/print.h (modified) (1 diff)
• include/printf/printf_core.h (modified) (1 diff)
• src/printf/printf_core.c (modified) (4 diffs)
• src/printf/snprintf.c (modified) (1 diff)
• src/printf/vprintf.c (modified) (2 diffs)
• src/printf/vsnprintf.c (modified) (2 diffs)
• src/printf/vsprintf.c (modified) (1 diff)

kernel/generic/include/print.h

@@ -41 +41 @@
 
 /* We need this address in spinlock to avoid deadlock in deadlock detection */
-SPINLOCK_EXTERN(printflock);
+SPINLOCK_EXTERN(printf_lock);
 
 #define EOF (-1)

kernel/generic/include/printf/printf_core.h

@@ -48 +48 @@
 };
 
-int printf_core(const char *fmt, struct printf_spec *ps ,va_list ap);
+int printf_core(const char *fmt, struct printf_spec *ps, va_list ap);
 
 #endif

kernel/generic/src/printf/printf_core.c

@@ -39 +39 @@
 #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*/
@@ -459 +454 @@
 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;
@@ -473 +467 @@
         
         counter = 0;
-        
-        irqpri = interrupts_disable();
-        spinlock_lock(&printflock);
-
+                
         while ((c = fmt[i])) {
                 /* control character */
@@ -713 +704 @@
 
 out:
-        spinlock_unlock(&printflock);
-        interrupts_restore(irqpri);
         
         return counter;

kernel/generic/src/printf/snprintf.c

@@ -51 +51 @@
 /** @}
  */
-

kernel/generic/src/printf/vprintf.c

@@ -36 +36 @@
 #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)
@@ -56 +60 @@
 {
         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;
 }
 

kernel/generic/src/printf/vsnprintf.c

@@ -43 +43 @@
 };
 
-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
@@ -55 +53 @@
  * @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;

kernel/generic/src/printf/vsprintf.c

@@ -37 +37 @@
 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);
 }