xnu-792.10.96.tar.gz

[apple/xnu.git] / osfmk / kern / printf.c

diff --git a/osfmk/kern/printf.c b/osfmk/kern/printf.c
index 6aeaa805625e7443e5b450b548da316de85e71d2..90bda90e06b8744443b4dbaef301502bc22d5489 100644 (file)
--- a/osfmk/kern/printf.c
+++ b/osfmk/kern/printf.c
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -153,9 +150,11 @@
  * output bases such as x, X, u, U, o, and O also work.
  */
 
+#include <debug.h>
+#include <mach_kdb.h>
+#include <mach_kdp.h>
 #include <platforms.h>
 #include <mach/boolean.h>
-#include <cpus.h>
 #include <kern/cpu_number.h>
 #include <kern/lock.h>
 #include <kern/thread.h>
@@ -646,7 +645,11 @@ boolean_t  new_printf_cpu_number = FALSE;
 
 
 decl_simple_lock_data(,printf_lock)
+decl_simple_lock_data(,bsd_log_spinlock)
 decl_mutex_data(,sprintf_lock)
+extern void bsd_log_init(void);
+void bsd_log_lock(void);
+void bsd_log_unlock(void);
 
 void
 printf_init(void)
@@ -654,8 +657,22 @@ printf_init(void)
        /*
         * Lock is only really needed after the first thread is created.
         */
-       simple_lock_init(&printf_lock, ETAP_MISC_PRINTF);
-       mutex_init(&sprintf_lock, ETAP_MISC_PRINTF);
+       simple_lock_init(&printf_lock, 0);
+       simple_lock_init(&bsd_log_spinlock, 0);
+       bsd_log_init();
+       mutex_init(&sprintf_lock, 0);
+}
+
+void
+bsd_log_lock()
+{
+       simple_lock(&bsd_log_spinlock);
+}
+
+void
+bsd_log_unlock()
+{
+       simple_unlock(&bsd_log_spinlock);
 }
 
 /* derived from boot_gets */
@@ -721,6 +738,22 @@ conslog_putc(
 #endif
 }
 
+void
+dbugprintf(const char *fmt, ...)
+{
+
+#if    MACH_KDB
+
+       extern void db_putchar(char c);
+       va_list listp;
+
+       va_start(listp, fmt);
+       _doprnt(fmt, &listp, db_putchar, 16);
+       va_end(listp);
+#endif
+       return;
+}
+
 void
 printf(const char *fmt, ...)
 {
@@ -733,6 +766,8 @@ printf(const char *fmt, ...)
        enable_preemption();
 }
 
+extern unsigned int disableSerialOuput;
+
 void
 consdebug_putc(
        char c)
@@ -743,6 +778,10 @@ consdebug_putc(
                cnputc(c);
 
        debug_putc(c);
+
+       if (!console_is_serial())
+               if (!disableSerialOuput)
+                       PE_kputc(c);
 }
 
 void