From nobody Tue Nov 11 05:01:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=bytedance.com ARC-Seal: i=1; a=rsa-sha256; t=1561022624; cv=none; d=zoho.com; s=zohoarc; b=TEKRsjMjM9rxo9YWOp8Cz0aAPql/utTqvs0hpmOZUdyfNZUT9zrVerdt1VAJlOIBIVmUIX19qJtKfS1EgrwHiCr1Q5sY252hRg/41WOt7GwBHxJsn0UfpsXdenD5TIMzqym7Nu9QyMtky6XUIJzuI+2OhPkI8/UXhLE+lPVYvf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561022624; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=xVkd2C7jozt0zN9T2y4YYluovPXWmSBr7js0pW49C0o=; b=DFxT+jW6N5u+duXO2UvOECUpNw4gf6zIqmye60RDaUJgIIaR25r5R3xUysW313Cbke7cAFVWBYpFzzNKka+P1m5A1y1F0EtUqb5KvoPQYTnOjAgmlm4Q5U8hAawC+bdnsxMCDWiOrygC9AH5A3GamkP0FLKHeWwh7PvrvJuE0Zc= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1561022624613363.90750590252014; Thu, 20 Jun 2019 02:23:44 -0700 (PDT) Received: from localhost ([::1]:45198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdtIC-00071t-KA for importer@patchew.org; Thu, 20 Jun 2019 05:23:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38508) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdsqS-0006T5-5m for qemu-devel@nongnu.org; Thu, 20 Jun 2019 04:55:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdsqP-0006aT-CZ for qemu-devel@nongnu.org; Thu, 20 Jun 2019 04:54:59 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:36980) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hdsqO-0006NU-QR for qemu-devel@nongnu.org; Thu, 20 Jun 2019 04:54:57 -0400 Received: by mail-pf1-x442.google.com with SMTP id 19so1285314pfa.4 for ; Thu, 20 Jun 2019 01:54:42 -0700 (PDT) Received: from always-ThinkPad-T480.bytedance.net ([61.120.150.76]) by smtp.gmail.com with ESMTPSA id c11sm19240635pgg.2.2019.06.20.01.54.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Jun 2019 01:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xVkd2C7jozt0zN9T2y4YYluovPXWmSBr7js0pW49C0o=; b=TRwwnpQO9VP2qNvzhco1dy9ZLD9gp/aaZoCX6phlG5UK9JVcKiolvJfE7l3qXAi1ro 9b6ZC2ZkbEQcaV87ee8f7DZOz7NI0R19lYv09FPyk4OvSvQELlizo22mIsur1EgM7jfl 4yRaSCMRzWSfhvgOCAVtdcZcWe+oq5/oba3hisqxBRa1pShOgMjsDJQb8OGmump5YWNm p/2meipNXzpHIDAe7z5pbMekMK/8XSuoCI1X7Z0N1e7V3hm50WZzUyijIpUm4apy6hqZ qGllI1KXc7wRkHahNK9MslOgT/6AUCddmlWJE+yraycmyp1I48TEeYAlCvkUmtO0kcPD z4pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xVkd2C7jozt0zN9T2y4YYluovPXWmSBr7js0pW49C0o=; b=AYLxSFs9q/PUAemBDoaQrBx9z+tft+f25GDCBr4cYWw4DBn00FxNi1/agcZU9m9uqf wf+QbdrEz4w3BEtFqisTtRU+K+v/Z7x6yPeXXw2dECqiZJNXSNywM4NwUDU8XpmWtzfO 4W9+PA2uEgdYpUdoXiUbo/piJWTyV96bq/e7PO6lJvt83JNz3Fn0+NcINn1HDQYFo1NY rRRg36nlyOu6gyxT/Y+8bmZPQPeezmGmtqz9dS9m/AH29BeWBYYqe6eIC9vYU4YzhTnQ SHRlv0IGvTsQSVEEIIfXpJ+ifRy6Fi80BD5u9dP5txAAQzHO5VySt/3CU2oTVW2ojhzF j73A== X-Gm-Message-State: APjAAAULuHzVWOhWoEb/510Z8Elqc5F5Vo+ZwAoG5pefOvVnPUnZ6fYp Hotn/YVmCz82B8CN2VWY8pdqFQ== X-Google-Smtp-Source: APXvYqx6dTppPQCyp2hrIPnXzMII4xuJk50bB9L6ByS8qQJ8AcYKQL+eM0XnddzrFWEmDGg2x1zuOQ== X-Received: by 2002:a63:9d43:: with SMTP id i64mr11040721pgd.404.1561020881592; Thu, 20 Jun 2019 01:54:41 -0700 (PDT) From: zhenwei pi To: kwolf@redhat.com, mreitz@redhat.com Date: Thu, 20 Jun 2019 16:54:30 +0800 Message-Id: <1561020872-6214-2-git-send-email-pizhenwei@bytedance.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561020872-6214-1-git-send-email-pizhenwei@bytedance.com> References: <1561020872-6214-1-git-send-email-pizhenwei@bytedance.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH 1/3] block/accounting: rename struct BlockLatencyHistogram X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, qemu-block@nongnu.org, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, pizhenwei@bytedance.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Rename struct BlockLatencyHistogram to BlockHistogram, and rename related functions name. make this struct and functions be common, they can be used widely. Signed-off-by: zhenwei pi --- block/accounting.c | 31 ++++++++++++++++++------------- block/qapi.c | 2 +- include/block/accounting.h | 8 ++++---- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/block/accounting.c b/block/accounting.c index 70a3d9a426..bb8148b6b1 100644 --- a/block/accounting.c +++ b/block/accounting.c @@ -94,13 +94,13 @@ void block_acct_start(BlockAcctStats *stats, BlockAcctC= ookie *cookie, cookie->type =3D type; } =20 -/* block_latency_histogram_compare_func: +/* block_histogram_compare_func: * Compare @key with interval [@it[0], @it[1]). * Return: -1 if @key < @it[0] * 0 if @key in [@it[0], @it[1]) * +1 if @key >=3D @it[1] */ -static int block_latency_histogram_compare_func(const void *key, const voi= d *it) +static int block_histogram_compare_func(const void *key, const void *it) { uint64_t k =3D *(uint64_t *)key; uint64_t a =3D ((uint64_t *)it)[0]; @@ -109,8 +109,7 @@ static int block_latency_histogram_compare_func(const v= oid *key, const void *it) return k < a ? -1 : (k < b ? 0 : 1); } =20 -static void block_latency_histogram_account(BlockLatencyHistogram *hist, - int64_t latency_ns) +static void block_histogram_account(BlockHistogram *hist, int64_t val) { uint64_t *pos; =20 @@ -120,28 +119,26 @@ static void block_latency_histogram_account(BlockLate= ncyHistogram *hist, } =20 =20 - if (latency_ns < hist->boundaries[0]) { + if (val < hist->boundaries[0]) { hist->bins[0]++; return; } =20 - if (latency_ns >=3D hist->boundaries[hist->nbins - 2]) { + if (val >=3D hist->boundaries[hist->nbins - 2]) { hist->bins[hist->nbins - 1]++; return; } =20 - pos =3D bsearch(&latency_ns, hist->boundaries, hist->nbins - 2, + pos =3D bsearch(&val, hist->boundaries, hist->nbins - 2, sizeof(hist->boundaries[0]), - block_latency_histogram_compare_func); + block_histogram_compare_func); assert(pos !=3D NULL); =20 hist->bins[pos - hist->boundaries + 1]++; } =20 -int block_latency_histogram_set(BlockAcctStats *stats, enum BlockAcctType = type, - uint64List *boundaries) +static int block_histogram_set(BlockHistogram *hist, uint64List *boundarie= s) { - BlockLatencyHistogram *hist =3D &stats->latency_histogram[type]; uint64List *entry; uint64_t *ptr; uint64_t prev =3D 0; @@ -170,12 +167,20 @@ int block_latency_histogram_set(BlockAcctStats *stats= , enum BlockAcctType type, return 0; } =20 +int block_latency_histogram_set(BlockAcctStats *stats, enum BlockAcctType = type, + uint64List *boundaries) +{ + BlockHistogram *hist =3D &stats->latency_histogram[type]; + + return block_histogram_set(hist, boundaries); +} + void block_latency_histograms_clear(BlockAcctStats *stats) { int i; =20 for (i =3D 0; i < BLOCK_MAX_IOTYPE; i++) { - BlockLatencyHistogram *hist =3D &stats->latency_histogram[i]; + BlockHistogram *hist =3D &stats->latency_histogram[i]; g_free(hist->bins); g_free(hist->boundaries); memset(hist, 0, sizeof(*hist)); @@ -204,7 +209,7 @@ static void block_account_one_io(BlockAcctStats *stats,= BlockAcctCookie *cookie, stats->nr_ops[cookie->type]++; } =20 - block_latency_histogram_account(&stats->latency_histogram[cookie->type= ], + block_histogram_account(&stats->latency_histogram[cookie->type], latency_ns); =20 if (!failed || stats->account_failed) { diff --git a/block/qapi.c b/block/qapi.c index 917435f022..f3a84f776e 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -415,7 +415,7 @@ static uint64List *uint64_list(uint64_t *list, int size) return out_list; } =20 -static void bdrv_latency_histogram_stats(BlockLatencyHistogram *hist, +static void bdrv_latency_histogram_stats(BlockHistogram *hist, bool *not_null, BlockLatencyHistogramInfo **info) { diff --git a/include/block/accounting.h b/include/block/accounting.h index d1f67b10dd..270fddb69c 100644 --- a/include/block/accounting.h +++ b/include/block/accounting.h @@ -46,7 +46,7 @@ struct BlockAcctTimedStats { QSLIST_ENTRY(BlockAcctTimedStats) entries; }; =20 -typedef struct BlockLatencyHistogram { +typedef struct BlockHistogram { /* The following histogram is represented like this: * * 5| * @@ -57,7 +57,7 @@ typedef struct BlockLatencyHistogram { * +------------------ * 10 50 100 * - * BlockLatencyHistogram histogram =3D { + * BlockHistogram histogram =3D { * .nbins =3D 4, * .boundaries =3D {10, 50, 100}, * .bins =3D {3, 1, 5, 2}, @@ -74,7 +74,7 @@ typedef struct BlockLatencyHistogram { uint64_t *boundaries; /* @nbins-1 numbers here (all boundaries, except 0 and +inf) */ uint64_t *bins; -} BlockLatencyHistogram; +} BlockHistogram; =20 struct BlockAcctStats { QemuMutex lock; @@ -88,7 +88,7 @@ struct BlockAcctStats { QSLIST_HEAD(, BlockAcctTimedStats) intervals; bool account_invalid; bool account_failed; - BlockLatencyHistogram latency_histogram[BLOCK_MAX_IOTYPE]; + BlockHistogram latency_histogram[BLOCK_MAX_IOTYPE]; }; =20 typedef struct BlockAcctCookie { --=20 2.11.0