Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

panic() cleanup.

Browse Source 
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:
Ben Gras
2010-03-05 15:05:11 +00:00
parent 851dc95566
commit 35a108b911
171 changed files with 1381 additions and 1649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/memory/memory.c
View File

@@ -128,11 +128,11 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
sa.sa_handler = SIG_MESS;
sigemptyset(&sa.sa_mask);
sa.sa_flags = 0;
if (sigaction(SIGTERM,&sa,NULL)<0) panic("MEM","sigaction failed", errno);
if (sigaction(SIGTERM,&sa,NULL)<0) panic("sigaction failed: %d", errno);
/* Initialize all minor devices one by one. */
if (OK != (s=sys_getkinfo(&kinfo))) {
panic("MEM","Couldn't get kernel information.",s);
panic("Couldn't get kernel information: %d", s);
}
#if 0
@@ -255,7 +255,7 @@ unsigned nr_req; /* length of request vector */
dev_vaddr + position, count, D);
}
if(r != OK) {
panic("MEM","I/O copy failed",r);
panic("I/O copy failed: %d", r);
}
break;
@@ -287,7 +287,7 @@ unsigned nr_req; /* length of request vector */
if(!any_mapped || pagestart_mapped != pagestart) {
if(any_mapped) {
if(vm_unmap_phys(SELF, vaddr, I386_PAGE_SIZE) != OK)
panic("MEM","vm_unmap_phys failed",NO_NUM);
panic("vm_unmap_phys failed");
any_mapped = 0;
}
vaddr = vm_map_phys(SELF, (void *) pagestart, I386_PAGE_SIZE);
@@ -331,7 +331,7 @@ unsigned nr_req; /* length of request vector */
s=sys_safecopyto(proc_nr, user_vir,
vir_offset+suboffset, (vir_bytes) dev_zero, chunk, D);
if(s != OK)
report("MEM","sys_safecopyto failed", s);
printf("MEM: sys_safecopyto failed: %d\n", s);
left -= chunk;
suboffset += chunk;
}
@@ -372,7 +372,7 @@ message *m_ptr;
}
if(m_device < 0 || m_device >= NR_DEVS) {
panic("MEM","wrong m_device",m_device);
panic("wrong m_device: %d", m_device);
}
openct[m_device]++;
@@ -392,11 +392,11 @@ message *m_ptr;
if (m_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
if(m_device < 0 || m_device >= NR_DEVS) {
panic("MEM","wrong m_device",m_device);
panic("wrong m_device: %d", m_device);
}
if(openct[m_device] < 1) {
panic("MEM","closed too often",NO_NUM);
panic("closed too often");
}
openct[m_device]--;
@@ -449,7 +449,7 @@ message *m_ptr; /* pointer to control message */
if(m_vaddrs[dev]) {
u32_t size;
if(ex64hi(dv->dv_size)) {
panic("MEM","huge old ramdisk", NO_NUM);
panic("huge old ramdisk");
}
size = ex64lo(dv->dv_size);
free((void *) m_vaddrs[dev]);