Intermediate boot verbosity level EXTRA (2), MAX moved to 3

This commit is contained in:
Erik van der Kouwe
2010-05-10 18:07:59 +00:00
parent d4188dcd5c
commit b7bf2733d6
5 changed files with 42 additions and 39 deletions

View File

@@ -67,6 +67,7 @@
#define DEBUG_PRINT(params, level) do { \
if (verboseboot >= (level)) printf params; } while (0)
#define DEBUGBASIC(params) DEBUG_PRINT(params, VERBOSEBOOT_BASIC)
#define DEBUGEXTRA(params) DEBUG_PRINT(params, VERBOSEBOOT_EXTRA)
#define DEBUGMAX(params) DEBUG_PRINT(params, VERBOSEBOOT_MAX)
#endif

View File

@@ -41,7 +41,7 @@ PUBLIC void main(void)
/* Global value to test segment sanity. */
magictest = MAGICTEST;
DEBUGMAX(("main()\n"));
DEBUGEXTRA(("main()\n"));
/* Clear the process table. Anounce each slot as empty and set up mappings
* for proc_addr() and proc_nr() macros. Do the same for the table with
@@ -76,7 +76,7 @@ PUBLIC void main(void)
int ipc_to_m, kcalls;
ip = &image[i]; /* process' attributes */
DEBUGMAX(("initializing %s... ", ip->proc_name));
DEBUGEXTRA(("initializing %s... ", ip->proc_name));
rp = proc_addr(ip->proc_nr); /* get process pointer */
ip->endpoint = rp->p_endpoint; /* ipc endpoint */
rp->p_scheduler = NULL; /* no user space scheduler */
@@ -206,18 +206,18 @@ PUBLIC void main(void)
if (rp->p_nr < 0) RTS_SET(rp, RTS_PROC_STOP);
RTS_UNSET(rp, RTS_SLOT_FREE); /* remove RTS_SLOT_FREE and schedule */
alloc_segments(rp);
DEBUGMAX(("done\n"));
DEBUGEXTRA(("done\n"));
}
/* Architecture-dependent initialization. */
DEBUGMAX(("arch_init()... "));
DEBUGEXTRA(("arch_init()... "));
arch_init();
DEBUGMAX(("done\n"));
DEBUGEXTRA(("done\n"));
/* System and processes initialization */
DEBUGMAX(("system_init()... "));
DEBUGEXTRA(("system_init()... "));
system_init();
DEBUGMAX(("done\n"));
DEBUGEXTRA(("done\n"));
#if SPROFILE
sprofiling = 0; /* we're not profiling until instructed to */
@@ -251,9 +251,9 @@ PUBLIC void main(void)
FIXME("PROC check enabled");
#endif
DEBUGMAX(("cycles_accounting_init()... "));
DEBUGEXTRA(("cycles_accounting_init()... "));
cycles_accounting_init();
DEBUGMAX(("done\n"));
DEBUGEXTRA(("done\n"));
assert(runqueues_ok());

View File

@@ -46,7 +46,7 @@ PUBLIC void cstart(
if ((value = get_value(params_buffer, VERBOSEBOOTVARNAME)))
verboseboot = atoi(value);
DEBUGMAX(("cstart\n"));
DEBUGEXTRA(("cstart\n"));
/* Record miscellaneous information for user-space servers. */
kinfo.nr_procs = NR_PROCS;
@@ -106,7 +106,7 @@ PUBLIC void cstart(
* reload selectors and call main().
*/
DEBUGMAX(("intr_init(%d, 0)\n", INTS_MINIX));
DEBUGEXTRA(("intr_init(%d, 0)\n", INTS_MINIX));
intr_init(INTS_MINIX, 0);
}