From 8882dc1283771463a20194c083f4b8940a2d574b Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Wed, 15 Apr 2009 13:13:47 -0700 Subject: Get rid of the Unallocated thread context state. Basically merge it in with Halted. Also had to get rid of a few other functions that called ThreadContext::deallocate(), including: - InOrderCPU's setThreadRescheduleCondition. - ThreadContext::exit(). This function was there to avoid terminating simulation when one thread out of a multi-thread workload exits, but we need to find a better (non-cpu-centric) way. --- src/sim/system.hh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/sim/system.hh') diff --git a/src/sim/system.hh b/src/sim/system.hh index bfa5ea8bb..e1c30490b 100644 --- a/src/sim/system.hh +++ b/src/sim/system.hh @@ -89,19 +89,21 @@ class System : public SimObject std::vector threadContexts; int _numContexts; - ThreadContext * getThreadContext(int tid) + ThreadContext *getThreadContext(int tid) { return threadContexts[tid]; } int numContexts() { - if (_numContexts != threadContexts.size()) - panic("cpu array not fully populated!"); - + assert(_numContexts == threadContexts.size()); return _numContexts; } + /** Return number of running (non-halted) thread contexts in + * system. These threads could be Active or Suspended. */ + int numRunningContexts(); + #if FULL_SYSTEM Platform *platform; uint64_t init_param; -- cgit v1.2.3