Fixed huge pages on Windows

Cleanup of default config files
Added single-double threads to summary printout

src/Mem_win.cpp

@@ -163,6 +163,8 @@ bool Mem::allocate(const Options* options)
         }
     }
 
+    m_memorySize = m_memorySize - (m_memorySize % MEMORY) + MEMORY;
+
     if (!options->hugePages()) {
         m_memory = static_cast<uint8_t*>(_mm_malloc(m_memorySize, 16));
         return true;

src/Summary.cpp

@@ -91,9 +91,30 @@ static void print_cpu()
 
 static void print_threads()
 {
-    char dhtMaskBuf[64];
+    char dhtMaskBuf[256];
     if (Options::i()->doubleHashThreadMask() != -1L) {
-        snprintf(dhtMaskBuf, 64, ", doubleHashThreadMask=0x%" PRIX64, Options::i()->doubleHashThreadMask());
+
+        std::string singleThreads;
+        std::string doubleThreads;
+
+        for (int i=0; i < Options::i()->threads(); i++) {
+            if (Mem::isDoubleHash(i)) {
+                if (!doubleThreads.empty()) {
+                    doubleThreads.append(", ");
+                }
+
+                doubleThreads.append(std::to_string(i));
+            } else {
+                if (!singleThreads.empty()) {
+                    singleThreads.append(" ");
+                }
+
+                singleThreads.append(std::to_string(i));
+            }
+        }
+
+        snprintf(dhtMaskBuf, 256, ", doubleHashThreadMask=0x%" PRIX64 " [single threads: %s; double threads: %s]",
+                 Options::i()->doubleHashThreadMask(), singleThreads.c_str(), doubleThreads.c_str());
     }
     else {
         dhtMaskBuf[0] = '\0';

src/config.json

@@ -1,7 +1,7 @@
 {
     "algo": "cryptonight",                      // cryptonight (default) or cryptonight-lite
     "av": 0,                                    // algorithm variation, 0 auto select
-    "doublehash-thread-mask" : null,            // for av=2/4 only, limits doublehash to given threads (mask), (default: all threads)
+    "doublehash-thread-mask" : null,            // for av=2/4 only, limits doublehash to given threads (mask), mask "0x3" means run doublehash on thread 0 and 1 only (default: all threads)
     "background": false,                        // true to run the miner in the background
     "colors": true,                             // false to disable colored output
     "cpu-affinity": null,                       // set process affinity to CPU core(s), mask "0x3" for cores 0 and 1

src/default_config.json

@@ -1,7 +1,7 @@
 {
     "algo": "cryptonight",                      // cryptonight (default) or cryptonight-lite
     "av": 0,                                    // algorithm variation, 0 auto select
-    "doublehash-thread-mask" : null,            // for av=2/4 only, limits doublehash to given threads (mask), (default: all threads)
+    "doublehash-thread-mask" : null,            // for av=2/4 only, limits doublehash to given threads (mask), mask "0x3" means run doublehash on thread 0 and 1 only (default: all threads)
     "background": false,                        // true to run the miner in the background
     "colors": true,                             // false to disable colored output
     "cpu-affinity": null,                       // set process affinity to CPU core(s), mask "0x3" for cores 0 and 1