d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imgact_elf: Rename the segment iterator to match reality

Browse Source 
The each_writable_segment routine evaluates segments on a slightly little more
nuanced metric than simply "writable" or not.  Rename the function to more
closely match its behavior (each_dumpable_segment).

Suggested by:	jhb
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Conrad Meyer 2016-07-20 22:51:33 +00:00
parent d82d5ebec6
commit 1005d8aff4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/imgact_elf.c
View File

@ -1163,7 +1163,7 @@ static void cb_put_phdr(vm_map_entry_t, void *);
static void cb_size_segment(vm_map_entry_t, void *); static void cb_size_segment(vm_map_entry_t, void *);
static int core_write(struct coredump_params *, void *, size_t, off_t, static int core_write(struct coredump_params *, void *, size_t, off_t,
enum uio_seg); enum uio_seg);
static void each_writable_segment(struct thread *, segment_callback, void *); static void each_dumpable_segment(struct thread *, segment_callback, void *);
static int __elfN(corehdr)(struct coredump_params *, int, void *, size_t, static int __elfN(corehdr)(struct coredump_params *, int, void *, size_t,
struct note_info_list *, size_t); struct note_info_list *, size_t);
static void __elfN(prepare_notes)(struct thread *, struct note_info_list *, static void __elfN(prepare_notes)(struct thread *, struct note_info_list *,
@ -1317,7 +1317,7 @@ __elfN(coredump)(struct thread *td, struct vnode *vp, off_t limit, int flags)
/* Size the program segments. */ /* Size the program segments. */
seginfo.count = 0; seginfo.count = 0;
seginfo.size = 0; seginfo.size = 0;
each_writable_segment(td, cb_size_segment, &seginfo); each_dumpable_segment(td, cb_size_segment, &seginfo);
/* /*
* Collect info about the core file header area. * Collect info about the core file header area.
@ -1419,7 +1419,7 @@ done:
} }
/* /*
* A callback for each_writable_segment() to write out the segment's * A callback for each_dumpable_segment() to write out the segment's
* program header entry. * program header entry.
*/ */
static void static void
@ -1445,7 +1445,7 @@ cb_put_phdr(entry, closure)
} }
/* /*
* A callback for each_writable_segment() to gather information about * A callback for each_dumpable_segment() to gather information about
* the number of segments and their total size. * the number of segments and their total size.
*/ */
static void static void
@ -1463,7 +1463,7 @@ cb_size_segment(vm_map_entry_t entry, void *closure)
* caller-supplied data. * caller-supplied data.
*/ */
static void static void
each_writable_segment(struct thread *td, segment_callback func, void *closure) each_dumpable_segment(struct thread *td, segment_callback func, void *closure)
{ {
struct proc *p = td->td_proc; struct proc *p = td->td_proc;
vm_map_t map = &p->p_vmspace->vm_map; vm_map_t map = &p->p_vmspace->vm_map;
@ -1694,7 +1694,7 @@ __elfN(puthdr)(struct thread *td, void *hdr, size_t hdrsize, int numsegs,
/* All the writable segments from the program. */ /* All the writable segments from the program. */
phc.phdr = phdr; phc.phdr = phdr;
phc.offset = round_page(hdrsize + notesz); phc.offset = round_page(hdrsize + notesz);
each_writable_segment(td, cb_put_phdr, &phc); each_dumpable_segment(td, cb_put_phdr, &phc);
} }
static size_t static size_t