diff options
author | Robert Swiecki <robert@swiecki.net> | 2019-02-26 15:30:45 +0100 |
---|---|---|
committer | Robert Swiecki <robert@swiecki.net> | 2019-02-26 15:30:45 +0100 |
commit | e15ec949eb816ef92d082d2da652cab7b20208de (patch) | |
tree | 3fb58d5eceef0e824f34e21e87ec1bd768121f15 | |
parent | e8c4b7e6216637ccf6c8a20b9f3c8bfa225756a7 (diff) | |
parent | 555e47fcab94cba20b1cb22532dab6e8a2786c26 (diff) | |
download | honggfuzz-e15ec949eb816ef92d082d2da652cab7b20208de.tar.gz |
Merge branch 'master' of ssh://github.com/google/honggfuzz
-rw-r--r-- | cmdline.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -243,8 +243,10 @@ bool cmdlineParse(int argc, char* argv[], honggfuzz_t* hfuzz) { .threads = { .threadsFinished = 0, - .threadsMax = - (sysconf(_SC_NPROCESSORS_ONLN) <= 1) ? 1 : sysconf(_SC_NPROCESSORS_ONLN) / 2, + .threadsMax = ({ + long ncpus = sysconf(_SC_NPROCESSORS_ONLN); + (ncpus <= 1 ? 1 : ncpus / 2); + }), .threadsActiveCnt = 0, .mainThread = pthread_self(), .mainPid = getpid(), @@ -561,7 +563,12 @@ bool cmdlineParse(int argc, char* argv[], honggfuzz_t* hfuzz) { hfuzz->cfg.reportFile = optarg; break; case 'n': - hfuzz->threads.threadsMax = atol(optarg); + if (optarg[0] == 'a') { + long ncpus = sysconf(_SC_NPROCESSORS_ONLN); + hfuzz->threads.threadsMax = (ncpus < 1 ? 1 : ncpus); + } else { + hfuzz->threads.threadsMax = atol(optarg); + } break; case 0x109: { time_t p = atol(optarg); |