| Message ID | 1483513091-30661-2-git-send-email-douly.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 01/04/2017 12:58 AM, Dou Liyang wrote: > the bdrv_query_stats and bdrv_query_bds_stats functions need to call > each other, that increases the coupling. it also makes the program > complicated and makes some unnecessary judgements. s/judgements/judgments/ - although I wonder if 'tests' would be a simpler word. > > remove the call from bdrv_query_bds_stats to bdrv_query_stats, just > take some recursion to make it clearly. > > avoid judging whether the blk is NULL during querying the bds stats. Again, 'testing' might read nicer than 'judging'. > it is unnecessary. > > Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> > --- > block/qapi.c | 26 ++++++++++++++------------ > 1 file changed, 14 insertions(+), 12 deletions(-) > > -static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs, > +static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs, > bool query_backing) > { > + BlockStats *s = NULL; > + > + s = g_malloc0(sizeof(*s)); Dead initialization to NULL since the very next statement overwrites it.
Hi Eric, At 01/13/2017 11:00 PM, Eric Blake wrote: > On 01/04/2017 12:58 AM, Dou Liyang wrote: >> the bdrv_query_stats and bdrv_query_bds_stats functions need to call >> each other, that increases the coupling. it also makes the program >> complicated and makes some unnecessary judgements. > > s/judgements/judgments/ - although I wonder if 'tests' would be a > simpler word. > Yes, it is. I will modify it. >> >> remove the call from bdrv_query_bds_stats to bdrv_query_stats, just >> take some recursion to make it clearly. >> >> avoid judging whether the blk is NULL during querying the bds stats. > > Again, 'testing' might read nicer than 'judging'. Yes, it is. Thanks, Liyang
diff --git a/block/qapi.c b/block/qapi.c index a62e862..bc622cd 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -357,10 +357,6 @@ static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info, qapi_free_BlockInfo(info); } -static BlockStats *bdrv_query_stats(BlockBackend *blk, - const BlockDriverState *bs, - bool query_backing); - static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) { BlockAcctStats *stats = blk_get_stats(blk); @@ -428,9 +424,18 @@ static void bdrv_query_blk_stats(BlockDeviceStats *ds, BlockBackend *blk) } } -static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs, +static BlockStats *bdrv_query_bds_stats(const BlockDriverState *bs, bool query_backing) { + BlockStats *s = NULL; + + s = g_malloc0(sizeof(*s)); + s->stats = g_malloc0(sizeof(*s->stats)); + + if (!bs) { + return s; + } + if (bdrv_get_node_name(bs)[0]) { s->has_node_name = true; s->node_name = g_strdup(bdrv_get_node_name(bs)); @@ -440,14 +445,15 @@ static void bdrv_query_bds_stats(BlockStats *s, const BlockDriverState *bs, if (bs->file) { s->has_parent = true; - s->parent = bdrv_query_stats(NULL, bs->file->bs, query_backing); + s->parent = bdrv_query_bds_stats(bs->file->bs, query_backing); } if (query_backing && bs->backing) { s->has_backing = true; - s->backing = bdrv_query_stats(NULL, bs->backing->bs, query_backing); + s->backing = bdrv_query_bds_stats(bs->backing->bs, query_backing); } + return s; } static BlockStats *bdrv_query_stats(BlockBackend *blk, @@ -456,17 +462,13 @@ static BlockStats *bdrv_query_stats(BlockBackend *blk, { BlockStats *s; - s = g_malloc0(sizeof(*s)); - s->stats = g_malloc0(sizeof(*s->stats)); + s = bdrv_query_bds_stats(bs, query_backing); if (blk) { s->has_device = true; s->device = g_strdup(blk_name(blk)); bdrv_query_blk_stats(s->stats, blk); } - if (bs) { - bdrv_query_bds_stats(s, bs, query_backing); - } return s; }
the bdrv_query_stats and bdrv_query_bds_stats functions need to call each other, that increases the coupling. it also makes the program complicated and makes some unnecessary judgements. remove the call from bdrv_query_bds_stats to bdrv_query_stats, just take some recursion to make it clearly. avoid judging whether the blk is NULL during querying the bds stats. it is unnecessary. Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com> --- block/qapi.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)