diff options
| author | Simon Hafner <hafnersimon@gmail.com> | 2015-05-08 06:40:34 +0500 |
|---|---|---|
| committer | Simon Hafner <hafnersimon@gmail.com> | 2015-05-08 06:40:34 +0500 |
| commit | f5cca89610905f35b50259cfe81e6d1d4153d39c (patch) | |
| tree | 3c49f45590875e4eab78ae976d6ac254030e62af /lib/pure/concurrency | |
| parent | 2474c1bb111b38ddef64659c893722b357a27384 (diff) | |
| parent | c384f05e49e0716cc99042491f65bcc7d415d4c3 (diff) | |
| download | Nim-f5cca89610905f35b50259cfe81e6d1d4153d39c.tar.gz | |
merged devel into epc
Diffstat (limited to 'lib/pure/concurrency')
| -rw-r--r-- | lib/pure/concurrency/cpuload.nim | 2 | ||||
| -rw-r--r-- | lib/pure/concurrency/threadpool.nim | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pure/concurrency/cpuload.nim b/lib/pure/concurrency/cpuload.nim index c1796089a..7ce5e01b7 100644 --- a/lib/pure/concurrency/cpuload.nim +++ b/lib/pure/concurrency/cpuload.nim @@ -78,7 +78,7 @@ proc advice*(s: var ThreadPoolState): ThreadPoolAdvice = result = doNothing inc s.calls -when isMainModule: +when not defined(testing) and isMainModule: proc busyLoop() = while true: discard random(80) diff --git a/lib/pure/concurrency/threadpool.nim b/lib/pure/concurrency/threadpool.nim index 9f1e53fb8..a431691ad 100644 --- a/lib/pure/concurrency/threadpool.nim +++ b/lib/pure/concurrency/threadpool.nim @@ -300,7 +300,7 @@ proc setMinPoolSize*(size: range[1..MaxThreadPoolSize]) = minPoolSize = size proc setMaxPoolSize*(size: range[1..MaxThreadPoolSize]) = - ## sets the minimal thread pool size. The default value of this + ## sets the maximal thread pool size. The default value of this ## is ``MaxThreadPoolSize``. maxPoolSize = size if currentPoolSize > maxPoolSize: |