From owner-svn-src-all@freebsd.org Mon Dec 10 01:03:18 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09AED130C78D; Mon, 10 Dec 2018 01:03:18 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9EF5B86C06; Mon, 10 Dec 2018 01:03:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5FE4D19019; Mon, 10 Dec 2018 01:03:17 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBA13HJV037408; Mon, 10 Dec 2018 01:03:17 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBA13GQN037405; Mon, 10 Dec 2018 01:03:16 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201812100103.wBA13GQN037405@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 10 Dec 2018 01:03:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r341777 - in stable/12: lib/libprocstat usr.bin/fstat usr.bin/procstat X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/12: lib/libprocstat usr.bin/fstat usr.bin/procstat X-SVN-Commit-Revision: 341777 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9EF5B86C06 X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.99)[-0.990,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2018 01:03:18 -0000 Author: kib Date: Mon Dec 10 01:03:16 2018 New Revision: 341777 URL: https://svnweb.freebsd.org/changeset/base/341777 Log: MFC r341448: Print type designator 'D' for the KF_TYPE_DEV files. Modified: stable/12/lib/libprocstat/libprocstat.c stable/12/lib/libprocstat/libprocstat.h stable/12/usr.bin/fstat/fstat.c stable/12/usr.bin/procstat/procstat_files.c Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libprocstat/libprocstat.c ============================================================================== --- stable/12/lib/libprocstat/libprocstat.c Mon Dec 10 01:01:43 2018 (r341776) +++ stable/12/lib/libprocstat/libprocstat.c Mon Dec 10 01:03:16 2018 (r341777) @@ -588,6 +588,10 @@ procstat_getfiles_kvm(struct procstat *procstat, struc type = PS_FST_TYPE_PROCDESC; data = file.f_data; break; + case DTYPE_DEV: + type = PS_FST_TYPE_DEV; + data = file.f_data; + break; default: continue; } @@ -673,6 +677,7 @@ kinfo_type2fst(int kftype) } kftypes2fst[] = { { KF_TYPE_PROCDESC, PS_FST_TYPE_PROCDESC }, { KF_TYPE_CRYPTO, PS_FST_TYPE_CRYPTO }, + { KF_TYPE_DEV, PS_FST_TYPE_DEV }, { KF_TYPE_FIFO, PS_FST_TYPE_FIFO }, { KF_TYPE_KQUEUE, PS_FST_TYPE_KQUEUE }, { KF_TYPE_MQUEUE, PS_FST_TYPE_MQUEUE }, Modified: stable/12/lib/libprocstat/libprocstat.h ============================================================================== --- stable/12/lib/libprocstat/libprocstat.h Mon Dec 10 01:01:43 2018 (r341776) +++ stable/12/lib/libprocstat/libprocstat.h Mon Dec 10 01:03:16 2018 (r341777) @@ -71,6 +71,7 @@ #define PS_FST_TYPE_UNKNOWN 11 #define PS_FST_TYPE_NONE 12 #define PS_FST_TYPE_PROCDESC 13 +#define PS_FST_TYPE_DEV 14 /* * Special descriptor numbers. Modified: stable/12/usr.bin/fstat/fstat.c ============================================================================== --- stable/12/usr.bin/fstat/fstat.c Mon Dec 10 01:01:43 2018 (r341776) +++ stable/12/usr.bin/fstat/fstat.c Mon Dec 10 01:03:16 2018 (r341777) @@ -301,6 +301,8 @@ print_file_info(struct procstat *procstat, struct file case PS_FST_TYPE_SEM: print_sem_info(procstat, fst); break; + case PS_FST_TYPE_DEV: + break; default: if (vflg) fprintf(stderr, Modified: stable/12/usr.bin/procstat/procstat_files.c ============================================================================== --- stable/12/usr.bin/procstat/procstat_files.c Mon Dec 10 01:01:43 2018 (r341776) +++ stable/12/usr.bin/procstat/procstat_files.c Mon Dec 10 01:03:16 2018 (r341777) @@ -408,6 +408,11 @@ procstat_files(struct procstat *procstat, struct kinfo xo_emit("{eq:fd_type/procdesc}"); break; + case PS_FST_TYPE_DEV: + str = "D"; + xo_emit("{eq:fd_type/dev}"); + break; + case PS_FST_TYPE_NONE: str = "?"; xo_emit("{eq:fd_type/none}");