reactos/ninja
1
0
Fork 0
mirror of https://github.com/reactos/ninja.git synced 2024-11-26 21:20:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

show started, not finished, edges in progress

Browse Source 
In verbose mode (where we don't overprint) it's confusing to show
[0/XX] for the first N commands we start.  In smart terminal mode,
I can't really tell the difference.
This commit is contained in:
Evan Martin 2011-05-14 15:43:23 -07:00
parent 2f4244e82b
commit 2ec1b42621
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/build.cc
View File

@ -62,7 +62,7 @@ struct BuildStatus {
/// Time we last printed an update.
int64_t last_update_millis_;
int finished_edges_, total_edges_;
int started_edges_, finished_edges_, total_edges_;
/// Map of running edge to time the edge started running.
typedef map<Edge*, int> RunningEdgeMap;
@ -76,7 +76,7 @@ BuildStatus::BuildStatus(const BuildConfig& config)
: config_(config),
start_time_millis_(GetTimeMillis()),
last_update_millis_(start_time_millis_),
finished_edges_(0), total_edges_(0) {
started_edges_(0), finished_edges_(0), total_edges_(0) {
#ifndef WIN32
const char* term = getenv("TERM");
smart_terminal_ = isatty(1) && term && string(term) != "dumb";
@ -96,6 +96,7 @@ void BuildStatus::PlanHasTotalEdges(int total) {
void BuildStatus::BuildEdgeStarted(Edge* edge) {
int start_time = (int)(GetTimeMillis() - start_time_millis_);
running_edges_.insert(make_pair(edge, start_time));
++started_edges_;
PrintStatus(edge);
}
@ -157,7 +158,7 @@ void BuildStatus::PrintStatus(Edge* edge) {
if (smart_terminal_)
printf("\r"); // Print over previous line, if any.
int progress_chars = printf("[%d/%d] ", finished_edges_, total_edges_);
int progress_chars = printf("[%d/%d] ", started_edges_, total_edges_);
#ifndef WIN32
if (smart_terminal_ && !force_full_command) {