. FS: removed half-baked stack trace code
. inet: removed silly error message from inet that ends up in the console regularly . Makefile: added some files to the incomplete clean target
This commit is contained in:
parent
0374afab56
commit
81c1b9d76d
5 changed files with 7 additions and 53 deletions
|
@ -250,11 +250,6 @@ utility.o: file.h
|
||||||
utility.o: fproc.h
|
utility.o: fproc.h
|
||||||
utility.o: inode.h
|
utility.o: inode.h
|
||||||
utility.o: param.h
|
utility.o: param.h
|
||||||
utility.o: symtab.h
|
|
||||||
|
|
||||||
|
|
||||||
symtab.h:
|
|
||||||
sh makenmtab.sh $@
|
|
||||||
|
|
||||||
|
|
||||||
write.o: $a
|
write.o: $a
|
||||||
|
|
|
@ -223,7 +223,6 @@ register struct super_block *sp; /* pointer to a superblock */
|
||||||
r = dev_io(DEV_READ, dev, FS_PROC_NR,
|
r = dev_io(DEV_READ, dev, FS_PROC_NR,
|
||||||
sbbuf, SUPER_BLOCK_BYTES, MIN_BLOCK_SIZE, 0);
|
sbbuf, SUPER_BLOCK_BYTES, MIN_BLOCK_SIZE, 0);
|
||||||
if(r != MIN_BLOCK_SIZE) {
|
if(r != MIN_BLOCK_SIZE) {
|
||||||
printf("dev_io failed for super block (%d)\n", r);
|
|
||||||
return EINVAL;
|
return EINVAL;
|
||||||
}
|
}
|
||||||
memcpy(sp, sbbuf, sizeof(*sp));
|
memcpy(sp, sbbuf, sizeof(*sp));
|
||||||
|
|
|
@ -10,12 +10,6 @@
|
||||||
* conv4: do byte swapping on a 32-bit long
|
* conv4: do byte swapping on a 32-bit long
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define STACKINFO 1
|
|
||||||
|
|
||||||
#if STACKINFO
|
|
||||||
#include "symtab.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "fs.h"
|
#include "fs.h"
|
||||||
#include <minix/com.h>
|
#include <minix/com.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -25,40 +19,6 @@
|
||||||
#include "inode.h"
|
#include "inode.h"
|
||||||
#include "param.h"
|
#include "param.h"
|
||||||
|
|
||||||
#if STACKINFO
|
|
||||||
|
|
||||||
struct i386_frame {
|
|
||||||
struct i386_frame *next;
|
|
||||||
int retaddr;
|
|
||||||
int arg0;
|
|
||||||
};
|
|
||||||
|
|
||||||
PUBLIC void
|
|
||||||
show_stack(void)
|
|
||||||
{
|
|
||||||
unsigned long *s;
|
|
||||||
int i, t, p = 0;
|
|
||||||
s = (unsigned long *) &i;
|
|
||||||
for(i = 0; i < 120; i++, s++) {
|
|
||||||
char *symname = NULL;
|
|
||||||
if(!*s) continue;
|
|
||||||
#define ELEMENTS (sizeof(fs_sym_entries)/sizeof(struct fs_sym_entry))
|
|
||||||
for(t = 0; t < ELEMENTS-1; t++) {
|
|
||||||
if(*s >= fs_sym_entries[t].symoffset &&
|
|
||||||
*s < fs_sym_entries[t+1].symoffset) {
|
|
||||||
symname = fs_sym_entries[t].symname;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if(!symname) continue;
|
|
||||||
if(!(p%7)) printf("\n");
|
|
||||||
p++;
|
|
||||||
printf("%-9s ", symname);
|
|
||||||
}
|
|
||||||
printf("\n");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
PRIVATE int panicking; /* inhibits recursive panics during sync */
|
PRIVATE int panicking; /* inhibits recursive panics during sync */
|
||||||
|
|
||||||
/*===========================================================================*
|
/*===========================================================================*
|
||||||
|
@ -147,10 +107,6 @@ int num; /* number to go with format string */
|
||||||
|
|
||||||
if (panicking) return; /* do not panic during a sync */
|
if (panicking) return; /* do not panic during a sync */
|
||||||
panicking = TRUE; /* prevent another panic during the sync */
|
panicking = TRUE; /* prevent another panic during the sync */
|
||||||
|
|
||||||
#if STACKINFO
|
|
||||||
show_stack();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
printf("File system panic: %s ", format);
|
printf("File system panic: %s ", format);
|
||||||
if (num != NO_NUM) printf("%d",num);
|
if (num != NO_NUM) printf("%d",num);
|
||||||
|
|
|
@ -41,7 +41,7 @@ install: /usr/sbin/servers/$(SERVER)
|
||||||
install -o root -cs $? $@
|
install -o root -cs $? $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f $(SERVER) *.a *.o *.bak .all
|
rm -f $(SERVER) *.a *.o */*.o */*.a *.bak .all
|
||||||
|
|
||||||
# depencencies
|
# depencencies
|
||||||
.all: $h/com.h
|
.all: $h/com.h
|
||||||
|
|
|
@ -774,13 +774,17 @@ assert (pack->acc_length >= IP_MIN_HDR_SIZE);
|
||||||
if (!broadcast_dst(ip_port, ip_hdr->ih_dst))
|
if (!broadcast_dst(ip_port, ip_hdr->ih_dst))
|
||||||
{
|
{
|
||||||
#if !CRAMPED
|
#if !CRAMPED
|
||||||
printf(
|
/* this message isn't very useful, but is quite annoying on
|
||||||
"ip[%d]: broadcast packet for ip-nonbroadcast addr, src=",
|
* the console
|
||||||
|
*/
|
||||||
|
/*
|
||||||
|
printf("ip[%d]: broadcast packet for ip-nonbroadcast addr, src=",
|
||||||
ip_port->ip_port);
|
ip_port->ip_port);
|
||||||
writeIpAddr(ip_hdr->ih_src);
|
writeIpAddr(ip_hdr->ih_src);
|
||||||
printf(" dst=");
|
printf(" dst=");
|
||||||
writeIpAddr(ip_hdr->ih_dst);
|
writeIpAddr(ip_hdr->ih_dst);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
*/
|
||||||
#endif
|
#endif
|
||||||
bf_afree(pack);
|
bf_afree(pack);
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in a new issue