From eba4b7b5c91a2351e09b19331bda74e8814d34b4 Mon Sep 17 00:00:00 2001 From: Esfomeado Date: Sun, 9 Apr 2017 18:47:00 +0100 Subject: [PATCH 1/5] Fix leake and use pre-increment --- executor.cpp | 2 +- jconf.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/executor.cpp b/executor.cpp index af10811..8f5a2a9 100644 --- a/executor.cpp +++ b/executor.cpp @@ -83,7 +83,7 @@ void executor::ex_clock_thd() ev = lTimedEvents.erase(ev); } else - ev++; + ++ev; } lck.unlock(); diff --git a/jconf.cpp b/jconf.cpp index 612065e..d0dd815 100644 --- a/jconf.cpp +++ b/jconf.cpp @@ -301,6 +301,7 @@ bool jconf::parse_config(const char* sFilename) if(flen <= 16) { + fclose(pFile); printer::inst()->print_msg(L0, "File is empty or too short - %s.", sFilename); return false; } From 9d45a167e91f6c26173fc5309c23f5a103cafcae Mon Sep 17 00:00:00 2001 From: fireice-uk Date: Mon, 10 Apr 2017 17:25:20 +0100 Subject: [PATCH 2/5] rv pre-inc to common style --- executor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/executor.cpp b/executor.cpp index 8f5a2a9..af10811 100644 --- a/executor.cpp +++ b/executor.cpp @@ -83,7 +83,7 @@ void executor::ex_clock_thd() ev = lTimedEvents.erase(ev); } else - ++ev; + ev++; } lck.unlock(); From e58a09f63b93eac23ec8af249757eec4dec52bbc Mon Sep 17 00:00:00 2001 From: fireice-uk Date: Mon, 10 Apr 2017 17:47:33 +0100 Subject: [PATCH 3/5] Fix priority for 32+ CPUs --- minethd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/minethd.cpp b/minethd.cpp index 90a6f31..22471f4 100644 --- a/minethd.cpp +++ b/minethd.cpp @@ -32,7 +32,7 @@ void thd_setaffinity(std::thread::native_handle_type h, uint64_t cpu_id) { - SetThreadAffinityMask(h, 1 << cpu_id); + SetThreadAffinityMask(h, 1ULL << cpu_id); } #else #include From 5f699bd836c87125390a2534e48b8d19750fce15 Mon Sep 17 00:00:00 2001 From: fireice-uk Date: Wed, 26 Apr 2017 22:31:25 +0100 Subject: [PATCH 4/5] v1.2.0-1.4.0 RC --- README.md | 94 +++++++++++++++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index c0938e2..62a52ac 100644 --- a/README.md +++ b/README.md @@ -17,27 +17,27 @@ Hash: SHA256 sha1sum d34a0ba0dd7b3b1f900a7e02772e197e974b4a73 libeay32.dll 2ee9966a0fc163da58408d91be36b84fa287c10b ssleay32.dll -c406d5fbe4791b73271ab17a9b720fd15bcf5235 xmr-stak-cpu.exe -a6a63f70e19819ef9f65603267308ad9360c8256 xmr-stak-cpu-notls.exe +eb8f162dae5c400c522c1ca66f2400ff28fa3220 xmr-stak-cpu.exe +2ae97065577820e26c097665c2ebc462a55b76f2 xmr-stak-cpu-notls.exe sha3sum 05003137a87313c81d6c348c9b96411c95d48dc22c35f36c39129747 libeay32.dll 133c065d9ef2c93396382e2ba5d8c3ca8c6a57c6beb0159cb9a4b6c5 ssleay32.dll -4d57aec0df1a9a3cb843b49aaebef3546fedd17a6adf7de77890909f xmr-stak-cpu.exe -739e68fe4f76fe5d4ff314693f28baf0a166ca8e46dee0b0cd044370 xmr-stak-cpu-notls.exe +f4fa6698eb71a8839bab36be0924d67f3436f6c6843962b480d54cb9 xmr-stak-cpu.exe +527fef186d888997a8d7c703acfae9589f11601015e9a91f593d8431 xmr-stak-cpu-notls.exe -$ date -Wed 15 Mar 14:39:01 GMT 2017 +date +Wed 26 Apr 22:25:44 BST 2017 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJYyVJUAAoJEPsk95p+1Bw0sNIIAIPISmp5ut/zb7rlnbfxkrZf -PRuNF1g7+qMen1bUi9FTwoTeebz468kj+fbk8fKljYMyctOrgxbTkPFl7ag1k1UH -rjeiRMVWlw0FBEX+0n9D9Ots+whYmwYXXu8eXJFjyc9nzRxzJl//hLw7ASpwOBRx -C+HcFXJSEcUr5RcDxAR0jK0xHQiu82mp4QxxR1GpIRWfsbqQn+OOClhtedLFed/Y -rXivP2XH0SEAhZfa/JUMCcwkqldMOKotZqhZwOjLLGWkKGYUM04U9N58bGIg7tDj -lBoYbHZRpcWUfDO8o2y+ZQIs+yzMoJHHBBXB9fsHlwq62PTtzjsEVwB2aq9ABzk= -=S8cQ +iQEcBAEBCAAGBQJZARCzAAoJEPsk95p+1Bw0NbUH/A1F7BU7z6RswiPhMem5iYXw +kflEGCIA+afBRFBwncqulhJBt7G/dqpAzyopHz2GeY2Ga74Bb7onHhC0K7xdUFLs +mmOf1GNSywzmz4+x55bffgehnr5e7DLIn0sqPcci+Cvbaxep8bkcAlLA6oljiliW +zb9iruPw4Kqd19sLPQAZJTW4BMb8lDdBKm3a7BOMn3uHvWb45EkG670arqcy20Wh +4IeHbXWmqmvmgT46J1dvsjGBAMysGG8dop1FO7tegHRz/QQM6ndA0MonGR+BR+ij +7c7UkISostwzVkfWKvAYyV6hBC3sSVahn5DzBiKTO5HomRCd/GL/Wwa3hecHVFs= +=1USM -----END PGP SIGNATURE----- ``` @@ -87,40 +87,6 @@ psychocrypt: 43NoJVEXo21hGZ6tDG6Z3g4qimiGdJPE6GRxAmiWwm26gwr62Lqo7zRiCJFSBmbkwTGNuuES9ES5TgaVHceuYc4Y75txCTU ``` -## PGP Key -``` ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -mQENBFhYUmUBCAC6493W5y1MMs38ApRbI11jWUqNdFm686XLkZWGDfYImzL6pEYk -RdWkyt9ziCyA6NUeWFQYniv/z10RxYKq8ulVVJaKb9qPGMU0ESfdxlFNJkU/pf28 -sEVBagGvGw8uFxjQONnBJ7y7iNRWMN7qSRS636wN5ryTHNsmqI4ClXPHkXkDCDUX -QvhXZpG9RRM6jsE3jBGz/LJi3FyZLo/vB60OZBODJ2IA0wSR41RRiOq01OqDueva -9jPoAokNglJfn/CniQ+lqUEXj1vjAZ1D5Mn9fISzA/UPen5Z7Sipaa9aAtsDBOfP -K9iPKOsWa2uTafoyXgiwEVXCCeMMUjCGaoFBABEBAAG0ImZpcmVpY2VfdWsgPGZp -cmVpY2UueG1yQGdtYWlsLmNvbT6JATcEEwEIACEFAlhYUmUCGwMFCwkIBwIGFQgJ -CgsCBBYCAwECHgECF4AACgkQ+yT3mn7UHDTEcQf8CMhqaZ0IOBxeBnsq5HZr2X6z -E5bODp5cPs6ha1tjH3CWpk1AFeykNtXH7kPW9hcDt/e4UQtcHs+lu6YU59X7xLJQ -udOkpWdmooJMXRWS/zeeon4ivT9d69jNnwubh8EJOyw8xm/se6n48BcewfHekW/6 -mVrbhLbF1dnuUGXzRN1WxsUZx3uJd2UvrkJhAtHtX92/qIVhT0+3PXV0bmpHURlK -YKhhm8dPLV9jPX8QVRHQXCOHSMqy/KoWEe6CnT0Isbkq3JtS3K4VBVeTX9gkySRc -IFxrNJdXsI9BxKv4O8yajP8DohpoGLMDKZKSO0yq0BRMgMh0cw6Lk22uyulGALkB -DQRYWFJlAQgAqikfViOmIccCZKVMZfNHjnigKtQqNrbJpYZCOImql4FqbZu9F7TD -9HIXA43SPcwziWlyazSy8Pa9nCpc6PuPPO1wxAaNIc5nt+w/x2EGGTIFGjRoubmP -3i5jZzOFYsvR2W3PgVa3/ujeYYJYo1oeVeuGmmJRejs0rp1mbvBSKw1Cq6C4cI0x -GTY1yXFGLIgdfYNMmiLsTy1Qwq8YStbFKeUYAMMG3128SAIaT3Eet911f5Jx4tC8 -6kWUr6PX1rQ0LQJqyIsLq9U53XybUksRfJC9IEfgvgBxRBHSD8WfqEhHjhW1VsZG -dcYgr7A1PIneWsCEY+5VUnqTlt2HPaKweQARAQABiQEfBBgBCAAJBQJYWFJlAhsM -AAoJEPsk95p+1Bw0Pr8H/0vZ6U2zaih03jOHOvsrYxRfDXSmgudOp1VS45aHIREd -2nrJ+drleeFVyb14UQqO/6iX9GuDX2yBEHdCg2aljeP98AaMU//RiEtebE6CUWsL -HPVXHIkxwBCBe0YkJINHUQqLz/5f6qLsNUp1uTH2++zhdBWvg+gErTYbx8aFMFYH -0GoOtqE5rtlAh5MTvDZm+UcDwKJCxhrLaN3R3dDoyrDNRTgHQQuX5/opJBiUnVNK -d+vugnxzpMIJQP11yCZkz/KxV8zQ2QPMuZdAoh3znd/vGCJcp0rWphn4pqxA4vDp -c4hC0Yg9Dha1OoE5CJCqVL+ic4vAyB1urAwBlsd/wH8= -=B5I+ ------END PGP PUBLIC KEY BLOCK----- -``` - ## Common Issues **SeLockMemoryPrivilege failed** @@ -208,3 +174,37 @@ and install. - `OpenSSL_REQUIRED`allow to disable/enable the dependency *OpenSSL* - by default enabled - it is not possible to connect to a *https* secured pool if optin is disabled: `cmake . -DOpenSSL_REQUIRED=OFF` + +## PGP Key +``` +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQENBFhYUmUBCAC6493W5y1MMs38ApRbI11jWUqNdFm686XLkZWGDfYImzL6pEYk +RdWkyt9ziCyA6NUeWFQYniv/z10RxYKq8ulVVJaKb9qPGMU0ESfdxlFNJkU/pf28 +sEVBagGvGw8uFxjQONnBJ7y7iNRWMN7qSRS636wN5ryTHNsmqI4ClXPHkXkDCDUX +QvhXZpG9RRM6jsE3jBGz/LJi3FyZLo/vB60OZBODJ2IA0wSR41RRiOq01OqDueva +9jPoAokNglJfn/CniQ+lqUEXj1vjAZ1D5Mn9fISzA/UPen5Z7Sipaa9aAtsDBOfP +K9iPKOsWa2uTafoyXgiwEVXCCeMMUjCGaoFBABEBAAG0ImZpcmVpY2VfdWsgPGZp +cmVpY2UueG1yQGdtYWlsLmNvbT6JATcEEwEIACEFAlhYUmUCGwMFCwkIBwIGFQgJ +CgsCBBYCAwECHgECF4AACgkQ+yT3mn7UHDTEcQf8CMhqaZ0IOBxeBnsq5HZr2X6z +E5bODp5cPs6ha1tjH3CWpk1AFeykNtXH7kPW9hcDt/e4UQtcHs+lu6YU59X7xLJQ +udOkpWdmooJMXRWS/zeeon4ivT9d69jNnwubh8EJOyw8xm/se6n48BcewfHekW/6 +mVrbhLbF1dnuUGXzRN1WxsUZx3uJd2UvrkJhAtHtX92/qIVhT0+3PXV0bmpHURlK +YKhhm8dPLV9jPX8QVRHQXCOHSMqy/KoWEe6CnT0Isbkq3JtS3K4VBVeTX9gkySRc +IFxrNJdXsI9BxKv4O8yajP8DohpoGLMDKZKSO0yq0BRMgMh0cw6Lk22uyulGALkB +DQRYWFJlAQgAqikfViOmIccCZKVMZfNHjnigKtQqNrbJpYZCOImql4FqbZu9F7TD +9HIXA43SPcwziWlyazSy8Pa9nCpc6PuPPO1wxAaNIc5nt+w/x2EGGTIFGjRoubmP +3i5jZzOFYsvR2W3PgVa3/ujeYYJYo1oeVeuGmmJRejs0rp1mbvBSKw1Cq6C4cI0x +GTY1yXFGLIgdfYNMmiLsTy1Qwq8YStbFKeUYAMMG3128SAIaT3Eet911f5Jx4tC8 +6kWUr6PX1rQ0LQJqyIsLq9U53XybUksRfJC9IEfgvgBxRBHSD8WfqEhHjhW1VsZG +dcYgr7A1PIneWsCEY+5VUnqTlt2HPaKweQARAQABiQEfBBgBCAAJBQJYWFJlAhsM +AAoJEPsk95p+1Bw0Pr8H/0vZ6U2zaih03jOHOvsrYxRfDXSmgudOp1VS45aHIREd +2nrJ+drleeFVyb14UQqO/6iX9GuDX2yBEHdCg2aljeP98AaMU//RiEtebE6CUWsL +HPVXHIkxwBCBe0YkJINHUQqLz/5f6qLsNUp1uTH2++zhdBWvg+gErTYbx8aFMFYH +0GoOtqE5rtlAh5MTvDZm+UcDwKJCxhrLaN3R3dDoyrDNRTgHQQuX5/opJBiUnVNK +d+vugnxzpMIJQP11yCZkz/KxV8zQ2QPMuZdAoh3znd/vGCJcp0rWphn4pqxA4vDp +c4hC0Yg9Dha1OoE5CJCqVL+ic4vAyB1urAwBlsd/wH8= +=B5I+ +-----END PGP PUBLIC KEY BLOCK----- +``` From 26c013464573284f15a7901a115a371b757dc589 Mon Sep 17 00:00:00 2001 From: fireice-uk Date: Thu, 27 Apr 2017 14:20:29 +0100 Subject: [PATCH 5/5] This guard is no longer needed. --- jconf.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jconf.cpp b/jconf.cpp index 8ed1947..d272325 100644 --- a/jconf.cpp +++ b/jconf.cpp @@ -144,12 +144,6 @@ bool jconf::GetThreadConfig(size_t id, thd_cfg &cfg) cfg.bDoubleMode = mode->GetBool(); cfg.bNoPrefetch = no_prefetch->GetBool(); - if(!bHaveAes && cfg.bDoubleMode) - { - printer::inst()->print_msg(L0, "Invalid thread confg - low_power_mode are unsupported on CPUs without AES-NI."); - return false; - } - if(aff->IsNumber()) cfg.iCpuAff = aff->GetInt64(); else