From 3e1b9a8a685612a610e7b54e7699377d964f3153 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Tue, 29 Dec 2009 23:45:10 +0000 Subject: [PATCH] 2009-12-29 Rafael Espindola * main.cc (main): Fix the sys time reporting. * workqueue.cc (Workqueue::find_and_run_task): Fix the sys time reporting. --- gold/ChangeLog | 5 +++++ gold/main.cc | 2 +- gold/workqueue.cc | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index f2ef711469..0af6d8f24f 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2009-12-29 Rafael Espindola + + * main.cc (main): Fix the sys time reporting. + * workqueue.cc (Workqueue::find_and_run_task): Fix the sys time reporting. + 2009-12-29 Sriraman Tallam * options.cc (General_options::parse_version): Allow -v to exit diff --git a/gold/main.cc b/gold/main.cc index c9d0d7966c..5d6cbd5a0f 100644 --- a/gold/main.cc +++ b/gold/main.cc @@ -254,7 +254,7 @@ main(int argc, char** argv) "(user: %ld.%06ld sys: %ld.%06ld wall: %ld.%06ld)\n"), program_name, elapsed.user / 1000, (elapsed.user % 1000) * 1000, - elapsed.sys / 1000, (elapsed.user % 1000) * 1000, + elapsed.sys / 1000, (elapsed.sys % 1000) * 1000, elapsed.wall / 1000, (elapsed.wall % 1000) * 1000); #ifdef HAVE_MALLINFO diff --git a/gold/workqueue.cc b/gold/workqueue.cc index c713dca1dc..6449bbad84 100644 --- a/gold/workqueue.cc +++ b/gold/workqueue.cc @@ -327,7 +327,7 @@ Workqueue::find_and_run_task(int thread_number) "(user: %ld.%06ld sys: %ld.%06ld wall: %ld.%06ld)", thread_number, t->name().c_str(), elapsed.user / 1000, (elapsed.user % 1000) * 1000, - elapsed.sys / 1000, (elapsed.user % 1000) * 1000, + elapsed.sys / 1000, (elapsed.sys % 1000) * 1000, elapsed.wall / 1000, (elapsed.wall % 1000) * 1000); } -- 2.34.1