From 451e710af680dec86324661cbd70cf306e360555 Mon Sep 17 00:00:00 2001 From: enWILLYado Date: Sun, 18 Mar 2018 23:21:33 +0100 Subject: [PATCH] Fixes for new release 3.3.3-3 --- CMakeLists.txt | 2 ++ README.md | 3 ++- res/app.ico | Bin 15086 -> 15086 bytes src/Mem_unix.cpp | 2 -- src/net/Job.cpp | 12 +++++++----- src/net/Job.h | 11 ++++++----- src/version.h | 4 ++-- vs/xmrig.vcxproj | 8 ++++---- 8 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8823b078..03fcd6d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,8 @@ include (cmake/cpu.cmake) set(HEADERS + + src/3rdparty/align.h src/api/Api.h src/api/ApiState.h src/api/NetworkState.h diff --git a/README.md b/README.md index 5494dc0b..002cafd6 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin * This software is like the [CPU-mining](https://github.com/xmrig/xmrig) version; but there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd). * This is the **CPU-mining** version, there is also a [NVIDIA GPU version](https://github.com/xmrig/xmrig-nvidia) and [AMD GPU version]( https://github.com/xmrig/xmrig-amd). +* You can use [config.xmrig.com](https://config.xmrig.com/) to generate/edit/share your configurations. :new: ## Own features @@ -22,4 +23,4 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin * xmrig@enwillyado.com * [telegram](https://telegram.me/enWILLYado) -¡Se habla español! +¡Se habla español! diff --git a/res/app.ico b/res/app.ico index 7ab97bae0c63f05432da3e4bcdb12072d2700fe4..86353b8311a29f60f703973db24c93ed00d18368 100644 GIT binary patch literal 15086 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 literal 15086 zcmeHOeQ1@}8GqC3RkJKro2JgWE|IL=M5LviwNPYsYhZ2E7{8*%YWzrUlG`LE={0UK zw819rj9s+S!0aFGDAI|Gr55WSA~J%6AR0C z7)B2Y{0e2DVpJnhKK;Foa_XOyGAGk?;lhPbU0q$tjvYHHw{G2f6zQ)O6&07ZY}s;^ z(#DM&FCy<_q_e?XPc`XKE}XPPW`pHxq12K&6_`W zOBkoK_U&S>H1@mUBDMpE4r|0De4m}|CFR#tX< zsiPlQ{NvlVZ*Sqch7a$$`H%_!rH5oyVVjKU($k&tdFH{=rTtLco4G7Yw|da=f3jV! z(Q%@@pC6XxWc$?*MBbb_dC#boQkNcUkrplv{1a`4Ijhpi2Oa<1sO;8pqP)5F^6Ntb zGW@f4`LbOZ%J;!v8+Wfh_~lRBN;>38-L6nR=v_E3Lc4w z@7bm*?f7TPopGFeaN>`#^X_XO$aypdpxkA)r%E0FY;k9-DIcukk`sT7`)7FkqInS8 zQl-it++%8)Y&<9HVJ~w^#?^NI{6w25zSHqA^G|ZO9p82Oe)5uiI^~01 z{PEoyi~U`OnLo)#oAhf1=0Dxs*-vvl*zsR=5b$%$% z7;^?x&gyeXhgcS>6P9)~+diP(e7&+u7OH%8&r4#WG$$e+%rV$T_6r^2&_nigJvi-&Pq-6~sB-UPZe*0&UPxDrM<1ag{AME@IMa2DFv=e+! zD=Ye?>$#j4PC?6HKC%cr%CHuF3;vu#8V2v%=7csqguQ~#@*8ExPu>)zzdxCsSgZGe z{{K9)5ukfo#Yk(BQunlQmrMQg+O|%gJ{`jO#`8D}jp5$M8JvY*gS?eYgOH!%T?@)Q zbN>AKtc^3ZwY3Xiw;gzNm&)~i2$ezE+r%XrjRqb!`uqDsIG2uOa!&-hcVNSIkJv8u zxLZ?zcwY4CuUk3X5jcl?4xVCx`z23;ch>LqpiXXJe|oW<&y8F zSBmk%~{)kw_%fpLHBme0=*qGh@*2#c#^hm_PqXoy%bF{bM_P zU|+$V+!QvKJ8<9t#bJo+K*h&C+UF_`ICX%BWslPipRnP#c8`U4BsnDN!VCV~1~~v; zqbe^Qe$wwWY}8W>d;JlP0m)=t40*wa?>BMIG~tGi^U$-1xdl6^7YB!WGY5(T?j)u5 zVdU5if{$~##C|km*??j z{}Jq&TK2W<@Ex%EjtDr2w7OspI(#~(p5Gu&y4Amn-;B*t8wVXe`hM4=O`_Zlf68yc z_Pt0;9CY}P9h5J>&?ED(&PwY8=J+L(Q^iA!RV?XqiIR=am>_3?E z1N&y~$|laI+t_!Ot9ryd;9d_9WA@XN#CUhLyg&VnggIbOtOz{Er;7vH+$i=-)8fw9 zEEl(l71&qJItRkWUO)-sI7x~F#>TAG1;*Gx`0Z=o4CBH)YLn)E;kRCBpAj&8mlo@^`UOAqCUsKf!fJ9 z`pqcvt^o6W?3b0T>Gi(vr0xgI^fT>K(6&S|67N&2#s8YAf96=wZ>+0JFvse~I_DbF zcrsl>9{rzKky@Ugv9=DQ4BdNuz;jiNe1I}tn9HTL8>~;mSf75WDX-m^K-mGa4csM< znYiAwvx71dTn;*xGg0yd^U-#bKK)Nc${x5|bTHR0$9%UF{h>zDp8&=xq?gzR>*G6A zPdd;oL;I)mN{M!N)1;r!<=CY6`-5>k7h}^EJ*L$Ul)Z%UFKr%AHi!rL;$SBZ+&)#8d62~U_e$6~iF!r7h%+U{=CbtLFu*T^^j~o5!gc@v diff --git a/src/Mem_unix.cpp b/src/Mem_unix.cpp index d0e892ff..846c427d 100644 --- a/src/Mem_unix.cpp +++ b/src/Mem_unix.cpp @@ -99,8 +99,6 @@ bool Mem::allocate(int algo, int threads, bool doubleHash, bool enabled) void Mem::release() { - const int size = MEMORY * (m_threads + 1); - if(m_flags & HugepagesEnabled) { if(m_flags & Lock) diff --git a/src/net/Job.cpp b/src/net/Job.cpp index dd4258cf..7c2fba31 100644 --- a/src/net/Job.cpp +++ b/src/net/Job.cpp @@ -61,6 +61,7 @@ static inline char hf_bin2hex(unsigned char c) Job::Job() : m_nicehash(false), + m_coin(), m_algo(xmrig::ALGO_CRYPTONIGHT), m_poolId(-2), m_threadId(-1), @@ -75,6 +76,7 @@ Job::Job() : Job::Job(int poolId, bool nicehash, int algo, int variant) : m_nicehash(nicehash), + m_coin(), m_algo(algo), m_poolId(poolId), m_threadId(-1), @@ -168,16 +170,16 @@ bool Job::setTarget(const char* target) } -void Job::setCoin(const char* coin) +void Job::setCoin(const std::string & coin) { - if(!coin || strlen(coin) > 4) + if(m_coin.size() == 0 || m_coin.size() > 4) { - memset(m_coin, 0, sizeof(m_coin)); + m_coin.clear(); return; } - strncpy(m_coin, coin, sizeof(m_coin)); - m_algo = strcmp(m_coin, "AEON") == 0 ? xmrig::ALGO_CRYPTONIGHT_LITE : xmrig::ALGO_CRYPTONIGHT; + m_coin = coin; + m_algo = (m_coin != "AEON") ? xmrig::ALGO_CRYPTONIGHT_LITE : xmrig::ALGO_CRYPTONIGHT; } diff --git a/src/net/Job.h b/src/net/Job.h index 0d377fd0..28480cd0 100644 --- a/src/net/Job.h +++ b/src/net/Job.h @@ -31,6 +31,7 @@ #include +#include "align.h" #include "net/Id.h" #include "xmrig.h" @@ -44,7 +45,7 @@ public: bool setBlob(const char* blob); bool setTarget(const char* target); - void setCoin(const char* coin); + void setCoin(const std::string & coin); void setVariant(int variant); inline bool isNicehash() const @@ -55,11 +56,11 @@ public: { return m_size > 0 && m_diff > 0; } - inline bool setId(const char* id) + inline bool setId(const std::string & id) { return m_id.setId(id); } - inline const char* coin() const + inline const std::string & coin() const { return m_coin; } @@ -127,7 +128,7 @@ public: private: bool m_nicehash; - char m_coin[5]; + std::string m_coin; int m_algo; int m_poolId; int m_threadId; @@ -135,7 +136,7 @@ private: size_t m_size; uint64_t m_diff; uint64_t m_target; - uint8_t m_blob[96]; // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk. + VAR_ALIGN(16, uint8_t m_blob[96]); // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk. xmrig::Id m_id; }; diff --git a/src/version.h b/src/version.h index 24ee9c9e..d76b25a0 100644 --- a/src/version.h +++ b/src/version.h @@ -27,14 +27,14 @@ #define APP_ID "xmrig-eWa" #define APP_NAME "XMRig-eWa" #define APP_DESC "XMRig CPU miner-eWa" -#define APP_VERSION "3.0.3-3" +#define APP_VERSION "3.3.3-3" #define APP_DOMAIN "enWILLYado.com" #define APP_SITE "www.enWILLYado.com" #define APP_COPYRIGHT "Copyright (C) 2016-2018 xmrig.com by enWILLYado.com" #define APP_KIND "cpu" #define APP_VER_MAJOR 3 -#define APP_VER_MINOR 0 +#define APP_VER_MINOR 3 #define APP_VER_BUILD 3 #define APP_VER_REV 3 diff --git a/vs/xmrig.vcxproj b/vs/xmrig.vcxproj index 7e9a453c..c7bc631b 100644 --- a/vs/xmrig.vcxproj +++ b/vs/xmrig.vcxproj @@ -245,8 +245,8 @@ $(SolutionDir)\..\build\ $(SolutionDir)\obj\$(Platform)\$(Configuration)\ $(SolutionDir)\obj\$(Platform)\$(Configuration)\ - $(ProjectName)$(Platform)d - $(ProjectName)$(Platform) + $(ProjectName)-x$(PlatformArchitecture)d + $(ProjectName)-x$(PlatformArchitecture)d cd $(OutDir) && make -j$(NUMBER_OF_PROCESSORS) cd $(OutDir) && make clean && make -j$(NUMBER_OF_PROCESSORS) cd $(OutDir) && make clean @@ -255,8 +255,8 @@ cd $(OutDir) && make clean $(SolutionDir)\..\build\ $(SolutionDir)\obj\$(Platform)\$(Configuration)\ - $(ProjectName)$(Platform)d - $(ProjectName)$(Platform) + $(ProjectName)-x$(PlatformArchitecture)d + $(ProjectName)-x$(PlatformArchitecture)d $(SolutionDir)\obj\$(Platform)\$(Configuration)\ $(SolutionDir)\..\build\