* Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
- *
+ *
* 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
* unlawful or unlicensed copies of an Apple operating system, or to
* circumvent, violate, or enable the circumvention or violation of, any
* terms of an Apple operating system software license agreement.
- *
+ *
* 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
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* 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.
- *
+ *
* @APPLE_OSREFERENCE_LICENSE_HEADER_END@
*/
/* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
* in bsd/dev/XXX/cons.c
*
* 26-MAR-1997 Umesh Vaishampayan (umeshv@NeXT.com
- * Fixed tharshing format in many functions. Cleanup.
- *
+ * Fixed tharshing format in many functions. Cleanup.
+ *
* 17-Jun-1995 Mac Gillon (mgillon) at NeXT
* Purged old history
* New version based on 4.4 and NS3.3
#include <sys/lock.h>
#include <sys/subr_prf.h>
-#include <kern/cpu_number.h> /* for cpu_number() */
+#include <kern/cpu_number.h> /* for cpu_number() */
#include <libkern/libkern.h>
#include <os/log_private.h>
/* for vaddlog(): the following are implemented in osfmk/kern/printf.c */
-extern void bsd_log_lock(void);
+extern bool bsd_log_lock(bool);
extern void bsd_log_unlock(void);
+uint32_t vaddlog_msgcount = 0;
+uint32_t vaddlog_msgcount_dropped = 0;
+
/* Keep this around only because it's exported */
void _printf(int, struct tty *, const char *, ...);
* debugger_panic_str contains argument to last
* call to panic.
*/
-extern const char *debugger_panic_str;
+extern const char *debugger_panic_str;
-extern void cnputc(char); /* standard console putc */
-void (*v_putc)(char) = cnputc; /* routine to putc on virtual console */
+extern void cnputc(char); /* standard console putc */
-extern struct tty cons; /* standard console tty */
-extern struct tty *constty; /* pointer to console "window" tty */
+extern struct tty cons; /* standard console tty */
+extern struct tty *constty; /* pointer to console "window" tty */
extern int __doprnt(const char *fmt,
- va_list argp,
- void (*)(int, void *),
- void *arg,
- int radix,
- int is_log);
+ va_list argp,
+ void (*)(int, void *),
+ void *arg,
+ int radix,
+ int is_log);
/*
* Record cpu that panic'd and lock around panic data
*/
-extern void logwakeup(struct msgbuf *);
-extern void halt_cpu(void);
+extern void logwakeup(struct msgbuf *);
+extern void halt_cpu(void);
static void
snprintf_func(int ch, void *arg);
struct putchar_args {
int flags;
struct tty *tty;
+ bool last_char_was_cr;
};
static void putchar(int c, void *arg);
struct putchar_args pca;
va_list ap;
struct session *sessp;
-
+
sessp = proc_session(p);
if (p->p_flag & P_CONTROLT && sessp != SESSION_NULL && sessp->s_ttyvp) {
pca.flags = TOTTY;
pca.tty = SESSION_TP(sessp);
- if (pca.tty != NULL)
+ if (pca.tty != NULL) {
tty_lock(pca.tty);
+ }
va_start(ap, fmt);
__doprnt(fmt, ap, putchar, &pca, 10, FALSE);
va_end(ap);
- if (pca.tty != NULL)
- tty_unlock(pca.tty);
+ if (pca.tty != NULL) {
+ tty_unlock(pca.tty);
+ }
}
- if (sessp != SESSION_NULL)
+ if (sessp != SESSION_NULL) {
session_rele(sessp);
+ }
}
tpr_t
sessp = proc_session(p);
if (p->p_flag & P_CONTROLT && sessp->s_ttyvp) {
- return ((tpr_t)sessp);
+ return (tpr_t)sessp;
}
- if (sessp != SESSION_NULL)
+ if (sessp != SESSION_NULL) {
session_rele(sessp);
+ }
- return ((tpr_t) NULL);
+ return (tpr_t) NULL;
}
void
tprintf_close(tpr_t sessp)
{
- if (sessp)
+ if (sessp) {
session_rele((struct session *) sessp);
+ }
}
/*
if (sess && (tp = SESSION_TP(sess)) != TTY_NULL) {
/* ttycheckoutq(), tputchar() require a locked tp */
tty_lock(tp);
- if(ttycheckoutq(tp, 0)) {
+ if (ttycheckoutq(tp, 0)) {
pca.flags = TOTTY;
/* going to the tty; leave locked */
pca.tty = tp;
tty_unlock(tp);
}
- pca.flags = TOLOG;
- pca.tty = TTY_NULL;
- va_start(ap, fmt);
- __doprnt(fmt, ap, putchar, &pca, 10, TRUE);
- va_end(ap);
-
- logwakeup(msgbufp);
-
va_start(ap, fmt);
os_log_with_args(OS_LOG_DEFAULT, OS_LOG_TYPE_DEFAULT, fmt, ap, __builtin_return_address(0));
va_end(ap);
struct putchar_args pca;
pca.flags = TOTTY;
pca.tty = tp;
-
+
va_start(ap, fmt);
__doprnt(fmt, ap, putchar, &pca, 10, TRUE);
va_end(ap);
void
logtime(time_t secs)
{
- printf("Time %ld Message ", secs);
+ printf("Time 0x%lx Message ", secs);
}
static void
{
struct putchar_args *pca = arg;
- if ((pca->flags & TOLOGLOCKED) && c != '\0' && c != '\r' && c != 0177)
- log_putc_locked(aslbufp, c);
+ if ((pca->flags & TOLOGLOCKED) && c != '\0' && c != '\r' && c != 0177) {
+ log_putc_locked(aslbufp, (char)c);
+ }
putchar(c, arg);
}
int
vaddlog(const char *fmt, va_list ap)
{
+ if (!bsd_log_lock(oslog_is_safe())) {
+ os_atomic_inc(&vaddlog_msgcount_dropped, relaxed);
+ return 1;
+ }
+
struct putchar_args pca = {
.flags = TOLOGLOCKED,
.tty = NULL,
};
- bsd_log_lock();
__doprnt(fmt, ap, putchar_asl, &pca, 10, TRUE);
bsd_log_unlock();
logwakeup(NULL);
- return (0);
+ os_atomic_inc(&vaddlog_msgcount, relaxed);
+ return 0;
}
void
if (ttyp != NULL) {
tty_lock(ttyp);
-
+
va_start(ap, format);
__doprnt(format, ap, putchar, &pca, 10, TRUE);
va_end(ap);
/*
* Warn that a system table is full.
*/
-void tablefull(const char *tab)
+void
+tablefull(const char *tab)
{
log(LOG_ERR, "%s: table is full\n", tab);
}
struct putchar_args *pca = arg;
char **sp = (char**) pca->tty;
- if (debugger_panic_str)
+ if (debugger_panic_str) {
constty = 0;
+ }
if ((pca->flags & TOCONS) && pca->tty == NULL && constty) {
pca->tty = constty;
pca->flags |= TOTTY;
}
if ((pca->flags & TOTTY) && pca->tty && tputchar(c, pca->tty) < 0 &&
- (pca->flags & TOCONS) && pca->tty == constty)
+ (pca->flags & TOCONS) && pca->tty == constty) {
constty = 0;
- if ((pca->flags & TOLOG) && c != '\0' && c != '\r' && c != 0177)
- log_putc(c);
- if ((pca->flags & TOLOGLOCKED) && c != '\0' && c != '\r' && c != 0177)
- log_putc_locked(msgbufp, c);
- if ((pca->flags & TOCONS) && constty == 0 && c != '\0')
- (*v_putc)(c);
+ }
+ if ((pca->flags & TOLOG) && c != '\0' && c != '\r' && c != 0177) {
+ log_putc((char)c);
+ }
+ if ((pca->flags & TOLOGLOCKED) && c != '\0' && c != '\r' && c != 0177) {
+ log_putc_locked(msgbufp, (char)c);
+ }
+ if ((pca->flags & TOCONS) && constty == 0 && c != '\0') {
+ cnputc((char)c);
+ }
if (pca->flags & TOSTR) {
- **sp = c;
+ **sp = (char)c;
(*sp)++;
}
+
+ pca->last_char_was_cr = ('\n' == c);
}
-int
-vprintf_log_locked(const char *fmt, va_list ap)
+bool
+printf_log_locked(bool addcr, const char *fmt, ...)
+{
+ bool retval;
+ va_list args;
+
+ va_start(args, fmt);
+ retval = vprintf_log_locked(fmt, args, addcr);
+ va_end(args);
+
+ return retval;
+}
+
+bool
+vprintf_log_locked(const char *fmt, va_list ap, bool addcr)
{
struct putchar_args pca;
pca.flags = TOLOGLOCKED;
pca.tty = NULL;
+ pca.last_char_was_cr = false;
__doprnt(fmt, ap, putchar, &pca, 10, TRUE);
- return 0;
+ if (addcr) {
+ putchar('\n', &pca);
+ }
+ return pca.last_char_was_cr;
}
-#if !CONFIG_EMBEDDED
-
+#if CONFIG_VSPRINTF
/*
* Scaled down version of vsprintf(3).
*
* Deprecation Warning:
- * vsprintf() is being deprecated. Please use vsnprintf() instead.
+ * vsprintf() is being deprecated. Please use vsnprintf() instead.
*/
int
vsprintf(char *buf, const char *cfmt, va_list ap)
}
return 0;
}
-#endif /* !CONFIG_EMBEDDED */
+#endif /* CONFIG_VSPRINTF */
/*
* Scaled down version of snprintf(3).
va_start(ap, format);
retval = vsnprintf(str, size, format, ap);
va_end(ap);
- return(retval);
+ return retval;
}
/*
info.str = str;
info.remain = size;
retval = __doprnt(format, ap, snprintf_func, &info, 10, FALSE);
- if (info.remain >= 1)
+ if (info.remain >= 1) {
*info.str++ = '\0';
+ }
return retval;
}
+int
+vscnprintf(char *buf, size_t size, const char *fmt, va_list args)
+{
+ ssize_t ssize = size;
+ int i;
+
+ i = vsnprintf(buf, size, fmt, args);
+
+ return (i >= ssize) ? (int)(ssize - 1) : i;
+}
+
+int
+scnprintf(char *buf, size_t size, const char *fmt, ...)
+{
+ va_list args;
+ int i;
+
+ va_start(args, fmt);
+ i = vscnprintf(buf, size, fmt, args);
+ va_end(args);
+
+ return i;
+}
+
static void
snprintf_func(int ch, void *arg)
{
struct snprintf_arg *const info = arg;
if (info->remain >= 2) {
- *info->str++ = ch;
+ *info->str++ = (char)ch;
info->remain--;
}
}
__doprnt(fmt, ap, func, arg, radix, TRUE);
return 0;
}
-
projects / apple / xnu.git / blobdiff