2006-12-10 11:19:19 +01:00
|
|
|
/*
|
|
|
|
* Task I/O accounting operations
|
|
|
|
*/
|
|
|
|
#ifndef __TASK_IO_ACCOUNTING_OPS_INCLUDED
|
|
|
|
#define __TASK_IO_ACCOUNTING_OPS_INCLUDED
|
|
|
|
|
Detach sched.h from mm.h
First thing mm.h does is including sched.h solely for can_do_mlock() inline
function which has "current" dereference inside. By dealing with can_do_mlock()
mm.h can be detached from sched.h which is good. See below, why.
This patch
a) removes unconditional inclusion of sched.h from mm.h
b) makes can_do_mlock() normal function in mm/mlock.c
c) exports can_do_mlock() to not break compilation
d) adds sched.h inclusions back to files that were getting it indirectly.
e) adds less bloated headers to some files (asm/signal.h, jiffies.h) that were
getting them indirectly
Net result is:
a) mm.h users would get less code to open, read, preprocess, parse, ... if
they don't need sched.h
b) sched.h stops being dependency for significant number of files:
on x86_64 allmodconfig touching sched.h results in recompile of 4083 files,
after patch it's only 3744 (-8.3%).
Cross-compile tested on
all arm defconfigs, all mips defconfigs, all powerpc defconfigs,
alpha alpha-up
arm
i386 i386-up i386-defconfig i386-allnoconfig
ia64 ia64-up
m68k
mips
parisc parisc-up
powerpc powerpc-up
s390 s390-up
sparc sparc-up
sparc64 sparc64-up
um-x86_64
x86_64 x86_64-up x86_64-defconfig x86_64-allnoconfig
as well as my two usual configs.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-20 23:22:52 +02:00
|
|
|
#include <linux/sched.h>
|
|
|
|
|
2006-12-10 11:19:19 +01:00
|
|
|
#ifdef CONFIG_TASK_IO_ACCOUNTING
|
|
|
|
static inline void task_io_account_read(size_t bytes)
|
|
|
|
{
|
2008-07-28 00:48:12 +02:00
|
|
|
current->ioac.read_bytes += bytes;
|
2006-12-10 11:19:19 +01:00
|
|
|
}
|
|
|
|
|
2007-05-11 07:22:37 +02:00
|
|
|
/*
|
|
|
|
* We approximate number of blocks, because we account bytes only.
|
|
|
|
* A 'block' is 512 bytes
|
|
|
|
*/
|
|
|
|
static inline unsigned long task_io_get_inblock(const struct task_struct *p)
|
|
|
|
{
|
2008-07-28 00:48:12 +02:00
|
|
|
return p->ioac.read_bytes >> 9;
|
2007-05-11 07:22:37 +02:00
|
|
|
}
|
|
|
|
|
2006-12-10 11:19:19 +01:00
|
|
|
static inline void task_io_account_write(size_t bytes)
|
|
|
|
{
|
2008-07-28 00:48:12 +02:00
|
|
|
current->ioac.write_bytes += bytes;
|
2006-12-10 11:19:19 +01:00
|
|
|
}
|
|
|
|
|
2007-05-11 07:22:37 +02:00
|
|
|
/*
|
|
|
|
* We approximate number of blocks, because we account bytes only.
|
|
|
|
* A 'block' is 512 bytes
|
|
|
|
*/
|
|
|
|
static inline unsigned long task_io_get_oublock(const struct task_struct *p)
|
|
|
|
{
|
2008-07-28 00:48:12 +02:00
|
|
|
return p->ioac.write_bytes >> 9;
|
2007-05-11 07:22:37 +02:00
|
|
|
}
|
|
|
|
|
2006-12-10 11:19:19 +01:00
|
|
|
static inline void task_io_account_cancelled_write(size_t bytes)
|
|
|
|
{
|
2008-07-28 00:48:12 +02:00
|
|
|
current->ioac.cancelled_write_bytes += bytes;
|
2006-12-10 11:19:19 +01:00
|
|
|
}
|
|
|
|
|
2008-07-28 00:48:12 +02:00
|
|
|
static inline void task_io_accounting_init(struct task_io_accounting *ioac)
|
2006-12-10 11:19:19 +01:00
|
|
|
{
|
2008-07-27 17:29:15 +02:00
|
|
|
memset(ioac, 0, sizeof(*ioac));
|
|
|
|
}
|
|
|
|
|
2008-07-28 00:48:12 +02:00
|
|
|
static inline void task_blk_io_accounting_add(struct task_io_accounting *dst,
|
|
|
|
struct task_io_accounting *src)
|
2008-07-27 17:29:15 +02:00
|
|
|
{
|
2008-07-28 00:48:12 +02:00
|
|
|
dst->read_bytes += src->read_bytes;
|
|
|
|
dst->write_bytes += src->write_bytes;
|
|
|
|
dst->cancelled_write_bytes += src->cancelled_write_bytes;
|
2006-12-10 11:19:19 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
static inline void task_io_account_read(size_t bytes)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2007-05-11 07:22:37 +02:00
|
|
|
static inline unsigned long task_io_get_inblock(const struct task_struct *p)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-12-10 11:19:19 +01:00
|
|
|
static inline void task_io_account_write(size_t bytes)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2007-05-11 07:22:37 +02:00
|
|
|
static inline unsigned long task_io_get_oublock(const struct task_struct *p)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-12-10 11:19:19 +01:00
|
|
|
static inline void task_io_account_cancelled_write(size_t bytes)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2008-07-28 00:48:12 +02:00
|
|
|
static inline void task_io_accounting_init(struct task_io_accounting *ioac)
|
2008-07-27 17:29:15 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2008-07-28 00:48:12 +02:00
|
|
|
static inline void task_blk_io_accounting_add(struct task_io_accounting *dst,
|
|
|
|
struct task_io_accounting *src)
|
2006-12-10 11:19:19 +01:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2008-07-27 17:29:15 +02:00
|
|
|
#endif /* CONFIG_TASK_IO_ACCOUNTING */
|
|
|
|
|
|
|
|
#ifdef CONFIG_TASK_XACCT
|
2008-07-28 00:48:12 +02:00
|
|
|
static inline void task_chr_io_accounting_add(struct task_io_accounting *dst,
|
|
|
|
struct task_io_accounting *src)
|
2008-07-27 17:29:15 +02:00
|
|
|
{
|
2008-07-28 00:48:12 +02:00
|
|
|
dst->rchar += src->rchar;
|
|
|
|
dst->wchar += src->wchar;
|
|
|
|
dst->syscr += src->syscr;
|
|
|
|
dst->syscw += src->syscw;
|
2008-07-27 17:29:15 +02:00
|
|
|
}
|
|
|
|
#else
|
2008-07-28 00:48:12 +02:00
|
|
|
static inline void task_chr_io_accounting_add(struct task_io_accounting *dst,
|
|
|
|
struct task_io_accounting *src)
|
2008-07-27 17:29:15 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_TASK_XACCT */
|
|
|
|
|
2008-07-28 00:48:12 +02:00
|
|
|
static inline void task_io_accounting_add(struct task_io_accounting *dst,
|
|
|
|
struct task_io_accounting *src)
|
2008-07-27 17:29:15 +02:00
|
|
|
{
|
|
|
|
task_chr_io_accounting_add(dst, src);
|
|
|
|
task_blk_io_accounting_add(dst, src);
|
|
|
|
}
|
|
|
|
#endif /* __TASK_IO_ACCOUNTING_OPS_INCLUDED */
|