summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-02-07 08:53:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-02-07 08:53:13 +0000
commita67788b2f365d993c879ad0754f41bc64389459c (patch)
treed57a3005a9032ad44abcd5939e879e630d637e70
parent18365f9e83ef8f8402426024de4777f1f831ba37 (diff)
Split procstat_vm.c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--LEGAL4
-rw-r--r--common.mk1
-rw-r--r--missing/procstat_vm.c85
-rw-r--r--vm_dump.c86
4 files changed, 89 insertions, 87 deletions
diff --git a/LEGAL b/LEGAL
index faa971c..565c4c9 100644
--- a/LEGAL
+++ b/LEGAL
@@ -382,9 +382,9 @@ missing/mt19937.c::
The Wayback Machine url: http://web.archive.org/web/19990429082237/http://www.math.keio.ac.jp/matumoto/emt.html
-vm_dump.c:procstat_vm::
+missing/procstat_vm.c::
- This file contains the source code under the new-style BSD license.
+ This file is under the new-style BSD license.
>>>
Copyright (c) 2007 Robert N. M. Watson
diff --git a/common.mk b/common.mk
index a409b11..79e9cb9 100644
--- a/common.mk
+++ b/common.mk
@@ -3195,6 +3195,7 @@ vm_dump.$(OBJEXT): {$(VPATH)}missing.h
vm_dump.$(OBJEXT): {$(VPATH)}node.h
vm_dump.$(OBJEXT): {$(VPATH)}onigmo.h
vm_dump.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_dump.$(OBJEXT): {$(VPATH)}procstat_vm.c
vm_dump.$(OBJEXT): {$(VPATH)}ruby_assert.h
vm_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h
vm_dump.$(OBJEXT): {$(VPATH)}st.h
diff --git a/missing/procstat_vm.c b/missing/procstat_vm.c
new file mode 100644
index 0000000..f56c406
--- /dev/null
+++ b/missing/procstat_vm.c
@@ -0,0 +1,85 @@
+#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");
+
+#ifdef HAVE_PROCSTAT_GETVMMAP
+ freep = procstat_getvmmap(procstat, kipp, &cnt);
+#else
+ freep = kinfo_getvmmap(kipp->ki_pid, &cnt);
+#endif
+ 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);
+}
diff --git a/vm_dump.c b/vm_dump.c
index 1d36eb0..53cc764 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -734,91 +734,7 @@ rb_print_backtrace(void)
}
#ifdef HAVE_LIBPROCSTAT
-#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");
-
-#ifdef HAVE_PROCSTAT_GETVMMAP
- freep = procstat_getvmmap(procstat, kipp, &cnt);
-#else
- freep = kinfo_getvmmap(kipp->ki_pid, &cnt);
-#endif
- 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);
-}
+#include "missing/procstat_vm.c"
#endif
#if defined __linux__