From owner-svn-src-projects@FreeBSD.ORG Thu Jul 16 16:38:41 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78F40106566C; Thu, 16 Jul 2009 16:38:41 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6719F8FC0A; Thu, 16 Jul 2009 16:38:41 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6GGcfiY034338; Thu, 16 Jul 2009 16:38:41 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6GGcfWY034329; Thu, 16 Jul 2009 16:38:41 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200907161638.n6GGcfWY034329@svn.freebsd.org> From: Stanislav Sedov Date: Thu, 16 Jul 2009 16:38:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r195721 - projects/libprocstat/usr.bin/fstat X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jul 2009 16:38:41 -0000 Author: stas Date: Thu Jul 16 16:38:41 2009 New Revision: 195721 URL: http://svn.freebsd.org/changeset/base/195721 Log: - Move libprocstat structures definition to the appropriate header. Modified: projects/libprocstat/usr.bin/fstat/cd9660.c projects/libprocstat/usr.bin/fstat/common_kvm.c projects/libprocstat/usr.bin/fstat/common_kvm.h projects/libprocstat/usr.bin/fstat/fstat.c projects/libprocstat/usr.bin/fstat/libprocstat.c projects/libprocstat/usr.bin/fstat/libprocstat.h projects/libprocstat/usr.bin/fstat/msdosfs.c projects/libprocstat/usr.bin/fstat/zfs.c Modified: projects/libprocstat/usr.bin/fstat/cd9660.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/cd9660.c Thu Jul 16 15:39:54 2009 (r195720) +++ projects/libprocstat/usr.bin/fstat/cd9660.c Thu Jul 16 16:38:41 2009 (r195721) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "libprocstat.h" #include "common_kvm.h" int Modified: projects/libprocstat/usr.bin/fstat/common_kvm.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/common_kvm.c Thu Jul 16 15:39:54 2009 (r195720) +++ projects/libprocstat/usr.bin/fstat/common_kvm.c Thu Jul 16 16:38:41 2009 (r195721) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "libprocstat.h" #include "common_kvm.h" int Modified: projects/libprocstat/usr.bin/fstat/common_kvm.h ============================================================================== --- projects/libprocstat/usr.bin/fstat/common_kvm.h Thu Jul 16 15:39:54 2009 (r195720) +++ projects/libprocstat/usr.bin/fstat/common_kvm.h Thu Jul 16 16:38:41 2009 (r195721) @@ -29,52 +29,6 @@ #ifndef __COMMON_KVM_H__ #define __COMMON_KVM_H__ -struct filestat { - int fs_type; /* Descriptor type. */ - int fs_flags; /* filestat specific flags. */ - int fs_fflags; /* Descriptor access flags. */ - int fs_fd; /* File descriptor number. */ - void *fs_typedep; /* Type dependent data. */ - STAILQ_ENTRY(filestat) next; -}; - -struct vnstat { - dev_t vn_dev; - char vn_devname[SPECNAMELEN + 1]; - int vn_type; - long vn_fsid; - long vn_fileid; - mode_t vn_mode; - u_long vn_size; - char *mntdir; -}; - -struct ptsstat { - dev_t dev; - char devname[SPECNAMELEN + 1]; -}; - -struct pipestat { - caddr_t addr; - caddr_t peer; - size_t buffer_cnt; -}; - -struct sockstat { - int type; - int proto; - int dom_family; - caddr_t so_addr; - caddr_t so_pcb; - caddr_t inp_ppcb; - caddr_t unp_conn; - int so_snd_sb_state; - int so_rcv_sb_state; - char dname[32]; -}; - -STAILQ_HEAD(filestat_list, filestat); - dev_t dev2udev(kvm_t *kd, struct cdev *dev); int kdevtoname(kvm_t *kd, struct cdev *dev, char *); int kvm_read_all(kvm_t *kd, unsigned long addr, void *buf, Modified: projects/libprocstat/usr.bin/fstat/fstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/fstat.c Thu Jul 16 15:39:54 2009 (r195720) +++ projects/libprocstat/usr.bin/fstat/fstat.c Thu Jul 16 16:38:41 2009 (r195721) @@ -93,7 +93,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "common_kvm.h" #include "functions.h" #include "libprocstat.h" Modified: projects/libprocstat/usr.bin/fstat/libprocstat.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/libprocstat.c Thu Jul 16 15:39:54 2009 (r195720) +++ projects/libprocstat/usr.bin/fstat/libprocstat.c Thu Jul 16 16:38:41 2009 (r195721) @@ -92,8 +92,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include "common_kvm.h" #include "libprocstat.h" +#include "common_kvm.h" /* * Vnode-to-filestat types translation table. Modified: projects/libprocstat/usr.bin/fstat/libprocstat.h ============================================================================== --- projects/libprocstat/usr.bin/fstat/libprocstat.h Thu Jul 16 15:39:54 2009 (r195720) +++ projects/libprocstat/usr.bin/fstat/libprocstat.h Thu Jul 16 16:38:41 2009 (r195721) @@ -82,6 +82,47 @@ struct procstat { int type; kvm_t *kd; }; +struct filestat { + int fs_type; /* Descriptor type. */ + int fs_flags; /* filestat specific flags. */ + int fs_fflags; /* Descriptor access flags. */ + int fs_fd; /* File descriptor number. */ + void *fs_typedep; /* Type dependent data. */ + STAILQ_ENTRY(filestat) next; +}; +struct vnstat { + dev_t vn_dev; + char vn_devname[SPECNAMELEN + 1]; + int vn_type; + long vn_fsid; + long vn_fileid; + mode_t vn_mode; + u_long vn_size; + char *mntdir; +}; +struct ptsstat { + dev_t dev; + char devname[SPECNAMELEN + 1]; +}; +struct pipestat { + caddr_t addr; + caddr_t peer; + size_t buffer_cnt; +}; +struct sockstat { + int type; + int proto; + int dom_family; + caddr_t so_addr; + caddr_t so_pcb; + caddr_t inp_ppcb; + caddr_t unp_conn; + int so_snd_sb_state; + int so_rcv_sb_state; + char dname[32]; +}; + +STAILQ_HEAD(filestat_list, filestat); void procstat_close(struct procstat *procstat); struct filestat_list *procstat_getfiles(struct procstat *procstat, Modified: projects/libprocstat/usr.bin/fstat/msdosfs.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/msdosfs.c Thu Jul 16 15:39:54 2009 (r195720) +++ projects/libprocstat/usr.bin/fstat/msdosfs.c Thu Jul 16 16:38:41 2009 (r195721) @@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$"); */ #define VTODE(vp) ((struct denode *)(vp)->v_data) +#include "libprocstat.h" #include "common_kvm.h" struct dosmount { Modified: projects/libprocstat/usr.bin/fstat/zfs.c ============================================================================== --- projects/libprocstat/usr.bin/fstat/zfs.c Thu Jul 16 15:39:54 2009 (r195720) +++ projects/libprocstat/usr.bin/fstat/zfs.c Thu Jul 16 16:38:41 2009 (r195721) @@ -50,6 +50,7 @@ #include #define ZFS +#include "libprocstat.h" #include "common_kvm.h" /*