Changeset c859753 in mainline

Timestamp:

2008-06-03T14:55:09Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

419886f6

Parents:

aa48a9d

Message:

remove original klog
permanent kernel cyclic log buffer
proper printf formatting

Location:

kernel/generic/src/console

Files:

• chardev.c (modified) (1 diff)
• cmd.c (modified) (15 diffs)
• console.c (modified) (3 diffs)
• klog.c (deleted)

kernel/generic/src/console/chardev.c

@@ -43 +43 @@
  * @param op Implementation of character device operations.
  */
-void chardev_initialize(char *name,chardev_t *chardev, 
+void chardev_initialize(char *name, chardev_t *chardev, 
                         chardev_operations_t *op)
 {

kernel/generic/src/console/cmd.c

@@ -564 +564 @@
         unative_t sec = uptime->seconds1;
         
-        printf("Up %u days, %u hours, %u minutes, %u seconds\n",
+        printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n",
                 sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);
         
@@ -633 +633 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
-                printf("Calling %s() (%.*p)\n", symbol, sizeof(uintptr_t) * 2, symaddr);
+                printf("Calling %s() (%p)\n", symbol, symaddr);
 #ifdef ia64
                 fptr.f = symaddr;
@@ -641 +641 @@
                 f =  (unative_t (*)(void)) symaddr;
 #endif
-                printf("Result: %#zx\n", f());
+                printf("Result: %#" PRIxn "\n", f());
         }
         
@@ -687 +687 @@
                 unative_t f;
                 unative_t gp;
-        }fptr;
+        } fptr;
 #endif
 
@@ -699 +699 @@
                 symbol = get_symtab_entry(symaddr);
 
-                printf("Calling f(%#zx): %.*p: %s\n", arg1, sizeof(uintptr_t) * 2, symaddr, symbol);
+                printf("Calling f(%#" PRIxn "): %p: %s\n", arg1, symaddr, symbol);
 #ifdef ia64
                 fptr.f = symaddr;
@@ -707 +707 @@
                 f =  (unative_t (*)(unative_t,...)) symaddr;
 #endif
-                printf("Result: %#zx\n", f(arg1));
+                printf("Result: %#" PRIxn "\n", f(arg1));
         }
         
@@ -736 +736 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
-                printf("Calling f(0x%zx,0x%zx): %.*p: %s\n", 
-                       arg1, arg2, sizeof(uintptr_t) * 2, symaddr, symbol);
+                printf("Calling f(%#" PRIxn ", %#" PRIxn "): %p: %s\n", 
+                       arg1, arg2, symaddr, symbol);
 #ifdef ia64
                 fptr.f = symaddr;
@@ -745 +745 @@
                 f =  (unative_t (*)(unative_t,unative_t,...)) symaddr;
 #endif
-                printf("Result: %#zx\n", f(arg1, arg2));
+                printf("Result: %#" PRIxn "\n", f(arg1, arg2));
         }
         
@@ -775 +775 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
-                printf("Calling f(0x%zx,0x%zx, 0x%zx): %.*p: %s\n", 
-                       arg1, arg2, arg3, sizeof(uintptr_t) * 2, symaddr, symbol);
+                printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n", 
+                       arg1, arg2, arg3, symaddr, symbol);
 #ifdef ia64
                 fptr.f = symaddr;
@@ -784 +784 @@
                 f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) symaddr;
 #endif
-                printf("Result: %#zx\n", f(arg1, arg2, arg3));
+                printf("Result: %#" PRIxn "\n", f(arg1, arg2, arg3));
         }
         
@@ -857 +857 @@
                 if (pointer)
                         addr = (uint32_t *)(*(unative_t *)addr);
-                printf("Writing 0x%x -> %.*p\n", arg1, sizeof(uintptr_t) * 2, addr);
+                printf("Writing %#" PRIx64 " -> %p\n", arg1, addr);
                 *addr = arg1;
                 
@@ -1026 +1026 @@
         order(dt, &cycles, &suffix);
                 
-        printf("Time: %llu%c cycles\n", cycles, suffix);
+        printf("Time: %" PRIu64 "%c cycles\n", cycles, suffix);
         
         if (ret == NULL) {
@@ -1054 +1054 @@
         
         for (i = 0; i < cnt; i++) {
-                printf("%s (%d/%d) ... ", test->name, i + 1, cnt);
+                printf("%s (%u/%u) ... ", test->name, i + 1, cnt);
                 
                 /* Update and read thread accounting
@@ -1082 +1082 @@
                 data[i] = dt;
                 order(dt, &cycles, &suffix);
-                printf("OK (%llu%c cycles)\n", cycles, suffix);
+                printf("OK (%" PRIu64 "%c cycles)\n", cycles, suffix);
         }
         
@@ -1095 +1095 @@
                 
                 order(sum / (uint64_t) cnt, &cycles, &suffix);
-                printf("Average\t\t%llu%c\n", cycles, suffix);
+                printf("Average\t\t%" PRIu64 "%c\n", cycles, suffix);
         }
         

kernel/generic/src/console/console.c

@@ -44 +44 @@
 #include <atomic.h>
 
-#define BUFLEN 2048
-static char debug_buffer[BUFLEN];
-static size_t offset = 0;
-/** Initialize stdout to something that does not print, but does not fail
- *
- * Save data in some buffer so that it could be retrieved in the debugger
- */
-static void null_putchar(chardev_t *d, const char ch)
-{
-        if (offset >= BUFLEN)
-                offset = 0;
-        debug_buffer[offset++] = ch;
-}
+#define KLOG_SIZE 4096
+
+/**< Kernel log cyclic buffer */
+static char klog[KLOG_SIZE];
+
+/**< First kernel log characters */
+static index_t klog_start = 0;
+/**< Number of valid kernel log characters */
+static size_t klog_len = 0;
+/**< Number of stored (not printed) kernel log characters */
+static size_t klog_stored = 0;
 
 static chardev_operations_t null_stdout_ops = {
-        .write = null_putchar
+        .suspend = NULL,
+        .resume = NULL,
+        .write = NULL,
+        .read = NULL
 };
 
@@ -91 +92 @@
                 /* no other way of interacting with user, halt */
                 if (CPU)
-                        printf("cpu%d: ", CPU->id);
+                        printf("cpu%u: ", CPU->id);
                 else
                         printf("cpu: ");
@@ -162 +163 @@
 void putchar(char c)
 {
+        if ((klog_stored > 0) && (stdout->op->write)) {
+                /* Print charaters stored in kernel log */
+                index_t i;
+                for (i = klog_len - klog_stored; i < klog_len; i++)
+                        stdout->op->write(stdout, klog[(klog_start + i) % KLOG_SIZE]);
+                klog_stored = 0;
+        }
+        
+        /* Store character in the cyclic kernel log */
+        klog[(klog_start + klog_len) % KLOG_SIZE] = c;
+        if (klog_len < KLOG_SIZE)
+                klog_len++;
+        else
+                klog_start = (klog_start + 1) % KLOG_SIZE;
+        
         if (stdout->op->write)
                 stdout->op->write(stdout, c);
+        else {
+                /* The character is just in the kernel log */
+                if (klog_stored < klog_len)
+                        klog_stored++;
+        }
 }