Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 23 Nov 2014 12:05:50 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r274915 - in projects/sendfile: lib/libprocstat sys/kern sys/sys
Message-ID:  <201411231205.sANC5okE026594@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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 <sys/stat.h>
 #include <sys/time.h>
 #include <sys/vnode.h>
-#include <sys/buf.h>
 #define _KERNEL
 #include <sys/mount.h>
 #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_ */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411231205.sANC5okE026594>