Sorry, forgot updating the git log.
Has posted a new one, please review v5.
On 08/25/14 at 11:33am, Baoquan He wrote:
> Add 2 preparation functions get_elf_loads and get_page_offset, later
> they will be needed for parsing vmcoreinfo.
>
> Meanwhile since get_kernel_version need be called to get page_offset
> before initial() in mem_usage code flow, and surely it will be called
> inside initial() again. Add a static variable to avoid this duplicate
> calling.
>
> Signed-off-by: Baoquan He <bhe at redhat.com>
> ---
> elf_info.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
> elf_info.h | 1 +
> makedumpfile.c | 18 ++++++++++++++++++
> 3 files changed, 69 insertions(+)
>
> diff --git a/elf_info.c b/elf_info.c
> index b277f69..69d3fdb 100644
> --- a/elf_info.c
> +++ b/elf_info.c
> @@ -681,6 +681,56 @@ get_elf32_ehdr(int fd, char *filename, Elf32_Ehdr *ehdr)
> return TRUE;
> }
>
> +int
> +get_elf_loads(int fd, char *filename)
> +{
> + int i, j, phnum, elf_format;
> + Elf64_Phdr phdr;
> +
> + /*
> + * Check ELF64 or ELF32.
> + */
> + elf_format = check_elf_format(fd, filename, &phnum, &num_pt_loads);
> + if (elf_format == ELF64)
> + flags_memory |= MEMORY_ELF64;
> + else if (elf_format != ELF32)
> + return FALSE;
> +
> + if (!num_pt_loads) {
> + ERRMSG("Can't get the number of PT_LOAD.\n");
> + return FALSE;
> + }
> +
> + /*
> + * The below file information will be used as /proc/vmcore.
> + */
> + fd_memory = fd;
> + name_memory = filename;
> +
> + pt_loads = calloc(sizeof(struct pt_load_segment), num_pt_loads);
> + if (pt_loads == NULL) {
> + ERRMSG("Can't allocate memory for the PT_LOAD. %s\n",
> + strerror(errno));
> + return FALSE;
> + }
> + for (i = 0, j = 0; i < phnum; i++) {
> + if (!get_phdr_memory(i, &phdr))
> + return FALSE;
> +
> + if (phdr.p_type != PT_LOAD)
> + continue;
> +
> + if (j >= num_pt_loads)
> + return FALSE;
> + if(!dump_Elf_load(&phdr, j))
> + return FALSE;
> + j++;
> + }
> +
> + return TRUE;
> +}
> +
> +
> /*
> * Get ELF information about /proc/vmcore.
> */
> diff --git a/elf_info.h b/elf_info.h
> index 801faff..263d993 100644
> --- a/elf_info.h
> +++ b/elf_info.h
> @@ -44,6 +44,7 @@ int get_elf64_ehdr(int fd, char *filename, Elf64_Ehdr *ehdr);
> int get_elf32_ehdr(int fd, char *filename, Elf32_Ehdr *ehdr);
> int get_elf_info(int fd, char *filename);
> void free_elf_info(void);
> +int get_elf_loads(int fd, char *filename);
>
> int is_elf64_memory(void);
> int is_xen_memory(void);
> diff --git a/makedumpfile.c b/makedumpfile.c
> index 44cf26f..8c8ca91 100644
> --- a/makedumpfile.c
> +++ b/makedumpfile.c
> @@ -682,6 +682,9 @@ get_kernel_version(char *release)
> long maj, min, rel;
> char *start, *end;
>
> + if (info->kernel_version)
> + return info->kernel_version;
> +
> /*
> * This method checks that vmlinux and vmcore are same kernel version.
> */
> @@ -706,6 +709,7 @@ get_kernel_version(char *release)
> MSG("The kernel version is not supported.\n");
> MSG("The created dumpfile may be incomplete.\n");
> }
> +
> return version;
> }
>
> @@ -9125,6 +9129,20 @@ int is_crashkernel_mem_reserved(void)
> return !!crash_reserved_mem_nr;
> }
>
> +static int get_page_offset()
> +{
> + struct utsname utsname;
> + if (uname(&utsname)) {
> + ERRMSG("Cannot get name and information about current kernel : %s", strerror(errno));
> + return FALSE;
> + }
> +
> + info->kernel_version = get_kernel_version(utsname.release);
> + get_versiondep_info();
> +
> + return TRUE;
> +}
> +
> static struct option longopts[] = {
> {"split", no_argument, NULL, OPT_SPLIT},
> {"reassemble", no_argument, NULL, OPT_REASSEMBLE},
> --
> 1.8.5.3
>
