From owner-svn-src-head@FreeBSD.ORG Wed Sep 23 12:08:08 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA5D01065672; Wed, 23 Sep 2009 12:08:08 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 982588FC1F; Wed, 23 Sep 2009 12:08:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8NC88ij063281; Wed, 23 Sep 2009 12:08:08 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8NC88sk063275; Wed, 23 Sep 2009 12:08:08 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <200909231208.n8NC88sk063275@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 23 Sep 2009 12:08:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197428 - in head/sys: conf fs/procfs modules/procfs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Sep 2009 12:08:08 -0000 Author: kib Date: Wed Sep 23 12:08:08 2009 New Revision: 197428 URL: http://svn.freebsd.org/changeset/base/197428 Log: Add per-process osrel node to the procfs, to allow read and set p_osrel value for the process. Approved by: des (procfs maintainer) MFC after: 3 weeks Added: head/sys/fs/procfs/procfs_osrel.c (contents, props changed) Modified: head/sys/conf/files head/sys/fs/procfs/procfs.c head/sys/fs/procfs/procfs.h head/sys/modules/procfs/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Wed Sep 23 10:12:58 2009 (r197427) +++ head/sys/conf/files Wed Sep 23 12:08:08 2009 (r197428) @@ -1792,6 +1792,7 @@ fs/procfs/procfs_ioctl.c optional procfs fs/procfs/procfs_map.c optional procfs fs/procfs/procfs_mem.c optional procfs fs/procfs/procfs_note.c optional procfs +fs/procfs/procfs_osrel.c optional procfs fs/procfs/procfs_regs.c optional procfs fs/procfs/procfs_rlimit.c optional procfs fs/procfs/procfs_status.c optional procfs Modified: head/sys/fs/procfs/procfs.c ============================================================================== --- head/sys/fs/procfs/procfs.c Wed Sep 23 10:12:58 2009 (r197427) +++ head/sys/fs/procfs/procfs.c Wed Sep 23 12:08:08 2009 (r197428) @@ -108,7 +108,8 @@ procfs_attr(PFS_ATTR_ARGS) else if (strcmp(pn->pn_name, "mem") == 0 || strcmp(pn->pn_name, "regs") == 0 || strcmp(pn->pn_name, "dbregs") == 0 || - strcmp(pn->pn_name, "fpregs") == 0) + strcmp(pn->pn_name, "fpregs") == 0 || + strcmp(pn->pn_name, "osrel") == 0) vap->va_mode = 0600; if (p != NULL) { @@ -186,6 +187,8 @@ procfs_init(PFS_INIT_ARGS) NULL, NULL, NULL, PFS_RD); pfs_create_file(dir, "status", procfs_doprocstatus, NULL, NULL, NULL, PFS_RD); + pfs_create_file(dir, "osrel", procfs_doosrel, + procfs_attr, procfs_candebug, NULL, PFS_RDWR); pfs_create_link(dir, "file", procfs_doprocfile, NULL, procfs_notsystem, NULL, 0); Modified: head/sys/fs/procfs/procfs.h ============================================================================== --- head/sys/fs/procfs/procfs.h Wed Sep 23 10:12:58 2009 (r197427) +++ head/sys/fs/procfs/procfs.h Wed Sep 23 12:08:08 2009 (r197428) @@ -39,6 +39,7 @@ #ifdef _KERNEL int procfs_docurproc(PFS_FILL_ARGS); +int procfs_doosrel(PFS_FILL_ARGS); int procfs_doproccmdline(PFS_FILL_ARGS); int procfs_doprocctl(PFS_FILL_ARGS); int procfs_doprocdbregs(PFS_FILL_ARGS); Added: head/sys/fs/procfs/procfs_osrel.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sys/fs/procfs/procfs_osrel.c Wed Sep 23 12:08:08 2009 (r197428) @@ -0,0 +1,68 @@ +/*- + * Copyright (c) 2009 Konstantin Belousov + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include + +#include +#include + +int +procfs_doosrel(PFS_FILL_ARGS) +{ + const char *pp; + int ov, osrel, i; + + if (uio == NULL) + return (EOPNOTSUPP); + if (uio->uio_rw == UIO_READ) { + sbuf_printf(sb, "%d\n", p->p_osrel); + } else { + sbuf_trim(sb); + sbuf_finish(sb); + pp = sbuf_data(sb); + osrel = 0; + i = sbuf_len(sb); + while (i--) { + if (*pp < '0' || *pp > '9') + return (EINVAL); + ov = osrel * 10 + *pp++ - '0'; + if (ov < osrel) + return (EINVAL); + osrel = ov; + } + p->p_osrel = osrel; + } + return (0); +} Modified: head/sys/modules/procfs/Makefile ============================================================================== --- head/sys/modules/procfs/Makefile Wed Sep 23 10:12:58 2009 (r197427) +++ head/sys/modules/procfs/Makefile Wed Sep 23 12:08:08 2009 (r197428) @@ -13,6 +13,7 @@ SRCS+= procfs_ioctl.c SRCS+= procfs_map.c SRCS+= procfs_mem.c SRCS+= procfs_note.c +SRCS+= procfs_osrel.c SRCS+= procfs_regs.c SRCS+= procfs_rlimit.c SRCS+= procfs_status.c