Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/kern Make we keep track of the file sizes in a size_t, n...
details: https://anonhg.NetBSD.org/src/rev/965632e27b44
branches: trunk
changeset: 546911:965632e27b44
user: matt <matt%NetBSD.org@localhost>
date: Thu May 08 20:26:40 2003 +0000
description:
Make we keep track of the file sizes in a size_t, not an int. Also break
out the writing of an lwp's registers to a separate function. XXX Although
not really the correct way to do this, make the thread that caused the
coredump has it's register set written first so GDB is happy. (this is a
bridge until TRT is done).
diffstat:
sys/kern/core_elf32.c | 165 ++++++++++++++++++++++++++++++-------------------
1 files changed, 100 insertions(+), 65 deletions(-)
diffs (236 lines):
diff -r ffdd5fe28805 -r 965632e27b44 sys/kern/core_elf32.c
--- a/sys/kern/core_elf32.c Thu May 08 20:24:10 2003 +0000
+++ b/sys/kern/core_elf32.c Thu May 08 20:26:40 2003 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: core_elf32.c,v 1.5 2003/02/25 05:27:35 atatat Exp $ */
+/* $NetBSD: core_elf32.c,v 1.6 2003/05/08 20:26:40 matt Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.5 2003/02/25 05:27:35 atatat Exp $");
+__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.6 2003/05/08 20:26:40 matt Exp $");
/* If not included by core_elf64.c, ELFSIZE won't be defined. */
#ifndef ELFSIZE
@@ -75,8 +75,10 @@
int ELFNAMEEND(coredump_writesegs)(struct proc *, struct vnode *,
struct ucred *, struct uvm_coredump_state *);
-int ELFNAMEEND(coredump_notes)(struct proc *, struct vnode *,
- struct ucred *, int *, off_t);
+int ELFNAMEEND(coredump_notes)(struct proc *, struct lwp *, struct vnode *,
+ struct ucred *, size_t *, off_t);
+int ELFNAMEEND(coredump_note)(struct proc *, struct lwp *, struct vnode *,
+ struct ucred *, size_t *, off_t);
#define ELFROUNDSIZE 4 /* XXX Should it be sizeof(Elf_Word)? */
#define elfround(x) roundup((x), ELFROUNDSIZE)
@@ -90,7 +92,8 @@
struct countsegs_state cs;
struct writesegs_state ws;
off_t notestart, secstart;
- int notesize, error;
+ size_t notesize;
+ int error;
p = l->l_proc;
/*
@@ -112,7 +115,7 @@
return (error);
/* Get the size of the notes. */
- error = ELFNAMEEND(coredump_notes)(p, vp, cred, ¬esize, 0);
+ error = ELFNAMEEND(coredump_notes)(p, l, vp, cred, ¬esize, 0);
if (error)
return (error);
@@ -188,7 +191,7 @@
#endif
/* Write out the notes. */
- error = ELFNAMEEND(coredump_notes)(p, vp, cred, ¬esize, ws.offset);
+ error = ELFNAMEEND(coredump_notes)(p, l, vp, cred, ¬esize, ws.offset);
ws.offset += notesize;
@@ -283,19 +286,14 @@
}
int
-ELFNAMEEND(coredump_notes)(struct proc *p, struct vnode *vp,
- struct ucred *cred, int *sizep, off_t offset)
+ELFNAMEEND(coredump_notes)(struct proc *p, struct lwp *l, struct vnode *vp,
+ struct ucred *cred, size_t *sizep, off_t offset)
{
struct netbsd_elfcore_procinfo cpi;
Elf_Nhdr nhdr;
- int size, notesize, error;
- char name[64];
- int namesize;
- struct lwp *l;
- struct reg intreg;
-#ifdef PT_GETFPREGS
- struct fpreg freg;
-#endif
+ size_t size, notesize;
+ int error;
+ struct lwp *l0;
size = 0;
@@ -350,59 +348,30 @@
/* XXX Add hook for machdep per-proc notes. */
/*
+ * Now write the register info for the thread that caused the
+ * coredump.
+ */
+ error = ELFNAMEEND(coredump_note)(p, l, vp, cred, ¬esize, offset);
+ if (error)
+ return (error);
+ if (offset)
+ offset += notesize;
+ size += notesize;
+
+ /*
* Now, for each LWP, write the register info and any other
* per-LWP notes.
*/
- LIST_FOREACH(l, &p->p_lwps, l_sibling) {
- sprintf(name, "%s@%d", ELF_NOTE_NETBSD_CORE_NAME, l->l_lid);
- namesize = strlen(name) + 1;
-
- notesize = sizeof(nhdr) + elfround(namesize) +
- elfround(sizeof(intreg));
- if (offset) {
- PHOLD(l);
- error = process_read_regs(l, &intreg);
- PRELE(l);
- if (error)
- return (error);
-
- nhdr.n_namesz = namesize;
- nhdr.n_descsz = sizeof(intreg);
- nhdr.n_type = PT_GETREGS;
-
- error = ELFNAMEEND(coredump_writenote)(p, vp, cred,
- offset, &nhdr, name, &intreg);
- if (error)
- return (error);
-
+ LIST_FOREACH(l0, &p->p_lwps, l_sibling) {
+ if (l0 == l) /* we've taken care of this thread */
+ continue;
+ error = ELFNAMEEND(coredump_note)(p, l0, vp, cred,
+ ¬esize, offset);
+ if (error)
+ return (error);
+ if (offset)
offset += notesize;
- }
size += notesize;
-
-#ifdef PT_GETFPREGS
- notesize = sizeof(nhdr) + elfround(namesize) +
- elfround(sizeof(freg));
- if (offset) {
- PHOLD(l);
- error = process_read_fpregs(l, &freg);
- PRELE(l);
- if (error)
- return (error);
-
- nhdr.n_namesz = namesize;
- nhdr.n_descsz = sizeof(freg);
- nhdr.n_type = PT_GETFPREGS;
-
- error = ELFNAMEEND(coredump_writenote)(p, vp, cred,
- offset, &nhdr, name, &freg);
- if (error)
- return (error);
-
- offset += notesize;
- }
- size += notesize;
-#endif
- /* XXX Add hook for machdep per-LWP notes. */
}
*sizep = size;
@@ -410,6 +379,72 @@
}
int
+ELFNAMEEND(coredump_note)(struct proc *p, struct lwp *l, struct vnode *vp,
+ struct ucred *cred, size_t *sizep, off_t offset)
+{
+ Elf_Nhdr nhdr;
+ int size, notesize, error;
+ int namesize;
+ char name[64];
+ struct reg intreg;
+#ifdef PT_GETFPREGS
+ struct fpreg freg;
+#endif
+
+ size = 0;
+
+ sprintf(name, "%s@%d", ELF_NOTE_NETBSD_CORE_NAME, l->l_lid);
+ namesize = strlen(name) + 1;
+
+ notesize = sizeof(nhdr) + elfround(namesize) + elfround(sizeof(intreg));
+ if (offset) {
+ PHOLD(l);
+ error = process_read_regs(l, &intreg);
+ PRELE(l);
+ if (error)
+ return (error);
+
+ nhdr.n_namesz = namesize;
+ nhdr.n_descsz = sizeof(intreg);
+ nhdr.n_type = PT_GETREGS;
+
+ error = ELFNAMEEND(coredump_writenote)(p, vp, cred,
+ offset, &nhdr, name, &intreg);
+ if (error)
+ return (error);
+
+ offset += notesize;
+ }
+ size += notesize;
+
+#ifdef PT_GETFPREGS
+ notesize = sizeof(nhdr) + elfround(namesize) + elfround(sizeof(freg));
+ if (offset) {
+ PHOLD(l);
+ error = process_read_fpregs(l, &freg);
+ PRELE(l);
+ if (error)
+ return (error);
+
+ nhdr.n_namesz = namesize;
+ nhdr.n_descsz = sizeof(freg);
+ nhdr.n_type = PT_GETFPREGS;
+
+ error = ELFNAMEEND(coredump_writenote)(p, vp, cred,
+ offset, &nhdr, name, &freg);
+ if (error)
+ return (error);
+
+ offset += notesize;
+ }
+ size += notesize;
+#endif
+ *sizep = size;
+ /* XXX Add hook for machdep per-LWP notes. */
+ return (0);
+}
+
+int
ELFNAMEEND(coredump_writenote)(struct proc *p, struct vnode *vp,
struct ucred *cred, off_t offset, Elf_Nhdr *nhdr, const char *name,
void *data)
Home |
Main Index |
Thread Index |
Old Index