Annotation of pkgsrc/sysutils/lsof/patches/patch-ae, revision 1.7
1.7 ! atatat 1: $NetBSD: patch-ae,v 1.6 2004/11/30 02:02:13 atatat Exp $
1.1 atatat 2:
1.5 atatat 3: Incorporate a patch from the author that widens the NETBSDV definition
4: to account for new current versioning system, properly handles the
5: sys/bufq.h mess, adds a bit more to procfs support, and adds ptyfs
6: support.
1.1 atatat 7:
1.5 atatat 8: --- dialects/n+obsd/dnode.c.orig 2004-07-06 15:20:23.000000000 -0400
9: +++ dialects/n+obsd/dnode.c
10: @@ -188,7 +188,7 @@ process_node(va)
11: struct mfsnode m;
12: struct nfsnode n;
13: enum nodetype {NONODE, CDFSNODE, DOSNODE, EXT2NODE, FDESCNODE, INODE,
14: - KERNFSNODE, MFSNODE, NFSNODE, PFSNODE} nty;
15: + KERNFSNODE, MFSNODE, NFSNODE, PFSNODE, PTYFSNODE} nty;
16: enum vtype type;
17: struct vnode *v, vb;
18: struct l_vfs *vfs;
19: @@ -262,6 +262,11 @@ process_node(va)
20: size_t sz;
21: #endif /* defined(HASPROCFS) */
1.3 atatat 22:
1.5 atatat 23: +#if defined(HASPTYFS)
24: + struct ptyfsnode pt;
25: + struct specinfo si;
26: +#endif /* defined(HASPTYFS) */
27: +
28: #if defined(HASNULLFS)
29:
30: process_overlaid_node:
31: @@ -523,6 +528,19 @@ process_overlaid_node:
32: break;
33: #endif /* defined(HASPROCFS) */
34:
35: +#if defined(HASPTYFS)
36: + case VT_PTYFS:
37: + if (!v->v_data
38: + || kread((KA_T)v->v_data, (char *)&pt, sizeof(pt))) {
39: + (void) snpf(Namech, Namechl, "can't read ptyfsnode at: %s",
40: + print_kptr((KA_T)v->v_data, (char *)NULL, 0));
41: + enter_nm(Namech);
42: + return;
43: + }
44: + nty = PTYFSNODE;
45: + break;
46: +#endif /* defined(HASPTYFS) */
47: +
48: #if defined(HASEXT2FS)
49: case VT_EXT2FS:
50: #endif /* defined(HASEXT2FS) */
51: @@ -769,6 +787,21 @@ process_overlaid_node:
52: case NFSNODE:
53: dev = NVATTR.va_fsid;
54: devs = 1;
55: +
56: +#if defined(HASPTYFS)
57: + case PTYFSNODE:
58: + if (v->v_un.vu_specinfo
59: + && !kread((KA_T)v->v_un.vu_specinfo, (char *)&si, sizeof(si))) {
60: + rdev = si.si_rdev;
61: + rdevs = 1;
62: + }
63: + if (vfs) {
64: + dev = (dev_t)vfs->fsid.__fsid_val[0];
65: + devs = 1;
66: + }
67: + break;
68: +#endif /* defined(HASPTYFS) */
69: +
70: }
71: /*
72: * Obtain the inode number.
1.7 ! atatat 73: @@ -836,6 +869,20 @@ process_overlaid_node:
1.5 atatat 74: break;
75: #endif /* defined(HASPROCFS) */
76:
77: +#if defined(HASPTYFS)
78: + case PTYFSNODE:
1.7 ! atatat 79: + if (pt.ptyfs_type == PTYFSptc) {
! 80: + if (pt.ptyfs_fileno >= 0x3fffffff)
! 81: + Lf->inode = (unsigned long)(pt.ptyfs_fileno & 0x3fffffff);
! 82: + else
! 83: + Lf->inode = (unsigned long)(pt.ptyfs_fileno - 1);
! 84: + }
1.6 atatat 85: + else
86: + Lf->inode = (unsigned long)pt.ptyfs_fileno;
1.5 atatat 87: + Lf->inp_ty = 1;
88: + break;
89: +#endif /* defined(HASPTYFS) */
90: +
91: }
92:
93: /*
1.6 atatat 94: @@ -1009,27 +1052,26 @@ process_overlaid_node:
95: switch (nty) {
96: case INODE:
97:
98: +#if defined(HASEFFNLINK)
99: + Lf->nlink = (long)i.HASEFFNLINK;
100: +#else /* !defined(HASEFFNLINK) */
101: # if defined(HASI_FFS)
102: Lf->nlink = (long)i.i_ffs_nlink;
103: - Lf->nlink_def = 1;
104: # else /* !defined(HASI_FFS) */
105: # if defined(HASI_FFS1)
106: if (ffs == 1) {
107: - if (u1s) {
108: + if (u1s)
109: Lf->nlink = (long)u1.di_nlink;
110: - Lf->nlink_def = 1;
111: - }
112: } else if (ffs == 2) {
113: - if (u2s) {
114: + if (u2s)
115: Lf->nlink = (long)u2.di_nlink;
116: - Lf->nlink_def = 1;
117: - }
118: }
119: # else /* !defined(HASI_FFS1) */
120: +
121: Lf->nlink = (long)i.i_nlink;
122: - Lf->nlink_def = 1;
123: # endif /* defined(HASI_FFS1) */
124: # endif /* defined(HASI_FFS) */
125: +#endif /* defined(HASEFFNLINK) */
126:
127: Lf->nlink_def = 1;
128: break;
129: @@ -1152,7 +1194,8 @@ process_overlaid_node:
1.5 atatat 130: * ioctl(fd, TIOCNOTTY) files;
131: * /kern files
132: * memory node files;
133: - * /proc files.
134: + * /proc files;
135: + * ptyfs files.
136: */
137:
138: if (type == VBAD)
1.6 atatat 139: @@ -1222,14 +1265,62 @@ process_overlaid_node:
1.5 atatat 140: (void) snpf(ep, sz, "/%d/notepg", p.pfs_pid);
141: ty = "PGID";
142: break;
1.6 atatat 143: +
144: +# if defined(Pfd)
1.5 atatat 145: + case Pfd:
146: + ep = endnm(&sz);
147: + (void) snpf(ep, sz, "/%d/fd", p.pfs_pid);
148: + ty = "PFD";
149: + break;
1.6 atatat 150: +# endif /* defined(Pfd) */
151: +
152: +# if defined(Pmap)
1.5 atatat 153: + case Pmap:
154: + ep = endnm(&sz);
155: + (void) snpf(ep, sz, "/%d/map", p.pfs_pid);
156: + ty = "PMAP";
157: + break;
1.6 atatat 158: +# endif /* defined(Pmap) */
159: +
160: +# if defined(Pmaps)
1.5 atatat 161: + case Pmaps:
162: + ep = endnm(&sz);
163: + (void) snpf(ep, sz, "/%d/maps", p.pfs_pid);
164: + ty = "PMPS";
165: + break;
1.6 atatat 166: +# endif /* defined(Pmaps) */
167: +
1.5 atatat 168: }
169: if (ty)
170: (void) snpf(Lf->type, sizeof(Lf->type), ty);
171: - if (Namech[0])
172: - enter_nm(Namech);
173: }
174: #endif /* defined(HASPROCFS) */
175:
176: +#if defined(HASPTYFS)
177: + else if (nty == PTYFSNODE) {
178: + (void) snpf(Namech, Namechl, "%s", Lf->fsdir);
179: + Lf->nlink = 1;
180: + Lf->nlink_def = 1;
181: + switch (pt.ptyfs_type) {
182: + case PTYFSpts:
183: + ep = endnm(&sz);
184: + (void) snpf(ep, sz, "/%lu", (unsigned long)pt.ptyfs_pty);
185: + break;
186: + case PTYFSptc:
187: + ep = endnm(&sz);
188: + (void) snpf(ep, sz, "/%lu (master)",
189: + (unsigned long)pt.ptyfs_pty);
190: + break;
191: + case PTYFSroot:
192: + Lf->sz = 512;
193: + Lf->sz_def = 1;
194: + break;
195: + }
196: + if (ty)
197: + (void) snpf(Lf->type, sizeof(Lf->type), ty);
198: + }
199: +#endif /* defined(HASPTYFS) */
200: +
201: #if defined(HASBLKDEV)
202: /*
203: * If this is a VBLK file and it's missing an inode number, try to
1.6 atatat 204: @@ -1283,7 +1374,9 @@ process_overlaid_node:
1.5 atatat 205: if (Sfile && is_file_named((char *)NULL,
206: ((type == VCHR) || (type == VBLK)) ? 1
207: : 0))
208: + {
209: Lf->sf |= SELNM;
210: + }
211: if (ns)
212: Namech[0] = '\0';
213: }
CVSweb <webmaster@jp.NetBSD.org>