panic() cleanup.
this change
- makes panic() variadic, doing full printf() formatting -
no more NO_NUM, and no more separate printf() statements
needed to print extra info (or something in hex) before panicing
- unifies panic() - same panic() name and usage for everyone -
vm, kernel and rest have different names/syntax currently
in order to implement their own luxuries, but no longer
- throws out the 1st argument, to make source less noisy.
the panic() in syslib retrieves the server name from the kernel
so it should be clear enough who is panicing; e.g.
panic("sigaction failed: %d", errno);
looks like:
at_wini(73130): panic: sigaction failed: 0
syslib:panic.c: stacktrace: 0x74dc 0x2025 0x100a
- throws out report() - printf() is more convenient and powerful
- harmonizes/fixes the use of panic() - there were a few places
that used printf-style formatting (didn't work) and newlines
(messes up the formatting) in panic()
- throws out a few per-server panic() functions
- cleans up a tie-in of tty with panic()
merging printf() and panic() statements to be done incrementally.
This commit is contained in:
@@ -1,42 +1,35 @@
|
||||
/* This file contains a collection of miscellaneous procedures:
|
||||
* minix_panic: abort MINIX due to a fatal error
|
||||
* panic: abort MINIX due to a fatal error
|
||||
* kputc: buffered putc used by kernel printf
|
||||
*/
|
||||
|
||||
#include "kernel.h"
|
||||
#include "proc.h"
|
||||
|
||||
#include <minix/syslib.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include <minix/sys_config.h>
|
||||
|
||||
/*===========================================================================*
|
||||
* panic *
|
||||
*===========================================================================*/
|
||||
PUBLIC void panic(char *what, char *mess,int nr)
|
||||
{
|
||||
/* This function is for when a library call wants to panic.
|
||||
* The library call calls printf() and tries to exit a process,
|
||||
* which isn't applicable in the kernel.
|
||||
*/
|
||||
minix_panic(mess, nr);
|
||||
}
|
||||
#define ARE_PANICING 0xDEADC0FF
|
||||
|
||||
/*===========================================================================*
|
||||
* minix_panic *
|
||||
* panic *
|
||||
*===========================================================================*/
|
||||
PUBLIC void minix_panic(char *mess,int nr)
|
||||
PUBLIC void panic(const char *fmt, ...)
|
||||
{
|
||||
/* The system has run aground of a fatal kernel error. Terminate execution. */
|
||||
if (minix_panicing++) {
|
||||
va_list arg;
|
||||
/* The system has run aground of a fatal kernel error. Terminate execution. */
|
||||
if (minix_panicing == ARE_PANICING) {
|
||||
arch_monitor();
|
||||
}
|
||||
|
||||
if (mess != NULL) {
|
||||
printf("kernel panic: %s", mess);
|
||||
if(nr != NO_NUM)
|
||||
printf(" %d", nr);
|
||||
}
|
||||
minix_panicing = ARE_PANICING;
|
||||
if (fmt != NULL) {
|
||||
printf("kernel panic: ");
|
||||
va_start(arg, fmt);
|
||||
vprintf(fmt, arg);
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user