gdb/debuginfod: Improve progress updates

If the download size is known, a progress bar is displayed along with
the percentage of completion and the total download size.

  Downloading separate debug info for /lib/libxyz.so
  [############                                      ]  25% (10.01 M)

If the download size is not known, a progress indicator is displayed
with a ticker ("###") that moves across the screen at a rate of 1 tick
every 0.5 seconds.

  Downloading separate debug info for /lib/libxyz.so
  [         ###                                                      ]

If the output stream is not a tty, batch mode is enabled, the screen is
too narrow or width has been set to 'unlimited', then only a static
description of the download is printed. No bar or ticker is displayed.

  Downloading separate debug info for /lib/libxyz.so...

In any case, if the size of the download is known at the time the
description is printed then it will be included in the description.

  Downloading 10.01 MB separate debug info for /lib/libxyz.so...
This commit is contained in:
Aaron Merey 2022-10-24 14:05:06 -04:00
parent f71e3f86e8
commit 27859c6b9d
6 changed files with 299 additions and 165 deletions

View file

@ -21,6 +21,7 @@
#define CLI_OUT_H
#include "ui-out.h"
#include <chrono>
#include <vector>
class cli_ui_out : public ui_out
@ -71,8 +72,9 @@ protected:
virtual void do_flush () override;
virtual void do_redirect (struct ui_file *outstream) override;
virtual void do_progress_start (const std::string &, bool) override;
virtual void do_progress_notify (double) override;
virtual void do_progress_start () override;
virtual void do_progress_notify (const std::string &, const char *,
double, double) override;
virtual void do_progress_end () override;
bool suppress_output ()
@ -85,32 +87,24 @@ private:
std::vector<ui_file *> m_streams;
bool m_suppress_output;
/* Represents the printing state of a progress meter. */
enum meter_state
{
/* Printing will start with the next output. */
START,
/* Printing has already started. */
WORKING,
/* Progress printing has already started. */
PROGRESS,
/* Printing should not be done. */
NO_PRINT
};
/* The state of a recent progress meter. */
/* The state of a recent progress update. */
struct cli_progress_info
{
/* Position of the progress indicator. */
int pos;
/* The current state. */
enum meter_state printing;
/* The name to print. */
std::string name;
/* The last notification value. */
double last_value;
progress_update::state state;
/* Progress indicator's time of last update. */
std::chrono::steady_clock::time_point last_update;
cli_progress_info ()
: pos (0), state (progress_update::START)
{}
};
/* Stack of progress meters. */
std::vector<cli_progress_info> m_meters;
/* Stack of progress info. */
std::vector<cli_progress_info> m_progress_info;
void clear_current_line ();
};
extern void cli_display_match_list (char **matches, int len, int max);