openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

blk-cgroup: Only give unaccounted_time under debug 

This change moves unaccounted_time to only be reported when
CONFIG_DEBUG_BLK_CGROUP is true.

Signed-off-by: Justin TerAvest <teravest@google.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Justin TerAvest 2011-03-22 21:26:54 +01:00 committed by Jens Axboe
parent eda5e0c91f
commit 9026e521c0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
block/blk-cgroup.c
View File

@ -605,10 +605,10 @@ static uint64_t blkio_get_stat(struct blkio_group *blkg,
if (type == BLKIO_STAT_SECTORS) if (type == BLKIO_STAT_SECTORS)
return blkio_fill_stat(key_str, MAX_KEY_LEN - 1, return blkio_fill_stat(key_str, MAX_KEY_LEN - 1,
blkg->stats.sectors, cb, dev); blkg->stats.sectors, cb, dev);
#ifdef CONFIG_DEBUG_BLK_CGROUP
if (type == BLKIO_STAT_UNACCOUNTED_TIME) if (type == BLKIO_STAT_UNACCOUNTED_TIME)
return blkio_fill_stat(key_str, MAX_KEY_LEN - 1, return blkio_fill_stat(key_str, MAX_KEY_LEN - 1,
blkg->stats.unaccounted_time, cb, dev); blkg->stats.unaccounted_time, cb, dev);
#ifdef CONFIG_DEBUG_BLK_CGROUP
if (type == BLKIO_STAT_AVG_QUEUE_SIZE) { if (type == BLKIO_STAT_AVG_QUEUE_SIZE) {
uint64_t sum = blkg->stats.avg_queue_size_sum; uint64_t sum = blkg->stats.avg_queue_size_sum;
uint64_t samples = blkg->stats.avg_queue_size_samples; uint64_t samples = blkg->stats.avg_queue_size_samples;
@ -1111,9 +1111,6 @@ static int blkiocg_file_read_map(struct cgroup *cgrp, struct cftype *cft,
case BLKIO_PROP_sectors: case BLKIO_PROP_sectors:
return blkio_read_blkg_stats(blkcg, cft, cb, return blkio_read_blkg_stats(blkcg, cft, cb,
BLKIO_STAT_SECTORS, 0); BLKIO_STAT_SECTORS, 0);
case BLKIO_PROP_unaccounted_time:
return blkio_read_blkg_stats(blkcg, cft, cb,
BLKIO_STAT_UNACCOUNTED_TIME, 0);
case BLKIO_PROP_io_service_bytes: case BLKIO_PROP_io_service_bytes:
return blkio_read_blkg_stats(blkcg, cft, cb, return blkio_read_blkg_stats(blkcg, cft, cb,
BLKIO_STAT_SERVICE_BYTES, 1); BLKIO_STAT_SERVICE_BYTES, 1);
@ -1133,6 +1130,9 @@ static int blkiocg_file_read_map(struct cgroup *cgrp, struct cftype *cft,
return blkio_read_blkg_stats(blkcg, cft, cb, return blkio_read_blkg_stats(blkcg, cft, cb,
BLKIO_STAT_QUEUED, 1); BLKIO_STAT_QUEUED, 1);
#ifdef CONFIG_DEBUG_BLK_CGROUP #ifdef CONFIG_DEBUG_BLK_CGROUP
case BLKIO_PROP_unaccounted_time:
return blkio_read_blkg_stats(blkcg, cft, cb,
BLKIO_STAT_UNACCOUNTED_TIME, 0);
case BLKIO_PROP_dequeue: case BLKIO_PROP_dequeue:
return blkio_read_blkg_stats(blkcg, cft, cb, return blkio_read_blkg_stats(blkcg, cft, cb,
BLKIO_STAT_DEQUEUE, 0); BLKIO_STAT_DEQUEUE, 0);
@ -1269,12 +1269,6 @@ struct cftype blkio_files[] = {
BLKIO_PROP_sectors), BLKIO_PROP_sectors),
.read_map = blkiocg_file_read_map, .read_map = blkiocg_file_read_map,
}, },
{
.name = "unaccounted_time",
.private = BLKIOFILE_PRIVATE(BLKIO_POLICY_PROP,
BLKIO_PROP_unaccounted_time),
.read_map = blkiocg_file_read_map,
},
{ {
.name = "io_service_bytes", .name = "io_service_bytes",
.private = BLKIOFILE_PRIVATE(BLKIO_POLICY_PROP, .private = BLKIOFILE_PRIVATE(BLKIO_POLICY_PROP,
@ -1396,6 +1390,12 @@ struct cftype blkio_files[] = {
BLKIO_PROP_dequeue), BLKIO_PROP_dequeue),
.read_map = blkiocg_file_read_map, .read_map = blkiocg_file_read_map,
}, },
{
.name = "unaccounted_time",
.private = BLKIOFILE_PRIVATE(BLKIO_POLICY_PROP,
BLKIO_PROP_unaccounted_time),
.read_map = blkiocg_file_read_map,
},
#endif #endif
}; };