From e3fc059bd7a993ddffc25829e1b68f015fd51b77 Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Sun, 8 Feb 2015 18:30:56 +0100 Subject: [PATCH] Hide cpu binding log messages --- ccminer.cpp | 10 +++++----- configure.ac | 2 +- cpuminer-config.h | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ccminer.cpp b/ccminer.cpp index 07b17ae..3f2f6e2 100644 --- a/ccminer.cpp +++ b/ccminer.cpp @@ -1121,8 +1121,9 @@ static void *miner_thread(void *userdata) case 5: prio = -15; } - applog(LOG_DEBUG, "Thread %d priority %d (set to %d)", thr_id, - opt_priority, prio); + if (opt_debug) + applog(LOG_DEBUG, "Thread %d priority %d (nice %d)", + thr_id, opt_priority, prio); #endif int ret = setpriority(PRIO_PROCESS, 0, prio); if (opt_priority == 0) { @@ -1133,12 +1134,12 @@ static void *miner_thread(void *userdata) /* Cpu thread affinity */ if (num_cpus > 1) { if (opt_affinity == -1 && opt_n_threads > 1) { - if (!opt_quiet) + if (opt_debug) applog(LOG_DEBUG, "Binding thread %d to cpu %d (mask %x)", thr_id, thr_id % num_cpus, (1 << (thr_id % num_cpus))); affine_to_cpu_mask(thr_id, 1 << (thr_id % num_cpus)); } else if (opt_affinity != -1) { - if (!opt_quiet) + if (opt_debug) applog(LOG_DEBUG, "Binding thread %d to cpu mask %x", thr_id, opt_affinity); affine_to_cpu_mask(thr_id, opt_affinity); @@ -2299,7 +2300,6 @@ int main(int argc, char *argv[]) SetConsoleCtrlHandler((PHANDLER_ROUTINE)ConsoleHandler, TRUE); if (opt_priority > 0) { DWORD prio = NORMAL_PRIORITY_CLASS; - SetPriorityClass(NULL, prio); switch (opt_priority) { case 1: prio = BELOW_NORMAL_PRIORITY_CLASS; diff --git a/configure.ac b/configure.ac index d218136..c72ac40 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([ccminer], [1.5.2]) +AC_INIT([ccminer], [1.5-git]) AC_PREREQ([2.59c]) AC_CANONICAL_SYSTEM diff --git a/cpuminer-config.h b/cpuminer-config.h index 46de818..0860baf 100644 --- a/cpuminer-config.h +++ b/cpuminer-config.h @@ -156,7 +156,7 @@ #define PACKAGE_NAME "ccminer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ccminer 1.5.2" +#define PACKAGE_STRING "ccminer 1.5-git" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "ccminer" @@ -165,7 +165,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.5.2" +#define PACKAGE_VERSION "1.5-git" /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be @@ -188,7 +188,7 @@ #define USE_XOP 1 /* Version number of package */ -#define VERSION "1.5.2" +#define VERSION "1.5-git" /* Define curl_free() as free() if our version of curl lacks curl_free. */ /* #undef curl_free */