Changeset 0d11fc1c in mainline

Timestamp:

2006-06-06T16:37:41Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

f1249e1

Parents:

63bb83e

Message:

Fixed console disconnect.
Added serialization to printf.

Files:

• console/console.c (modified) (1 diff)
• klog/klog.c (modified) (1 diff)
• libc/generic/io/printf_core.c (modified) (8 diffs)

console/console.c

@@ -372 +372 @@
                         /* Commit hangup */
                         ipc_answer_fast(callid, 0,0,0);
+                        conn->used = 0;
                         async_serialize_end();
                         return;

klog/klog.c

@@ -42 +42 @@
         
         async_serialize_start();
-        /* TODO: remove workaround around non-functional vsnprintf */
         for (i=0; klog[i + IPC_GET_ARG2(*call)] && i < IPC_GET_ARG3(*call); i++)
                 putchar(klog[i + IPC_GET_ARG2(*call)]);

libc/generic/io/printf_core.c

@@ -38 +38 @@
 #include <ctype.h>
 #include <string.h>
+/* For serialization */
+#include <async.h>
 
 #define __PRINTF_FLAG_PREFIX            0x00000001      /**< show prefixes 0x or 0*/
@@ -445 +447 @@
         uint64_t flags;
         
+        /* Don't let other threads interfere */
+        async_serialize_start();
+
         counter = 0;
         
@@ -453 +458 @@
                         if (i > j) {
                                 if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) == EOF) { /* error */
-                                        return -counter;
+                                        goto minus_out;
                                 }
                                 counter += retval;
@@ -549 +554 @@
                                 case 's':
                                         if ((retval = print_string(va_arg(ap, char*), width, precision, flags, ps)) == EOF) {
-                                                return -counter;
+                                                goto minus_out;
                                         };
                                         
@@ -558 +563 @@
                                         c = va_arg(ap, unsigned int);
                                         if ((retval = print_char(c, width, flags, ps)) == EOF) {
-                                                return -counter;
+                                                goto minus_out;
                                         };
                                         
@@ -639 +644 @@
                                         break;
                                 default: /* Unknown qualifier */
-                                        return -counter;
+                                        goto minus_out;
                                         
                         }
@@ -658 +663 @@
 
                         if ((retval = print_number(number, width, precision, base, flags, ps)) == EOF ) {
-                                return -counter;
+                                goto minus_out;
                         };
 
@@ -671 +676 @@
         if (i > j) {
                 if ((retval = printf_putnchars(&fmt[j], (size_t)(i - j), ps)) == EOF) { /* error */
-                        return -counter;
+                        goto minus_out;
                 }
                 counter += retval;
         }
         
+        async_serialize_end();
         return counter;
+minus_out:
+        async_serialize_end();
+        return -counter;
 }