X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gold%2Fworkqueue.cc;h=8e31d97b7ca521224af4a054a58ae9bf9c696d13;hb=6598661d14c90cabac1daa5e683d1e17883b2e41;hp=c713dca1dc28f4363f9b7a2ff84b868e825c31ec;hpb=d675ff4684242402af02908e431ed5e9fe045320;p=deliverable%2Fbinutils-gdb.git

diff --git a/gold/workqueue.cc b/gold/workqueue.cc
index c713dca1dc..8e31d97b7c 100644
--- a/gold/workqueue.cc
+++ b/gold/workqueue.cc
@@ -1,6 +1,6 @@
 // workqueue.cc -- the workqueue for gold
 
-// Copyright 2006, 2007, 2008 Free Software Foundation, Inc.
+// Copyright (C) 2006-2016 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -110,7 +110,7 @@ class Workqueue_threader_single : public Workqueue_threader
   { gold_assert(thread_count > 0); }
 
   bool
-  should_cancel_thread()
+  should_cancel_thread(int)
   { return false; }
 };
 
@@ -202,9 +202,9 @@ Workqueue::queue_next(Task* t)
 // Return whether to cancel the current thread.
 
 inline bool
-Workqueue::should_cancel_thread()
+Workqueue::should_cancel_thread(int thread_number)
 {
-  return this->threader_->should_cancel_thread();
+  return this->threader_->should_cancel_thread(thread_number);
 }
 
 // Find a runnable task in TASKS.  Return NULL if none could be found.
@@ -264,7 +264,7 @@ Workqueue::find_runnable_or_wait(int thread_number)
 	  return NULL;
 	}
 
-      if (this->should_cancel_thread())
+      if (this->should_cancel_thread(thread_number))
 	return NULL;
 
       gold_debug(DEBUG_TASK, "%3d sleeping", thread_number);
@@ -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);
         }