From owner-svn-src-projects@FreeBSD.ORG Sun Nov 23 12:05:51 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 84EF6F05; Sun, 23 Nov 2014 12:05:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65A4ECF4; Sun, 23 Nov 2014 12:05:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sANC5pQm026598; Sun, 23 Nov 2014 12:05:51 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sANC5okE026594; Sun, 23 Nov 2014 12:05:50 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411231205.sANC5okE026594@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Sun, 23 Nov 2014 12:05:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274915 - in projects/sendfile: lib/libprocstat sys/kern sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 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: Sun, 23 Nov 2014 12:05:51 -0000 Author: glebius Date: Sun Nov 23 12:05:49 2014 New Revision: 274915 URL: https://svnweb.freebsd.org/changeset/base/274915 Log: Merge head r258543 through r274914. Modified: projects/sendfile/lib/libprocstat/udf.c projects/sendfile/sys/kern/kern_resource.c projects/sendfile/sys/sys/racct.h projects/sendfile/sys/sys/resourcevar.h Directory Properties: projects/sendfile/ (props changed) projects/sendfile/sys/ (props changed) Modified: projects/sendfile/lib/libprocstat/udf.c ============================================================================== --- projects/sendfile/lib/libprocstat/udf.c Sun Nov 23 12:01:52 2014 (r274914) +++ projects/sendfile/lib/libprocstat/udf.c Sun Nov 23 12:05:49 2014 (r274915) @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #define _KERNEL #include #undef _KERNEL Modified: projects/sendfile/sys/kern/kern_resource.c ============================================================================== --- projects/sendfile/sys/kern/kern_resource.c Sun Nov 23 12:01:52 2014 (r274914) +++ projects/sendfile/sys/kern/kern_resource.c Sun Nov 23 12:05:49 2014 (r274915) @@ -1334,6 +1334,7 @@ uifree(struct uidinfo *uip) free(uip, M_UIDINFO); } +#ifdef RACCT void ui_racct_foreach(void (*callback)(struct racct *racct, void *arg2, void *arg3), void *arg2, void *arg3) @@ -1349,6 +1350,7 @@ ui_racct_foreach(void (*callback)(struct } rw_runlock(&uihashtbl_lock); } +#endif /* * Change the count associated with number of processes Modified: projects/sendfile/sys/sys/racct.h ============================================================================== --- projects/sendfile/sys/sys/racct.h Sun Nov 23 12:01:52 2014 (r274914) +++ projects/sendfile/sys/sys/racct.h Sun Nov 23 12:05:49 2014 (r274915) @@ -220,15 +220,8 @@ racct_get_available(struct proc *p, int return (UINT64_MAX); } -static inline void -racct_create(struct racct **racctp) -{ -} - -static inline void -racct_destroy(struct racct **racctp) -{ -} +#define racct_create(x) +#define racct_destroy(x) static inline int racct_proc_fork(struct proc *parent, struct proc *child) Modified: projects/sendfile/sys/sys/resourcevar.h ============================================================================== --- projects/sendfile/sys/sys/resourcevar.h Sun Nov 23 12:01:52 2014 (r274914) +++ projects/sendfile/sys/sys/resourcevar.h Sun Nov 23 12:05:49 2014 (r274915) @@ -102,7 +102,9 @@ struct uidinfo { long ui_kqcnt; /* (b) number of kqueues */ uid_t ui_uid; /* (a) uid */ u_int ui_ref; /* (b) reference count */ +#ifdef RACCT struct racct *ui_racct; /* (a) resource accounting */ +#endif }; #define UIDINFO_VMSIZE_LOCK(ui) mtx_lock(&((ui)->ui_vmsize_mtx)) @@ -148,8 +150,10 @@ struct uidinfo void uifree(struct uidinfo *uip); void uihashinit(void); void uihold(struct uidinfo *uip); +#ifdef RACCT void ui_racct_foreach(void (*callback)(struct racct *racct, void *arg2, void *arg3), void *arg2, void *arg3); +#endif #endif /* _KERNEL */ #endif /* !_SYS_RESOURCEVAR_H_ */