From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D31BBC77B73 for ; Thu, 20 Apr 2023 13:18:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppUBF-0001um-GD; Thu, 20 Apr 2023 09:18:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppUB5-0001kY-GI for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:18:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppUAu-0005g9-15 for qemu-devel@nongnu.org; Thu, 20 Apr 2023 09:18:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681996691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2Cj6Olm5jKKOgFQJS9oa9wUJfodK/sh+vpBAvRIw4K8=; b=aYKSA8e03fRqRyvLSAU50eIMAJje3pTaOAfF3R5XzQ87h25JOsjoo8kb8Ej+NhNwNNoKW/ P8mbwvzw9UO+00FlouEBWyBxFz8FvVEpAACd5MEanHF9jCnApxKpdnUx2q+n1ZqXWNxYSl UqKbxEx4Y1rotDg6gEv0/I2pfZ1d4IY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-541-2ilKVAn4PC6wrdKDwgIrFQ-1; Thu, 20 Apr 2023 09:18:09 -0400 X-MC-Unique: 2ilKVAn4PC6wrdKDwgIrFQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9D0B3800B35 for ; Thu, 20 Apr 2023 13:18:09 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.171]) by smtp.corp.redhat.com (Postfix) with ESMTP id C3A56C16027; Thu, 20 Apr 2023 13:18:08 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Paolo Bonzini , Peter Xu Subject: [PULL 14/20] migration: Rename normal to normal_pages Date: Thu, 20 Apr 2023 15:17:45 +0200 Message-Id: <20230420131751.28534-15-quintela@redhat.com> In-Reply-To: <20230420131751.28534-1-quintela@redhat.com> References: <20230420131751.28534-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Rest of counters that refer to pages has a _pages suffix. And historically, this showed the number of full pages transferred. The name "normal" refered to the fact that they were sent without any optimization (compression, xbzrle, zero_page, ...). Signed-off-by: Juan Quintela Reviewed-by: Peter Xu --- migration/migration.c | 2 +- migration/ram.c | 10 +++++----- migration/ram.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 20ef5b683b..f311bb5f93 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1145,7 +1145,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->ram->duplicate = stat64_get(&ram_counters.zero_pages); /* legacy value. It is not used anymore */ info->ram->skipped = 0; - info->ram->normal = stat64_get(&ram_counters.normal); + info->ram->normal = stat64_get(&ram_counters.normal_pages); info->ram->normal_bytes = info->ram->normal * page_size; info->ram->mbps = s->mbps; info->ram->dirty_sync_count = diff --git a/migration/ram.c b/migration/ram.c index 1a098a9c21..7ad92f8756 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1118,7 +1118,7 @@ uint64_t ram_pagesize_summary(void) uint64_t ram_get_total_transferred_pages(void) { - return stat64_get(&ram_counters.normal) + + return stat64_get(&ram_counters.normal_pages) + stat64_get(&ram_counters.zero_pages) + compression_counters.pages + xbzrle_counters.pages; } @@ -1359,7 +1359,7 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block, } if (bytes_xmit > 0) { - stat64_add(&ram_counters.normal, 1); + stat64_add(&ram_counters.normal_pages, 1); } else if (bytes_xmit == 0) { stat64_add(&ram_counters.zero_pages, 1); } @@ -1393,7 +1393,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block, qemu_put_buffer(file, buf, TARGET_PAGE_SIZE); } ram_transferred_add(TARGET_PAGE_SIZE); - stat64_add(&ram_counters.normal, 1); + stat64_add(&ram_counters.normal_pages, 1); return 1; } @@ -1449,7 +1449,7 @@ static int ram_save_multifd_page(QEMUFile *file, RAMBlock *block, if (multifd_queue_page(file, block, offset) < 0) { return -1; } - stat64_add(&ram_counters.normal, 1); + stat64_add(&ram_counters.normal_pages, 1); return 1; } @@ -2625,7 +2625,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero) if (zero) { stat64_add(&ram_counters.zero_pages, pages); } else { - stat64_add(&ram_counters.normal, pages); + stat64_add(&ram_counters.normal_pages, pages); ram_transferred_add(size); qemu_file_credit_transfer(f, size); } diff --git a/migration/ram.h b/migration/ram.h index b27ce01f2e..11a0fde99b 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -48,7 +48,7 @@ typedef struct { Stat64 downtime_bytes; Stat64 zero_pages; Stat64 multifd_bytes; - Stat64 normal; + Stat64 normal_pages; Stat64 postcopy_bytes; Stat64 postcopy_requests; Stat64 precopy_bytes; -- 2.39.2