greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

save process name for debugging

Browse source
This commit is contained in:
rsc 2007-08-08 08:38:11 +00:00
parent 7e89fb90bd
commit 7366e042d9
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
proc.h
View file

@ -40,6 +40,7 @@ struct proc {
struct inode *cwd; // Current directory struct inode *cwd; // Current directory
struct jmpbuf jmpbuf; // Jump here to run process struct jmpbuf jmpbuf; // Jump here to run process
struct trapframe *tf; // Trap frame for current interrupt struct trapframe *tf; // Trap frame for current interrupt
char name[16]; // Process name (debugging)
}; };
// Process memory is laid out contiguously: // Process memory is laid out contiguously:

10
sysfile.c
View file

@ -322,7 +322,7 @@ sys_exec(void)
struct elfhdr elf; struct elfhdr elf;
struct proghdr ph; struct proghdr ph;
char *mem = 0; char *mem = 0;
char *path, *s; char *path, *s, *last;
uint argv; uint argv;
if(argstr(0, &path) < 0 || argint(1, (int*)&argv) < 0) if(argstr(0, &path) < 0 || argint(1, (int*)&argv) < 0)
@ -399,6 +399,12 @@ sys_exec(void)
} }
*(uint*)(mem + p1) = 0; *(uint*)(mem + p1) = 0;
// Save name for debugging.
for(last=s=path; *s; s++)
if(*s == '/')
last = s+1;
safestrcpy(cp->name, last, sizeof cp->name);
// commit to the new image. // commit to the new image.
kfree(cp->mem, cp->sz); kfree(cp->mem, cp->sz);
cp->sz = sz; cp->sz = sz;
@ -419,7 +425,7 @@ sys_exec(void)
} }
iput(ip); iput(ip);
cp->tf->eip = elf.entry; cp->tf->eip = elf.entry;
cp->tf->esp = sp; cp->tf->esp = sp;
setupsegs(cp); setupsegs(cp);

6
trap.c
View file

@ -80,10 +80,10 @@ trap(struct trapframe *tf)
break; break;
default: default:
if(curproc[cpu()]) { if(cp) {
// Assume process divided by zero or dereferenced null, etc. // Assume process divided by zero or dereferenced null, etc.
cprintf("pid %d: unhandled trap %d on cpu %d eip %x -- kill proc\n", cprintf("pid %d %s: unhandled trap %d on cpu %d eip %x -- kill proc\n",
curproc[cpu()]->pid, v, cpu(), tf->eip); cp->pid, cp->name, v, cpu(), tf->eip);
proc_exit(); proc_exit();
} }