[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sbcl-commits
Subject:    [Sbcl-commits] master: tests: Fix CPU-count based thread scaling in TEST-FRLOCKS
From:       Jan Moringen via Sbcl-commits <sbcl-commits () lists ! sourceforge ! net>
Date:       2017-11-24 12:14:11
Message-ID: 1511525651.782445.8019 () sfp-scm-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

The branch "master" has been updated in SBCL:
       via  c046f87e6dcfe2b8d77ef2ce371c57e064a4177d (commit)
      from  416fcba5b12fe6134ac5629a17c86094d0948304 (commit)

- Log -----------------------------------------------------------------
commit c046f87e6dcfe2b8d77ef2ce371c57e064a4177d
Author: Jan Moringen <jmoringe@techfak.uni-bielefeld.de>
Date:   Fri Nov 24 13:10:02 2017 +0100

    tests: Fix CPU-count based thread scaling in TEST-FRLOCKS
    
    * *CPUS* contrib/sb-concurrency/tests/test-utils.lisp should be 1 in
       case of an error or an implausible number and the returned number
       otherwise. Therefore MAX, not MIN.
    
    * TEST-FRLOCKS should use 12 * *CPUS* threads unless that number
      exceeds 200. Therefore MIN, not MAX.
---
 contrib/sb-concurrency/tests/test-frlock.lisp | 2 +-
 contrib/sb-concurrency/tests/test-utils.lisp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/sb-concurrency/tests/test-frlock.lisp \
b/contrib/sb-concurrency/tests/test-frlock.lisp index d96546c..db4bd54 100644
--- a/contrib/sb-concurrency/tests/test-frlock.lisp
+++ b/contrib/sb-concurrency/tests/test-frlock.lisp
@@ -22,7 +22,7 @@
   #+openbsd 0.01
   #-openbsd 0.0001)
 
-(defun test-frlocks (&key (reader-count (max (* 12 *cpus*) 200))
+(defun test-frlocks (&key (reader-count (min (* 12 *cpus*) 200))
                           (read-count 1000000)
                           (outer-read-pause 0) (inner-read-pause 0)
                           (writer-count 10) (write-count (/ 1 *minimum-sleep*))
diff --git a/contrib/sb-concurrency/tests/test-utils.lisp \
b/contrib/sb-concurrency/tests/test-utils.lisp index 5f8fbc9..1afc30d 100644
--- a/contrib/sb-concurrency/tests/test-utils.lisp
+++ b/contrib/sb-concurrency/tests/test-utils.lisp
@@ -15,7 +15,7 @@
 (progn
 
 (defvar *cpus*
-  (min 1
+  (max 1
        #-win32 (sb-alien:alien-funcall
                 (sb-alien:extern-alien "sysconf"
                                        (function sb-alien:long sb-alien:int))

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Sbcl-commits mailing list
Sbcl-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sbcl-commits


[prev in list] [next in list] [prev in thread] [next in thread]