Merge 80088caa13 into 1b93033690
This commit is contained in:
commit
1d46132372
|
|
@ -156,7 +156,7 @@ std::string VlThreadPool::numaAssign() {
|
|||
// Make a reasonable processor affinity selection
|
||||
const int num_threads = static_cast<int>(m_workers.size());
|
||||
if (num_threads < 2) return "too few threads";
|
||||
if (static_cast<unsigned>(num_threads) > num_proc) return "too many threads";
|
||||
if (static_cast<unsigned>(num_threads) >= num_proc - 1) return "too many threads";
|
||||
|
||||
// Read CPU info.
|
||||
// Uncertain if any modern system has gaps in the processor id (Solaris
|
||||
|
|
|
|||
|
|
@ -41,7 +41,8 @@ for trial in range(0, trials):
|
|||
|
||||
if sys.platform != "darwin":
|
||||
test.file_grep(gantt_log, r'CPU info:')
|
||||
test.file_grep(gantt_log, r'NUMA status += (assigned|%Warning: no /proc/cpuinfo)')
|
||||
test.file_grep(gantt_log,
|
||||
r'NUMA status += (assigned|too many threads|%Warning: no /proc/cpuinfo)')
|
||||
# False fails occasionally
|
||||
# test.file_grep_not(gantt_log, r'%Warning:') # e.g. There were fewer CPUs (1) than threads (3).
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue