1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
--- sysdeps/freebsd/procwd.c.orig 2008-02-09 12:46:32.000000000 -0500
+++ sysdeps/freebsd/procwd.c 2008-02-09 12:48:24.000000000 -0500
@@ -24,7 +24,9 @@
#include <glibtop_private.h>
#include <sys/types.h>
+#include <sys/sysctl.h>
#include <sys/param.h>
+#include <sys/user.h>
#include <string.h>
static const unsigned long _glibtop_sysdeps_proc_wd =
@@ -38,6 +40,7 @@ _glibtop_init_proc_wd_s(glibtop *server)
server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd;
}
+#if __FreeBSD_version < 800019
static GPtrArray *
parse_output(const char *output, glibtop_proc_wd *buf)
{
@@ -89,12 +92,21 @@ parse_output(const char *output, glibtop
return dirs;
}
+#endif
char**
glibtop_get_proc_wd_s(glibtop *server, glibtop_proc_wd *buf, pid_t pid)
{
char path[MAXPATHLEN];
+#if __FreeBSD_version > 800018
+ struct kinfo_file *freep, *kif;
+ GPtrArray *dirs;
+ size_t len;
+ int i;
+ int name[4];
+#else
char *output;
+#endif
memset (buf, 0, sizeof (glibtop_proc_wd));
@@ -102,6 +114,43 @@ glibtop_get_proc_wd_s(glibtop *server, g
if (safe_readlink(path, buf->exe, sizeof(buf->exe)))
buf->flags |= (1 << GLIBTOP_PROC_WD_EXE);
+#if __FreeBSD_version > 800018
+ name[0] = CTL_KERN;
+ name[1] = KERN_PROC;
+ name[2] = KERN_PROC_FILEDESC;
+ name[3] = pid;
+
+ if (sysctl(name, 4, NULL, &len, NULL, 0) < 0)
+ return NULL;
+ freep = kif = g_malloc(len);
+ if (sysctl(name, 4, kif, &len, NULL, 0) < 0) {
+ g_free(freep);
+ return NULL;
+ }
+
+ dirs = g_ptr_array_sized_new(1);
+
+ for (i = 0; i < len / sizeof(*kif); i++, kif++) {
+ switch (kif->kf_fd) {
+ case KF_FD_TYPE_ROOT:
+ g_strlcpy(buf->root, kif->kf_path,
+ sizeof(buf->root));
+ buf->flags |= (1 << GLIBTOP_PROC_WD_ROOT);
+ break;
+ case KF_FD_TYPE_CWD:
+ g_ptr_array_add(dirs, g_strdup (kif->kf_path));
+ break;
+ }
+ }
+ g_free(freep);
+
+ buf->number = dirs->len;
+ buf->flags |= (1 << GLIBTOP_PROC_WD_NUMBER);
+
+ g_ptr_array_add(dirs, NULL);
+
+ return (char **)g_ptr_array_free(dirs, FALSE);
+#else
output = execute_lsof(pid);
if (output != NULL) {
GPtrArray *dirs;
@@ -116,6 +165,7 @@ glibtop_get_proc_wd_s(glibtop *server, g
return (char **)g_ptr_array_free(dirs, FALSE);
}
+#endif
return NULL;
}
|
