ruby-changes:33227
From: naruse <ko1@a...>
Date: Tue, 11 Mar 2014 02:11:02 +0900 (JST)
Subject: [ruby-changes:33227] naruse:r45306 (trunk): * vm_dump.c (rb_vm_bugreport): show vm maps on FreeBSD.
naruse 2014-03-11 02:10:57 +0900 (Tue, 11 Mar 2014) New Revision: 45306 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45306 Log: * vm_dump.c (rb_vm_bugreport): show vm maps on FreeBSD. * vm_dump.c (procstat_vm): copied from FreeBSD. http://svnweb.freebsd.org/base/head/usr.bin/procstat/procstat_vm.c?revision=261780 Modified files: trunk/ChangeLog trunk/LEGAL trunk/vm_dump.c Index: LEGAL =================================================================== --- LEGAL (revision 45305) +++ LEGAL (revision 45306) @@ -231,6 +231,34 @@ random.c https://github.com/ruby/ruby/blob/trunk/LEGAL#L231 http://www.math.keio.ac.jp/matumoto/emt.html email: matumoto@m... +vm_dump.c:procstat_vm + + * Copyright (c) 2007 Robert N. M. Watson + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: head/usr.bin/procstat/procstat_vm.c 261780 2014-02-11 21:57:37Z jhb $ + vsnprintf.c: This file is under the old-style BSD license. Note that the Index: ChangeLog =================================================================== --- ChangeLog (revision 45305) +++ ChangeLog (revision 45306) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Tue Mar 11 02:04:36 2014 NARUSE, Yui <naruse@r...> + + * vm_dump.c (rb_vm_bugreport): show vm maps on FreeBSD. + + * vm_dump.c (procstat_vm): copied from FreeBSD. + http://svnweb.freebsd.org/base/head/usr.bin/procstat/procstat_vm.c?revision=261780 + Mon Mar 10 12:14:26 2014 NARUSE, Yui <naruse@r...> * configure.in: always check dladdr(1). Index: vm_dump.c =================================================================== --- vm_dump.c (revision 45305) +++ vm_dump.c (revision 45306) @@ -704,6 +704,90 @@ rb_print_backtrace(void) https://github.com/ruby/ruby/blob/trunk/vm_dump.c#L704 #endif } +#ifdef __FreeBSD__ +#include <sys/user.h> +#include <sys/sysctl.h> +#include <sys/param.h> +#include <libprocstat.h> +# ifndef KVME_TYPE_MGTDEVICE +# define KVME_TYPE_MGTDEVICE 8 +# endif +void +procstat_vm(struct procstat *procstat, struct kinfo_proc *kipp) +{ + struct kinfo_vmentry *freep, *kve; + int ptrwidth; + unsigned int i, cnt; + const char *str; +#ifdef __x86_64__ + ptrwidth = 14; +#else + ptrwidth = 2*sizeof(void *) + 2; +#endif + fprintf(stderr, "%*s %*s %3s %4s %4s %3s %3s %4s %-2s %-s\n", + ptrwidth, "START", ptrwidth, "END", "PRT", "RES", + "PRES", "REF", "SHD", "FL", "TP", "PATH"); + + freep = procstat_getvmmap(procstat, kipp, &cnt); + if (freep == NULL) + return; + for (i = 0; i < cnt; i++) { + kve = &freep[i]; + fprintf(stderr, "%#*jx ", ptrwidth, (uintmax_t)kve->kve_start); + fprintf(stderr, "%#*jx ", ptrwidth, (uintmax_t)kve->kve_end); + fprintf(stderr, "%s", kve->kve_protection & KVME_PROT_READ ? "r" : "-"); + fprintf(stderr, "%s", kve->kve_protection & KVME_PROT_WRITE ? "w" : "-"); + fprintf(stderr, "%s ", kve->kve_protection & KVME_PROT_EXEC ? "x" : "-"); + fprintf(stderr, "%4d ", kve->kve_resident); + fprintf(stderr, "%4d ", kve->kve_private_resident); + fprintf(stderr, "%3d ", kve->kve_ref_count); + fprintf(stderr, "%3d ", kve->kve_shadow_count); + fprintf(stderr, "%-1s", kve->kve_flags & KVME_FLAG_COW ? "C" : "-"); + fprintf(stderr, "%-1s", kve->kve_flags & KVME_FLAG_NEEDS_COPY ? "N" : + "-"); + fprintf(stderr, "%-1s", kve->kve_flags & KVME_FLAG_SUPER ? "S" : "-"); + fprintf(stderr, "%-1s ", kve->kve_flags & KVME_FLAG_GROWS_UP ? "U" : + kve->kve_flags & KVME_FLAG_GROWS_DOWN ? "D" : "-"); + switch (kve->kve_type) { + case KVME_TYPE_NONE: + str = "--"; + break; + case KVME_TYPE_DEFAULT: + str = "df"; + break; + case KVME_TYPE_VNODE: + str = "vn"; + break; + case KVME_TYPE_SWAP: + str = "sw"; + break; + case KVME_TYPE_DEVICE: + str = "dv"; + break; + case KVME_TYPE_PHYS: + str = "ph"; + break; + case KVME_TYPE_DEAD: + str = "dd"; + break; + case KVME_TYPE_SG: + str = "sg"; + break; + case KVME_TYPE_MGTDEVICE: + str = "md"; + break; + case KVME_TYPE_UNKNOWN: + default: + str = "??"; + break; + } + fprintf(stderr, "%-2s ", str); + fprintf(stderr, "%-s\n", kve->kve_path); + } + free(freep); +} +#endif + void rb_vm_bugreport(void) { @@ -803,5 +887,25 @@ rb_vm_bugreport(void) https://github.com/ruby/ruby/blob/trunk/vm_dump.c#L887 } } #endif /* __linux__ */ +#ifdef __FreeBSD__ +# define MIB_KERN_PROC_PID_LEN 4 + int mib[MIB_KERN_PROC_PID_LEN]; + struct kinfo_proc kp; + size_t len = sizeof(struct kinfo_proc); + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_PID; + mib[3] = getpid(); + if (sysctl(mib, MIB_KERN_PROC_PID_LEN, &kp, &len, NULL, 0) == -1) { + perror("sysctl"); + } + else { + struct procstat *prstat = procstat_open_sysctl(); + fprintf(stderr, "* Process memory map:\n\n"); + procstat_vm(prstat, &kp); + procstat_close(prstat); + fprintf(stderr, "\n"); + } +#endif /* __FreeBSD__ */ } } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/