From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 613773858401 for ; Wed, 23 Mar 2022 00:34:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 613773858401 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-205-bn_68s-SMBaf-yu1oSb1yQ-1; Tue, 22 Mar 2022 20:34:50 -0400 X-MC-Unique: bn_68s-SMBaf-yu1oSb1yQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EF5FF80231F for ; Wed, 23 Mar 2022 00:34:48 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.19.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6159740E80E1; Wed, 23 Mar 2022 00:34:48 +0000 (UTC) From: Aaron Merey To: gdb-patches@sourceware.org Subject: [PATCH] Remove download size from debuginfod progress messages Date: Tue, 22 Mar 2022 20:34:32 -0400 Message-Id: <20220323003432.123142-1-amerey@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2022 00:34:55 -0000 Currently debuginfod progress update messages include the size of each download: Downloading 7.5 MB separate debug info /lib/libxyz.so.0 This value originates from the Content-Length HTTP header of the transfer. However this header is not guaranteed to be present for each download. This can happen when debuginfod servers compress files on-the-fly at the time of transfer. In this case gdb wrongly prints "-0.00 MB" as the size. This patch removes download sizes from progress messages for now until a more thorough reworking of progress updating is implemented [1]. [1] https://sourceware.org/pipermail/gdb-patches/2022-February/185798.html --- gdb/debuginfod-support.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c index 3614ff23882..ab40d117c9e 100644 --- a/gdb/debuginfod-support.c +++ b/gdb/debuginfod-support.c @@ -86,12 +86,12 @@ debuginfod_exec_query (const unsigned char *build_id, struct user_data { user_data (const char *desc, const char *fname) - : desc (desc), fname (fname) + : desc (desc), fname (fname), has_printed (false) { } const char * const desc; const char * const fname; - gdb::optional meter; + bool has_printed; }; /* Deleter for a debuginfod_client. */ @@ -121,25 +121,13 @@ progressfn (debuginfod_client *c, long cur, long total) return 1; } - if (total == 0) - return 0; - - if (!data->meter.has_value ()) + if (!data->has_printed) { - float size_in_mb = 1.0f * total / (1024 * 1024); - string_file styled_filename (current_uiout->can_emit_style_escape ()); - fprintf_styled (&styled_filename, - file_name_style.style (), - "%s", - data->fname); - std::string message - = string_printf ("Downloading %.2f MB %s %s", size_in_mb, data->desc, - styled_filename.c_str()); - data->meter.emplace (current_uiout, message, 1); + data->has_printed = true; + printf_filtered ("Downloading %s %ps...\n", data->desc, + styled_string (file_name_style.style (), data->fname)); } - data->meter->progress ((double)cur / (double)total); - return 0; } -- 2.35.1