diff options
| author | van Hauser <vh@thc.org> | 2019-12-03 01:40:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-03 01:40:41 +0100 |
| commit | 4231c498392484fd2187b9ed1dedb1ba7bc0958b (patch) | |
| tree | 366586c4ceef17998670a8c2d978869bdac64d56 /src/afl-fuzz-init.c | |
| parent | b0d590fef4acb4b002429e4aec195e5740122494 (diff) | |
| parent | ef2dc98773c55eb09e4c1a588fb74df58570f868 (diff) | |
| download | afl++-4231c498392484fd2187b9ed1dedb1ba7bc0958b.tar.gz | |
Merge branch 'master' into llvm_mode_build_fix
Diffstat (limited to 'src/afl-fuzz-init.c')
| -rw-r--r-- | src/afl-fuzz-init.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c index d99f9bec..bdab41e7 100644 --- a/src/afl-fuzz-init.c +++ b/src/afl-fuzz-init.c @@ -142,7 +142,8 @@ void bind_to_free_cpu(void) { if (procs[i].ki_oncpu < sizeof(cpu_used) && procs[i].ki_pctcpu > 10) cpu_used[procs[i].ki_oncpu] = 1; #elif defined(__DragonFly__) - if (procs[i].kp_lwp.kl_cpuid < sizeof(cpu_used) && procs[i].kp_lwp.kl_pctcpu > 10) + if (procs[i].kp_lwp.kl_cpuid < sizeof(cpu_used) && + procs[i].kp_lwp.kl_pctcpu > 10) cpu_used[procs[i].kp_lwp.kl_cpuid] = 1; #endif @@ -734,7 +735,8 @@ void pivot_inputs(void) { use_name += 6; else use_name = rsl; - nfn = alloc_printf("%s/queue/id:%06u,time:0,orig:%s", out_dir, id, use_name); + nfn = alloc_printf("%s/queue/id:%06u,time:0,orig:%s", out_dir, id, + use_name); #else @@ -1563,8 +1565,10 @@ void check_cpu_governor(void) { " You can later go back to the original state by replacing " "'performance'\n" - " with 'ondemand' or 'powersave'. If you don't want to change the settings,\n" - " set AFL_SKIP_CPUFREQ to make afl-fuzz skip this check - but expect some\n" + " with 'ondemand' or 'powersave'. If you don't want to change the " + "settings,\n" + " set AFL_SKIP_CPUFREQ to make afl-fuzz skip this check - but expect " + "some\n" " performance drop.\n", min / 1024, max / 1024); FATAL("Suboptimal CPU scaling governor"); @@ -1609,7 +1613,8 @@ void check_cpu_governor(void) { void get_core_count(void) { -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ + defined(__DragonFly__) size_t s = sizeof(cpu_core_count); @@ -1655,7 +1660,8 @@ void get_core_count(void) { cur_runnable = (u32)get_runnable_processes(); -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \ + defined(__DragonFly__) /* Add ourselves, since the 1-minute average doesn't include that yet. */ |