diff options
| author | psychocrypt <psychocryptHPC@gmail.com> | 2018-03-25 14:52:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-25 14:52:17 +0200 |
| commit | 453ee104f656732133d47f0dafa728cb0fb7dea3 (patch) | |
| tree | 29efb953d9851b352298369104bf777fa3bf34e1 /xmrstak/backend/cpu/crypto/cryptonight_common.cpp | |
| parent | 5014bdda628f64ab780d02de371bac4997573d10 (diff) | |
| parent | 1e7911e653a267ffd71199cdf7afaf1cfed5bad0 (diff) | |
| download | xmr-stak-453ee104f656732133d47f0dafa728cb0fb7dea3.zip xmr-stak-453ee104f656732133d47f0dafa728cb0fb7dea3.tar.gz | |
Merge pull request #1197 from fireice-uk/topic-rc-2-3-0
XMR-Stak 2.3.0 RC
Diffstat (limited to 'xmrstak/backend/cpu/crypto/cryptonight_common.cpp')
| -rw-r--r-- | xmrstak/backend/cpu/crypto/cryptonight_common.cpp | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/xmrstak/backend/cpu/crypto/cryptonight_common.cpp b/xmrstak/backend/cpu/crypto/cryptonight_common.cpp index 1026b04..17fa24b 100644 --- a/xmrstak/backend/cpu/crypto/cryptonight_common.cpp +++ b/xmrstak/backend/cpu/crypto/cryptonight_common.cpp @@ -28,9 +28,9 @@ extern "C" #include "c_jh.h" #include "c_skein.h" } +#include "xmrstak/backend/cryptonight.hpp" #include "cryptonight.h" #include "cryptonight_aesni.h" -#include "xmrstak/backend/cryptonight.hpp" #include "xmrstak/misc/console.hpp" #include "xmrstak/jconf.hpp" #include <stdio.h> @@ -202,15 +202,8 @@ size_t cryptonight_init(size_t use_fast_mem, size_t use_mlock, alloc_msg* msg) cryptonight_ctx* cryptonight_alloc_ctx(size_t use_fast_mem, size_t use_mlock, alloc_msg* msg) { - size_t hashMemSize; - if(::jconf::inst()->IsCurrencyMonero()) - { - hashMemSize = MONERO_MEMORY; - } - else - { - hashMemSize = AEON_MEMORY; - } + size_t hashMemSize = cn_select_memory(::jconf::inst()->GetMiningAlgo()); + cryptonight_ctx* ptr = (cryptonight_ctx*)_mm_malloc(sizeof(cryptonight_ctx), 4096); if(use_fast_mem == 0) @@ -285,15 +278,8 @@ cryptonight_ctx* cryptonight_alloc_ctx(size_t use_fast_mem, size_t use_mlock, al void cryptonight_free_ctx(cryptonight_ctx* ctx) { - size_t hashMemSize; - if(::jconf::inst()->IsCurrencyMonero()) - { - hashMemSize = MONERO_MEMORY; - } - else - { - hashMemSize = AEON_MEMORY; - } + size_t hashMemSize = cn_select_memory(::jconf::inst()->GetMiningAlgo()); + if(ctx->ctx_info[0] != 0) { #ifdef _WIN32 |
