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 660C7C43334 for ; Thu, 9 Jun 2022 12:24:25 +0000 (UTC) Received: from localhost ([::1]:48830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzHD6-0005jl-E2 for qemu-devel@archiver.kernel.org; Thu, 09 Jun 2022 08:24:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzEpD-0006hW-Uu for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:51:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:24424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzEpB-0004ls-Gh for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:51:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654768292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AizPCFcdE53dmeUr/czeWP1AA0td8jl4BsL+1OgGKTU=; b=EDLeI/yID5MD32kBEdjYWOvI6x9SScc3HKEi35VCII6fqMNSKVJPhqPZblJD9uD83oNoyc 6hQdhUoPVq8Qjb3dUSkTkIHLbRmzneSbgK81lZrd9F0ANt51a4ZPQz/PdIDaI39Rz3SGca y9JLuxR2oclFLVyWOxVff/iQFmcbrcM= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-19-wHGxjFZBOY2MngiaRoM_gA-1; Thu, 09 Jun 2022 05:51:31 -0400 X-MC-Unique: wHGxjFZBOY2MngiaRoM_gA-1 Received: by mail-wr1-f69.google.com with SMTP id r13-20020adff10d000000b002160e9d64f8so3903211wro.0 for ; Thu, 09 Jun 2022 02:51:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=AizPCFcdE53dmeUr/czeWP1AA0td8jl4BsL+1OgGKTU=; b=vbNseKZ7tAKGeII7Iuzq028hThvi/V8poAMXiYneS5MMNqWOmz5FYpTbST/W7K2gEp Z/Pj+75IBGh5JVDmkC7UBa7oNyyBilgCk57dRbNSVn/+x1qZGAXqeMX4KdAhuT9C+myy 6TdEakjKdOjhPNZZddMGRS9SbZ7nPGCAdGaXb1GMo7jdmSK2pSjILAUea+SsqdrYk5Vx QOCRAQFdxgJL/w9ILsPXhCBwYRl6z/R6HicmoM+sxXBQSS0VsR4UsMJ4aa3Ii35S+xGs Qr4bRNwwOZWBM7J9CGUC3S0v+0vttfzT/e/go/QPmFoCeayNOQujLQpPSG2EG9OTiMuG Exig== X-Gm-Message-State: AOAM530Av/nTk5AvILzlVEPDRkVIsfzrbFXZzauGb3oyecPZnQpQUszi xnyEc+IYfubA3NLCVWNWK7QooLZj0tigxUA3rIRw6kinCSrf/plfySicuv4UCpN2C6w8LVYZg/s fNdMyiO8RCGQ8UqI= X-Received: by 2002:a05:6000:1acd:b0:218:54c8:1690 with SMTP id i13-20020a0560001acd00b0021854c81690mr11752890wry.114.1654768290501; Thu, 09 Jun 2022 02:51:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyDUxtmjWa6PRAoL7O0/+JAaeGzxFoE+l64tz45x8652W4Y3M0YmEXjdPYZxmhx6pa4FKXj1w== X-Received: by 2002:a05:6000:1acd:b0:218:54c8:1690 with SMTP id i13-20020a0560001acd00b0021854c81690mr11752864wry.114.1654768290273; Thu, 09 Jun 2022 02:51:30 -0700 (PDT) Received: from work-vm (cpc109025-salf6-2-0-cust480.10-2.cable.virginm.net. [82.30.61.225]) by smtp.gmail.com with ESMTPSA id f14-20020a05600c4e8e00b0039c5642e430sm11090162wmq.20.2022.06.09.02.51.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 02:51:29 -0700 (PDT) Date: Thu, 9 Jun 2022 10:51:27 +0100 From: "Dr. David Alan Gilbert" To: Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Stefan Hajnoczi , Hailiang Zhang , Juan Quintela , Fam Zheng Subject: Re: [PATCH 05/20] migration: rename 'pos' field in QEMUFile to 'bytes_processed' Message-ID: References: <20220524110235.145079-1-berrange@redhat.com> <20220524110235.145079-6-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20220524110235.145079-6-berrange@redhat.com> User-Agent: Mutt/2.2.1 (2022-02-19) Received-SPF: pass client-ip=170.10.129.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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" * Daniel P. Berrangé (berrange@redhat.com) wrote: > This makes the field name align with the newly introduced method > names in the previous commit. I think that's the method in the following commits? tbh I'm not sure about this; 'pos' is still passed to writev_buffer and get_buffer to say where the data is - and that makes it a 'pos' still rather than a simple stats counter. Dave > Signed-off-by: Daniel P. Berrangé > --- > migration/qemu-file.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/migration/qemu-file.c b/migration/qemu-file.c > index 03f0b13a55..b21da4c5bf 100644 > --- a/migration/qemu-file.c > +++ b/migration/qemu-file.c > @@ -50,8 +50,9 @@ struct QEMUFile { > */ > int64_t rate_limit_used; > > - int64_t pos; /* start of buffer when writing, end of buffer > - when reading */ > + /* The sum of bytes transferred on the wire */ > + int64_t total_transferred; > + > int buf_index; > int buf_size; /* 0 when writing */ > uint8_t buf[IO_BUF_SIZE]; > @@ -241,14 +242,14 @@ void qemu_fflush(QEMUFile *f) > } > if (f->iovcnt > 0) { > expect = iov_size(f->iov, f->iovcnt); > - ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt, f->pos, > + ret = f->ops->writev_buffer(f->opaque, f->iov, f->iovcnt, f->total_transferred, > &local_error); > > qemu_iovec_release_ram(f); > } > > if (ret >= 0) { > - f->pos += ret; > + f->total_transferred += ret; > } > /* We expect the QEMUFile write impl to send the full > * data set we requested, so sanity check that. > @@ -357,11 +358,11 @@ static ssize_t qemu_fill_buffer(QEMUFile *f) > return 0; > } > > - len = f->ops->get_buffer(f->opaque, f->buf + pending, f->pos, > + len = f->ops->get_buffer(f->opaque, f->buf + pending, f->total_transferred, > IO_BUF_SIZE - pending, &local_error); > if (len > 0) { > f->buf_size += len; > - f->pos += len; > + f->total_transferred += len; > } else if (len == 0) { > qemu_file_set_error_obj(f, -EIO, local_error); > } else if (len != -EAGAIN) { > @@ -375,7 +376,7 @@ static ssize_t qemu_fill_buffer(QEMUFile *f) > > void qemu_update_position(QEMUFile *f, size_t size) > { > - f->pos += size; > + f->total_transferred += size; > } > > /** Closes the file > @@ -658,7 +659,7 @@ int qemu_get_byte(QEMUFile *f) > > int64_t qemu_ftell_fast(QEMUFile *f) > { > - int64_t ret = f->pos; > + int64_t ret = f->total_transferred; > int i; > > for (i = 0; i < f->iovcnt; i++) { > @@ -671,7 +672,7 @@ int64_t qemu_ftell_fast(QEMUFile *f) > int64_t qemu_ftell(QEMUFile *f) > { > qemu_fflush(f); > - return f->pos; > + return f->total_transferred; > } > > int qemu_file_rate_limit(QEMUFile *f) > -- > 2.36.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK