Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a7864ca authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] io-accounting: via taskstats 



Deliver IO accounting via taskstats.

Cc: Jay Lan <jlan@sgi.com>
Cc: Shailabh Nagar <nagar@watson.ibm.com>
Cc: Balbir Singh <balbir@in.ibm.com>
Cc: Chris Sturtivant <csturtiv@sgi.com>
Cc: Tony Ernst <tee@sgi.com>
Cc: Guillaume Thouvenin <guillaume.thouvenin@bull.net>
Cc: David Wright <daw@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f2f1f8a3

include/linux/taskstats.h

+7 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
 */





#define TASKSTATS_VERSION	2

#define TASKSTATS_VERSION	3

#define TS_COMM_LEN		32	/* should be >= TASK_COMM_LEN

					 * in linux/sched.h */
@@ -140,6 +140,12 @@ struct taskstats { 
	__u64	read_syscalls;		/* read syscalls */

	__u64	write_syscalls;		/* write syscalls */

	/* Extended accounting fields end */



#define TASKSTATS_HAS_IO_ACCOUNTING

	/* Per-task storage I/O accounting starts */

	__u64	read_bytes;		/* bytes of read I/O */

	__u64	write_bytes;		/* bytes of write I/O */

	__u64	cancelled_write_bytes;	/* bytes of cancelled write I/O */

};

kernel/tsacct.c

+9 −0
Original line number Diff line number Diff line
@@ -96,6 +96,15 @@ void xacct_add_tsk(struct taskstats *stats, struct task_struct *p) 
	stats->write_char	= p->wchar;

	stats->read_syscalls	= p->syscr;

	stats->write_syscalls	= p->syscw;

#ifdef CONFIG_TASK_IO_ACCOUNTING

	stats->read_bytes	= p->ioac.read_bytes;

	stats->write_bytes	= p->ioac.write_bytes;

	stats->cancelled_write_bytes = p->ioac.cancelled_write_bytes;

#else

	stats->read_bytes	= 0;

	stats->write_bytes	= 0;

	stats->cancelled_write_bytes = 0;

#endif

}

#undef KB

#undef MB