[PATCH] Remove download size from debuginfod progress messages
Aaron Merey
amerey@redhat.com
Wed Mar 23 00:34:32 GMT 2022
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<ui_out::progress_meter> 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
More information about the Gdb-patches
mailing list